elasticity 6.0.7 → 6.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8acfedb244b21d3b8ab10c2c78b33006f15b9c9
-  data.tar.gz: 72978cfbb6598c283771630159f2203b0d2722f8
+  metadata.gz: 3cd50c2b68572e1a5e546d3ff07e49e040b60a92
+  data.tar.gz: cfda4f23570cb4206835b9e4e6366807d7ab2f4c
 SHA512:
-  metadata.gz: cb3ade000c41023d37fba15f48df3be25f2d02ab7a62ee1e75c3fdc576a88d7cde639b8cff8b4144ba2b9d31ce281f6e0c55b3aae1573443e4b890d8b1db3ad6
-  data.tar.gz: 344e4daeb4d74e6fdefdc74a8ad6c05a3a68fa5c3b623197c5b0935a03081bb2291ffaf9da307c88cfb243228a360c6190831d0d2846130cbcfe14af48cc2723
+  metadata.gz: c61bae14a944d248c96cf45bb522de9bf611bcad24599d158fed27003f2d1c164afb58451fba87c62e55b68fc10f05ab0dc28df49b1b9fc0ca9b6433aaedb231
+  data.tar.gz: 25c6be356bf71593510bca93f8f327c8f5162ade323d15bf4fca7e68c5ef9a2017050de7307add76a930808e4f8c3706b9327a267356029df4d5aaa21b54d978

data/HISTORY.md

@@ -1,8 +1,12 @@
-## 6.0.7 - February 29, 2016
+## 6.0.8 - February 22, 2016
+
+- Including PR [#126](https://github.com/rslifka/elasticity/pull/126) - "Add support for additional security groups".  Thank you [@alistair](https://github.com/alistair)!
+
+## 6.0.7 - February 1, 2016
 
 - Including PR [#125](https://github.com/rslifka/elasticity/pull/125) - "AMI 4.x support".  Thank you [@fblundun](https://github.com/fblundun)!
 
-## 6.0.6 - February 29, 2016
+## 6.0.6 - January 29, 2016
 
 - Including PR [#120](https://github.com/rslifka/elasticity/pull/120) - "EMR Applications and support for release_label".  Thank you [@robert2d](https://github.com/robert2d)!
 

data/README.md

@@ -132,6 +132,8 @@ jobflow.instance_count                    = 2
 jobflow.master_instance_type              = 'm1.small'
 jobflow.slave_instance_type               = 'm1.small'
 jobflow.additonal_info                    = 'additonal info'
+jobflow.additional_master_security_groups = ['sg-1111', 'sg-2222']
+jobflow.additional_slave_security_groups  = ['sg-1111', 'sg-2222']
 ```
 
 ### EMR Applications (optional needs release_label >= 4.0.0)

data/lib/elasticity/job_flow.rb

@@ -29,6 +29,8 @@ module Elasticity
     attr_accessor :jobflow_id
     attr_accessor :aws_applications
     attr_accessor :additional_info
+    attr_accessor :additional_master_security_groups
+    attr_accessor :additional_slave_security_groups
 
     def initialize
       @action_on_failure = 'TERMINATE_JOB_FLOW'
@@ -246,6 +248,8 @@ module Elasticity
         preamble[:instances].delete(:placement)
       end
       preamble[:instances].merge!(:ec2_key_name => @ec2_key_name) if @ec2_key_name
+      preamble[:instances].merge!(:additional_master_security_groups => @additional_master_security_groups) if @additional_master_security_groups
+      preamble[:instances].merge!(:additional_slave_security_groups => @additional_slave_security_groups) if @additional_slave_security_groups
       preamble
     end
 

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = '6.0.7'
+  VERSION = '6.0.8'
 end

data/spec/lib/elasticity/aws_request_v4_spec.rb

@@ -123,7 +123,7 @@ describe Elasticity::AwsRequestV4 do
 
   describe '.aws_v4_signature' do
     it 'should create the proper signature' do
-      subject.send(:aws_v4_signature).should == '2012c7d0d1fecd99b023d2a81a5930300436e4739f274301932941506e8fc9bf'
+      subject.send(:aws_v4_signature).should == '8cd99127235ec8f7c9304ad55d1ef702c556d1d5169dd2d224e6cf86fe179f1e'
     end
   end
 

data/spec/lib/elasticity/job_flow_spec.rb

@@ -26,6 +26,8 @@ describe Elasticity::JobFlow do
       expect(subject.service_role).to eql(nil)
       expect(subject.additional_info).to eql(nil)
       expect(subject.jobflow_id).to eql(nil)
+      expect(subject.additional_master_security_groups).to eql(nil)
+      expect(subject.additional_slave_security_groups).to eql(nil)
     end
   end
 
@@ -618,6 +620,19 @@ describe Elasticity::JobFlow do
       end
     end
 
+    context 'when additional master security groups is provided' do
+      it 'should include it in the preamble' do
+        subject.additional_master_security_groups = ['group1', 'group2']
+        subject.send(:jobflow_preamble)[:instances].should be_a_hash_including({:additional_master_security_groups => ['group1', 'group2']})
+      end
+    end
+
+    context 'when additional slave security groups is provided' do
+      it 'should include it in the preamble' do
+        subject.additional_slave_security_groups = ['group1', 'group2']
+        subject.send(:jobflow_preamble)[:instances].should be_a_hash_including({:additional_slave_security_groups => ['group1', 'group2']})
+      end
+    end
   end
 
   describe '#run' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elasticity
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.0.8
 platform: ruby
 authors:
 - Robert Slifka
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client