vm_shepherd 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0264092014869cdb1aca61d659d9838c50e239e5
-  data.tar.gz: 77f1ca1d5c5d7d07a6e5aca5325d807c8ba7cc74
+  metadata.gz: dbd68ca7cd87040a4ab49f591a0d2b16331051c9
+  data.tar.gz: 5ceaa7fabf7637124880840b74e3bf27f3d9fb28
 SHA512:
-  metadata.gz: b0c84fd67b03781fe92547580a1b4b4fadf8b042df347010489c294620050756e2048e962c26c170212d6845fdf0734d39e0e194d803810c9eeb95bfcad25621
-  data.tar.gz: effff40c94b612051a6942de07e319bb373dabf816c40de9bb6e4ef96f94ece8443932f9cdb7f6f320d531d5047a0ae26e615daef407533d6ce281a28cbaae57
+  metadata.gz: ef7f38a5e4751e80910e01a4848f3ec49d536c47023bba2984696fdadc008e317dac2d8e5f7e8043e116aa6008a4fbd15e55b5c5dba3a909a2d49338d68209fc
+  data.tar.gz: 7d240aa912d76813f3621b994c63fff6bae93336c17a4999156b5b4cfd018e11ecd5670b07490adc5efdd0a8865437858c765c50edd31bc5d46068995950558d

data/lib/vm_shepherd/aws_manager.rb

@@ -5,7 +5,6 @@ module VmShepherd
   class AwsManager
     include VmShepherd::RetryHelper
 
-    AWS_REGION = 'us-east-1'
     OPS_MANAGER_INSTANCE_TYPE = 'm3.medium'
     DO_NOT_TERMINATE_TAG_KEY = 'do_not_terminate'
     ELB_SECURITY_GROUP_NAME = 'ELB Security Group'
@@ -14,7 +13,7 @@ module VmShepherd
       AWS.config(
         access_key_id: env_config.fetch(:aws_access_key),
         secret_access_key: env_config.fetch(:aws_secret_key),
-        region: AWS_REGION
+        region: env_config.fetch(:region),
       )
       @env_config = env_config
     end

data/lib/vm_shepherd/shepherd.rb

@@ -200,6 +200,7 @@ module VmShepherd
           stack_name: settings.vm_shepherd.env_config.stack_name,
           aws_access_key: settings.vm_shepherd.env_config.aws_access_key,
           aws_secret_key: settings.vm_shepherd.env_config.aws_secret_key,
+          region: settings.vm_shepherd.env_config.region,
           json_file: settings.vm_shepherd.env_config.json_file,
           parameters: settings.vm_shepherd.env_config.parameters_as_a_hash,
           outputs: settings.vm_shepherd.env_config.outputs.to_h,

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/spec/fixtures/shepherd/aws-no-elb.yml

@@ -5,6 +5,7 @@ vm_shepherd:
     stack_name: aws-stack-name
     aws_access_key: aws-access-key
     aws_secret_key: aws-secret-key
+    region: aws-region
     json_file: cloudformation.json
     parameters:
       key_pair_name: key_pair_name

data/spec/fixtures/shepherd/aws.yml

@@ -5,6 +5,7 @@ vm_shepherd:
     stack_name: aws-stack-name
     aws_access_key: aws-access-key
     aws_secret_key: aws-secret-key
+    region: aws-region
     json_file: cloudformation.json
     parameters:
       key_pair_name: key_pair_name

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -14,6 +14,7 @@ module VmShepherd
         stack_name: 'aws-stack-name',
         aws_access_key: 'aws-access-key',
         aws_secret_key: 'aws-secret-key',
+        region: 'us-east-1',
         json_file: 'cloudformation.json',
         parameters: {
           'some_parameter' => 'some-answer',
@@ -42,7 +43,7 @@ module VmShepherd
       expect(AWS).to receive(:config).with(
           access_key_id: env_config.fetch(:aws_access_key),
           secret_access_key: env_config.fetch(:aws_secret_key),
-          region: 'us-east-1',
+          region: env_config.fetch(:region),
         )
 
       allow(AWS).to receive(:ec2).and_return(ec2)

data/spec/vm_shepherd/shepherd_spec.rb

@@ -14,6 +14,7 @@ module VmShepherd
         stack_name: 'aws-stack-name',
         aws_access_key: 'aws-access-key',
         aws_secret_key: 'aws-secret-key',
+        region: 'aws-region',
         json_file: 'cloudformation.json',
         parameters: {
           'key_pair_name' => 'key_pair_name'
@@ -25,6 +26,10 @@ module VmShepherd
           private_subnet_id: 'private-subnet-id',
           s3_bucket_name: 'bucket-name',
         },
+      }.merge(aws_elb_config)
+    end
+    let(:aws_elb_config) do
+      {
         elb: {
           name: 'some-elb-name',
           port_mappings: [[1111, 11]],
@@ -190,25 +195,7 @@ module VmShepherd
 
         context 'when there is no ELB configuration' do
           let(:settings_fixture_name) { 'aws-no-elb.yml' }
-
-          let(:aws_env_config) do
-            {
-              stack_name: 'aws-stack-name',
-              aws_access_key: 'aws-access-key',
-              aws_secret_key: 'aws-secret-key',
-              json_file: 'cloudformation.json',
-              parameters: {
-                'key_pair_name' => 'key_pair_name'
-              },
-              outputs: {
-                ssh_key_name: 'ssh-key-name',
-                security_group: 'security-group-id',
-                public_subnet_id: 'public-subnet-id',
-                private_subnet_id: 'private-subnet-id',
-                s3_bucket_name: 'bucket-name',
-              },
-            }
-          end
+          let(:aws_elb_config) { {} }
 
           it 'uses AwsManager to launch a VM' do
             expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
@@ -382,25 +369,7 @@ module VmShepherd
 
         context 'when there is no ELB configuration' do
           let(:settings_fixture_name) { 'aws-no-elb.yml' }
-
-          let(:aws_env_config) do
-            {
-              stack_name: 'aws-stack-name',
-              aws_access_key: 'aws-access-key',
-              aws_secret_key: 'aws-secret-key',
-              json_file: 'cloudformation.json',
-              parameters: {
-                'key_pair_name' => 'key_pair_name'
-              },
-              outputs: {
-                ssh_key_name: 'ssh-key-name',
-                security_group: 'security-group-id',
-                public_subnet_id: 'public-subnet-id',
-                private_subnet_id: 'private-subnet-id',
-                s3_bucket_name: 'bucket-name',
-              },
-            }
-          end
+          let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to destroy a VM' do
             expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
@@ -578,25 +547,7 @@ module VmShepherd
 
         context 'when there is no ELB configuration' do
           let(:settings_fixture_name) { 'aws-no-elb.yml' }
-
-          let(:aws_env_config) do
-            {
-              stack_name: 'aws-stack-name',
-              aws_access_key: 'aws-access-key',
-              aws_secret_key: 'aws-secret-key',
-              json_file: 'cloudformation.json',
-              parameters: {
-                'key_pair_name' => 'key_pair_name'
-              },
-              outputs: {
-                ssh_key_name: 'ssh-key-name',
-                security_group: 'security-group-id',
-                public_subnet_id: 'public-subnet-id',
-                private_subnet_id: 'private-subnet-id',
-                s3_bucket_name: 'bucket-name',
-              },
-            }
-          end
+          let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to destroy a VM' do
             expect(AwsManager).to receive(:new).with(aws_env_config).and_return(aws_manager)
@@ -659,25 +610,7 @@ module VmShepherd
 
         context 'when there is no ELB configuration' do
           let(:settings_fixture_name) { 'aws-no-elb.yml' }
-
-          let(:aws_env_config) do
-            {
-              stack_name: 'aws-stack-name',
-              aws_access_key: 'aws-access-key',
-              aws_secret_key: 'aws-secret-key',
-              json_file: 'cloudformation.json',
-              parameters: {
-                'key_pair_name' => 'key_pair_name'
-              },
-              outputs: {
-                ssh_key_name: 'ssh-key-name',
-                security_group: 'security-group-id',
-                public_subnet_id: 'public-subnet-id',
-                private_subnet_id: 'private-subnet-id',
-                s3_bucket_name: 'bucket-name',
-              },
-            }
-          end
+          let(:aws_elb_config) {{}}
 
           it 'uses AwsManager to create an environment' do
             expect(AwsManager).to receive(:new).with(aws_env_config).and_return(ams_manager)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1