vm_shepherd 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c32036e3aca4e84839df2a57544f620b8c1d29a
-  data.tar.gz: 1247e3b6de98c44acf42bfb39f0f1c38bbe79d00
+  metadata.gz: 66180f53e136f3ed2f438bc830ac0b81e72e9981
+  data.tar.gz: 53a28aa4ac6738c43490c19f8f6ea75f41cf6c66
 SHA512:
-  metadata.gz: 41484520464f955a1b95bd7766a34cc19789e817651ba6dcbd703c155692948db0351f397cfc6a63b417cd2468c4226e30eeef697d85cab8e62f5e92c9d5447c
-  data.tar.gz: ca9d0d8cd53359c809524de9d6528aeef537cc76431f8533a9ce4b4cd44a54f98da3ac8ce1a2e1e1ce2bc0dbc6fe88d76ca73212bcdeccdf2c044b2043f0282c
+  metadata.gz: 94d07d4851ee5f95c27e2955e15da9160f40636177f4e12f33b3ada3be01a2bc835e16de85d82bada775c1a2f83489a02d9a72f26a89efed4e596a66d5c6279f
+  data.tar.gz: 2a9da981e0d32cbb622170c4d42dc44a6d4ff829aaa08da3473e2ca2132017adc0e8bf22a59230f9901f3b17c5284219ff8d80a24cc44aa80583085e63cfdb2d

data/lib/vm_shepherd/aws_manager.rb

@@ -8,24 +8,24 @@ module VmShepherd
     include VmShepherd::RetryHelper
 
     OPS_MANAGER_INSTANCE_TYPE = 'm3.medium'
-    DO_NOT_TERMINATE_TAG_KEY  = 'do_not_terminate'
-    ELB_SECURITY_GROUP_NAME   = 'ELB Security Group'
+    DO_NOT_TERMINATE_TAG_KEY = 'do_not_terminate'
+    ELB_SECURITY_GROUP_NAME = 'ELB Security Group'
 
-    CREATE_IN_PROGRESS   = 'CREATE_IN_PROGRESS'
-    CREATE_COMPLETE      = 'CREATE_COMPLETE'
+    CREATE_IN_PROGRESS = 'CREATE_IN_PROGRESS'
+    CREATE_COMPLETE = 'CREATE_COMPLETE'
     ROLLBACK_IN_PROGRESS = 'ROLLBACK_IN_PROGRESS'
-    ROLLBACK_COMPLETE    = 'ROLLBACK_COMPLETE'
-    DELETE_IN_PROGRESS   = 'DELETE_IN_PROGRESS'
-    DELETE_COMPLETE      = 'DELETE_COMPLETE'
+    ROLLBACK_COMPLETE = 'ROLLBACK_COMPLETE'
+    DELETE_IN_PROGRESS = 'DELETE_IN_PROGRESS'
+    DELETE_COMPLETE = 'DELETE_COMPLETE'
 
     def initialize(env_config:, logger:)
       AWS.config(
-        access_key_id:     env_config.fetch('aws_access_key'),
+        access_key_id: env_config.fetch('aws_access_key'),
         secret_access_key: env_config.fetch('aws_secret_key'),
-        region:            env_config.fetch('region'),
+        region: env_config.fetch('region'),
       )
       @env_config = env_config
-      @logger     = logger
+      @logger = logger
     end
 
     def prepare_environment(cloudformation_template_file)
@@ -58,19 +58,11 @@ module VmShepherd
     end
 
     def deploy(ami_file_path:, vm_config:)
-      image_id = read_ami_id(ami_file_path)
-
       logger.info('Starting AMI Instance creation')
       instance =
         retry_until do
           begin
-            AWS.ec2.instances.create(
-              image_id:           image_id,
-              key_name:           env_config.fetch('outputs').fetch('ssh_key_name'),
-              security_group_ids: [env_config.fetch('outputs').fetch('security_group')],
-              subnet:             env_config.fetch('outputs').fetch('public_subnet_id'),
-              instance_type:      OPS_MANAGER_INSTANCE_TYPE
-            )
+            AWS.ec2.instances.create(instance_create_params(ami_file_path))
           rescue AWS::EC2::Errors::InvalidIPAddress::InUse
             false
           end
@@ -128,7 +120,7 @@ module VmShepherd
       AWS.ec2.instances.each do |instance|
         if instance.tags.to_h['Name'] == vm_config.fetch('vm_name')
           vm_ip_address = vm_config.fetch('vm_ip_address', nil)
-          elastic_ip    = instance.elastic_ip unless vm_ip_address
+          elastic_ip = instance.elastic_ip unless vm_ip_address
           if elastic_ip
             elastic_ip.disassociate
             elastic_ip.delete
@@ -141,6 +133,23 @@ module VmShepherd
     private
     attr_reader :env_config, :logger
 
+    def instance_create_params(ami_file_path)
+      create_params =
+        {
+          image_id: read_ami_id(ami_file_path),
+          key_name: env_config.fetch('outputs').fetch('ssh_key_name'),
+          security_group_ids: [env_config.fetch('outputs').fetch('security_group')],
+          subnet: env_config.fetch('outputs').fetch('public_subnet_id'),
+          instance_type: OPS_MANAGER_INSTANCE_TYPE
+        }
+
+      if (instance_profile = env_config.fetch('outputs').fetch('instance_profile'))
+        create_params.merge!(iam_instance_profile: instance_profile)
+      end
+
+      create_params
+    end
+
     def subnet_id(stack, elb_config)
       stack.outputs.detect { |o| o.key == elb_config.dig('stack_output_keys', 'subnet_id') }.value
     end
@@ -151,7 +160,7 @@ module VmShepherd
 
     def clear_subnet(subnet_id)
       logger.info("Clearing contents of subnet: #{subnet_id}")
-      subnet  = AWS.ec2.subnets[subnet_id]
+      subnet = AWS.ec2.subnets[subnet_id]
       volumes = []
       subnet.instances.each do |instance|
         instance.attachments.each do |_, attachment|
@@ -177,7 +186,7 @@ module VmShepherd
 
     def delete_elb(elb_name)
       if (elb = AWS::ELB.new.load_balancers.find { |lb| lb.name == elb_name })
-        sg             = elb.security_groups.first
+        sg = elb.security_groups.first
         net_interfaces = AWS.ec2.network_interfaces.select do |ni|
           begin
             ni.security_groups.map(&:id).include? sg.id
@@ -197,17 +206,17 @@ module VmShepherd
     end
 
     def create_elb(stack, elb_config)
-      elb        = AWS::ELB.new
+      elb = AWS::ELB.new
       elb_params = {
         load_balancer_name: elb_config['name'],
-        listeners:          [],
-        subnets:            [subnet_id(stack, elb_config)],
-        security_groups:    [create_security_group(stack, elb_config).security_group_id]
+        listeners: [],
+        subnets: [subnet_id(stack, elb_config)],
+        security_groups: [create_security_group(stack, elb_config).security_group_id]
       }
 
       elb_config['port_mappings'].each do |port_mapping|
         elb_params[:listeners] << {
-          protocol:          'TCP', load_balancer_port: port_mapping[0],
+          protocol: 'TCP', load_balancer_port: port_mapping[0],
           instance_protocol: 'TCP', instance_port: port_mapping[1]
         }
       end
@@ -217,11 +226,11 @@ module VmShepherd
     end
 
     def create_security_group(stack, elb_config)
-      vpc_id    = vpc_id(stack, elb_config)
+      vpc_id = vpc_id(stack, elb_config)
       sg_params = {
-        group_name:  [stack.name, elb_config['name']].join('_'),
+        group_name: [stack.name, elb_config['name']].join('_'),
         description: 'ELB Security Group',
-        vpc_id:      vpc_id,
+        vpc_id: vpc_id,
       }
 
       logger.info('Creating a Security Group for the ELB')
@@ -235,7 +244,7 @@ module VmShepherd
     end
 
     def delete_stack(stack_name)
-      cfm   = AWS::CloudFormation.new
+      cfm = AWS::CloudFormation.new
       stack = cfm.stacks[stack_name]
       logger.info('deleting CloudFormation stack')
       stack.delete

data/lib/vm_shepherd/version.rb

@@ -1,3 +1,3 @@
 module VmShepherd
-  VERSION = '3.0.4'.freeze
+  VERSION = '3.0.5'.freeze
 end

data/spec/vm_shepherd/aws_manager_spec.rb

@@ -16,19 +16,20 @@ module VmShepherd
 
     let(:env_config) do
       {
-        'stack_name'     => 'aws-stack-name',
+        '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'     => {
+        'region' => 'us-east-1',
+        'json_file' => 'cloudformation.json',
+        'parameters' => {
           'some_parameter' => 'some-answer',
         },
-        'outputs'        => {
-          'subnets'      => ['public-subnet-id', 'private-subnet-id'],
-          'ssh_key_name'      => 'ssh-key-name',
-          'security_group'    => 'security-group-id',
-          'public_subnet_id'  => 'public-subnet-id',
+        'outputs' => {
+          'subnets' => ['public-subnet-id', 'private-subnet-id'],
+          'ssh_key_name' => 'ssh-key-name',
+          'security_group' => 'security-group-id',
+          'public_subnet_id' => 'public-subnet-id',
+          'instance_profile' => nil,
         }.merge(extra_outputs),
       }.merge(extra_configs)
     end
@@ -47,9 +48,9 @@ module VmShepherd
 
     before do
       expect(AWS).to receive(:config).with(
-        access_key_id:     env_config.fetch('aws_access_key'),
+        access_key_id: env_config.fetch('aws_access_key'),
         secret_access_key: env_config.fetch('aws_secret_key'),
-        region:            env_config.fetch('region'),
+        region: env_config.fetch('region'),
       )
 
       allow(AWS).to receive(:ec2).and_return(ec2)
@@ -81,7 +82,7 @@ module VmShepherd
           expect(stack_collection).to receive(:create).with(
             'aws-stack-name',
             '{}',
-            parameters:   {
+            parameters: {
               'some_parameter' => 'some-answer',
             },
             capabilities: ['CAPABILITY_IAM']
@@ -116,18 +117,18 @@ module VmShepherd
           {
             'elbs' => [
               {
-                'name'              => 'elb-1-name',
-                'port_mappings'     => [[1111, 11]],
+                'name' => 'elb-1-name',
+                'port_mappings' => [[1111, 11]],
                 'stack_output_keys' => {
-                  'vpc_id'    => 'vpc_id',
+                  'vpc_id' => 'vpc_id',
                   'subnet_id' => 'private_subnet',
                 },
               },
               {
-                'name'              => 'elb-2-name',
-                'port_mappings'     => [[2222, 22]],
+                'name' => 'elb-2-name',
+                'port_mappings' => [[2222, 22]],
                 'stack_output_keys' => {
-                  'vpc_id'    => 'vpc_id',
+                  'vpc_id' => 'vpc_id',
                   'subnet_id' => 'private_subnet',
                 },
               }
@@ -136,10 +137,10 @@ module VmShepherd
         end
         let(:stack) do
           instance_double(AWS::CloudFormation::Stack,
-                          name:          'fake-stack-name',
-                          creation_time: Time.utc(2015, 5, 29),
-                          status:        'CREATE_COMPLETE',
-                          outputs:       stack_outputs
+            name: 'fake-stack-name',
+            creation_time: Time.utc(2015, 5, 29),
+            status: 'CREATE_COMPLETE',
+            outputs: stack_outputs
           )
         end
         let(:stack_outputs) do
@@ -178,17 +179,17 @@ module VmShepherd
 
         it 'creates and attaches a security group for the ELBs' do
           elb_1_security_group_args = {
-            group_name:  'fake-stack-name_elb-1-name',
+            group_name: 'fake-stack-name_elb-1-name',
             description: 'ELB Security Group',
-            vpc_id:      'fake-vpc-id',
+            vpc_id: 'fake-vpc-id',
           }
           expect(ec2_client).to receive(:create_security_group).with(elb_1_security_group_args).and_return(create_security_group_response_1)
           expect(elb_1_security_group).to receive(:authorize_ingress).with(:tcp, 1111, '0.0.0.0/0')
 
           elb_2_security_group_args = {
-            group_name:  'fake-stack-name_elb-2-name',
+            group_name: 'fake-stack-name_elb-2-name',
             description: 'ELB Security Group',
-            vpc_id:      'fake-vpc-id',
+            vpc_id: 'fake-vpc-id',
           }
           expect(ec2_client).to receive(:create_security_group).with(elb_2_security_group_args).and_return(create_security_group_response_2)
           expect(elb_2_security_group).to receive(:authorize_ingress).with(:tcp, 2222, '0.0.0.0/0')
@@ -199,16 +200,16 @@ module VmShepherd
         it 'attaches an elb with the name of the stack for the ELBs' do
           elb_1_params = {
             load_balancer_name: 'elb-1-name',
-            listeners:          [{protocol: 'TCP', load_balancer_port: 1111, instance_protocol: 'TCP', instance_port: 11}],
-            subnets:            ['fake-subnet-id'],
-            security_groups:    ['elb-1-security-group-id']
+            listeners: [{protocol: 'TCP', load_balancer_port: 1111, instance_protocol: 'TCP', instance_port: 11}],
+            subnets: ['fake-subnet-id'],
+            security_groups: ['elb-1-security-group-id']
           }
           expect(elb_client).to receive(:create_load_balancer).with(elb_1_params)
           elb_2_params = {
             load_balancer_name: 'elb-2-name',
-            listeners:          [{protocol: 'TCP', load_balancer_port: 2222, instance_protocol: 'TCP', instance_port: 22}],
-            subnets:            ['fake-subnet-id'],
-            security_groups:    ['elb-2-security-group-id']
+            listeners: [{protocol: 'TCP', load_balancer_port: 2222, instance_protocol: 'TCP', instance_port: 22}],
+            subnets: ['fake-subnet-id'],
+            security_groups: ['elb-2-security-group-id']
           }
           expect(elb_client).to receive(:create_load_balancer).with(elb_2_params)
 
@@ -229,15 +230,33 @@ module VmShepherd
         allow(elastic_ip).to receive(:exists?).and_return(true)
       end
 
-      it 'creates an instance using AWS SDK v1' do
-        expect(ec2).to receive_message_chain(:instances, :create).with(
-          image_id:           ami_id,
-          key_name:           'ssh-key-name',
-          security_group_ids: ['security-group-id'],
-          subnet:             'public-subnet-id',
-          instance_type:      'm3.medium').and_return(instance)
+      context 'when no IAM Profile is present' do
+        it 'creates an instance' do
+          expect(ec2).to receive_message_chain(:instances, :create).with(
+            image_id: ami_id,
+            key_name: 'ssh-key-name',
+            security_group_ids: ['security-group-id'],
+            subnet: 'public-subnet-id',
+            instance_type: 'm3.medium').and_return(instance)
 
-        ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+          ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+        end
+      end
+
+      context 'when IAM Profile is present' do
+        let(:extra_outputs) { {'instance_profile' => 'FAKE_INSTANCE_PROFILE'} }
+
+        it 'creates an instance passing the IAM Instance Profile' do
+          expect(ec2).to receive_message_chain(:instances, :create).with(
+            image_id: ami_id,
+            key_name: 'ssh-key-name',
+            security_group_ids: ['security-group-id'],
+            subnet: 'public-subnet-id',
+            iam_instance_profile: 'FAKE_INSTANCE_PROFILE',
+            instance_type: 'm3.medium').and_return(instance)
+
+          ami_manager.deploy(ami_file_path: ami_file_path, vm_config: vm_config)
+        end
       end
 
       context 'when the ip address is in use' do
@@ -307,7 +326,7 @@ module VmShepherd
       context 'vm configuration contains an elastic IP' do
         let(:vm_config) do
           {
-            'vm_name'       => 'some-vm-name',
+            'vm_name' => 'some-vm-name',
             'vm_ip_address' => 'some-ip-address'
           }
         end
@@ -454,18 +473,18 @@ module VmShepherd
           {
             'elbs' => [
               {
-                'name'              => 'elb-1-name',
-                'port_mappings'     => [[1111, 11]],
+                'name' => 'elb-1-name',
+                'port_mappings' => [[1111, 11]],
                 'stack_output_keys' => {
-                  'vpc_id'    => 'vpc_id',
+                  'vpc_id' => 'vpc_id',
                   'subnet_id' => 'private_subnet',
                 },
               },
               {
-                'name'              => 'elb-2-name',
-                'port_mappings'     => [[2222, 22]],
+                'name' => 'elb-2-name',
+                'port_mappings' => [[2222, 22]],
                 'stack_output_keys' => {
-                  'vpc_id'    => 'vpc_id',
+                  'vpc_id' => 'vpc_id',
                   'subnet_id' => 'private_subnet',
                 },
               }
@@ -476,16 +495,16 @@ module VmShepherd
         let(:elb) { instance_double(AWS::ELB, load_balancers: [load_balancer_1_to_delete, load_balancer_2_to_delete, other_load_balancer]) }
         let(:load_balancer_1_to_delete) do
           instance_double(AWS::ELB::LoadBalancer,
-                          name:            'elb-1-name',
-                          security_groups: [elb_1_security_group],
-                          exists?:         false,
+            name: 'elb-1-name',
+            security_groups: [elb_1_security_group],
+            exists?: false,
           )
         end
         let(:load_balancer_2_to_delete) do
           instance_double(AWS::ELB::LoadBalancer,
-                          name:            'elb-2-name',
-                          security_groups: [elb_2_security_group],
-                          exists?:         false,
+            name: 'elb-2-name',
+            security_groups: [elb_2_security_group],
+            exists?: false,
           )
         end
         let(:other_load_balancer) { instance_double(AWS::ELB::LoadBalancer, name: 'other-elb-name') }
@@ -493,26 +512,26 @@ module VmShepherd
         let(:elb_2_security_group) { instance_double(AWS::EC2::SecurityGroup, name: 'elb-2-security-group', id: 'sg-elb-2-id') }
         let(:network_interface_1_elb_1) do
           instance_double(AWS::EC2::NetworkInterface,
-                          security_groups: [elb_1_security_group],
-                          exists?:         false,
+            security_groups: [elb_1_security_group],
+            exists?: false,
           )
         end
         let(:network_interface_2_elb_1) do
           instance_double(AWS::EC2::NetworkInterface,
-                          security_groups: [elb_1_security_group],
-                          exists?:         false,
+            security_groups: [elb_1_security_group],
+            exists?: false,
           )
         end
         let(:network_interface_1_elb_2) do
           instance_double(AWS::EC2::NetworkInterface,
-                          security_groups: [elb_2_security_group],
-                          exists?:         false,
+            security_groups: [elb_2_security_group],
+            exists?: false,
           )
         end
         let(:network_interface_2_elb_2) do
           instance_double(AWS::EC2::NetworkInterface,
-                          security_groups: [elb_2_security_group],
-                          exists?:         false,
+            security_groups: [elb_2_security_group],
+            exists?: false,
           )
         end
 
@@ -755,7 +774,7 @@ module VmShepherd
         let(:elastic_ip) { instance_double(AWS::EC2::ElasticIp) }
         let(:vm_config) do
           {
-            'vm_name'       => 'some-vm-name',
+            'vm_name' => 'some-vm-name',
             'vm_ip_address' => 'some-ip-address'
           }
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vm_shepherd
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Ops Manager Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-18 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-v1