beaker-aws 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4866acd6653e805a28c64c04e3ca86c9906ff7e5
-  data.tar.gz: e6b5052bbe8d40251c1cd9f91bd0c28fec0e905a
+  metadata.gz: 5b26a191837d6178ca381188d630580e7164fb81
+  data.tar.gz: 8f99f771202aac99eca8c1398d0b8c6c9c72df81
 SHA512:
-  metadata.gz: 5118363801c1e62579baa718d2e8a2e2a53fb4a46e15d8f42d20116480696e320dec38a4095e050073c095f1299d8d39ef33e1b945e9a89e64fad99291caea13
-  data.tar.gz: 43651255fa2ea328814945204fc859f2415468024863ba292195c1da7b5dfe171d8a496a7f27e0545cff3b6061f717e18bacb3260553fc699e6b8f2ecb0c538c
+  metadata.gz: d8097804f569ec2a6ff9138de95df973af467b2f49d7c03c34b1062313af88a20ae3dc69a1c6f9aafc1d7aaf453574c5e0bf164566b675ab1f5f48669336d297
+  data.tar.gz: 41146639bd25556a5e0a3853c7ad96adaf4b7ae3a20984efb26dd6a0bfd65f22ad1dad3710701c966f24837b98ff5d0a2380e5e313066a456565405b1355ea98

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+[Unreleased](https://github.com/puppetlabs/beaker-aws/compare/0.8.0...master)
+
+## [0.8.0](https://github.com/puppetlabs/beaker-aws/tree/0.8.0) (2018-12-12)
+[Full Changelog](https://github.com/puppetlabs/beaker-aws/compare/0.7.0...0.8.0)
+
+**Merged pull requests:**
+
+- \(BKR-1546\) Added associate\_public\_ip\_address as host variable that is inserted into the AWS config if set
+
+## [0.7.0](https://github.com/puppetlabs/beaker-aws/tree/0.7.0) (2018-08-27)
+[Full Changelog](https://github.com/puppetlabs/beaker-aws/compare/0.6.0...0.7.0)
+
+**Merged pull requests:**
+
+- \(BKR-1522\) Add options to drop some of the provisioning
+- \(BKR-1509\) Hypervisor usage instructions for Beaker 4.0
+
 ## [0.6.0](https://github.com/puppetlabs/beaker-aws/tree/0.6.0) (2018-07-16)
 [Full Changelog](https://github.com/puppetlabs/beaker-aws/compare/0.5.0...0.6.0)
 
@@ -49,4 +66,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/ec2.md

@@ -114,3 +114,8 @@ By default root login is not allowed with Amazon Linux. Setting it to ec2-user w
 
 #### `disable_root_ssh` ####
 By default Beaker enabled root login on the instance. There are situation where we use AMIs which are pre-configured. Setting `disable_root_ssh` to `true` will stop enablign the root login.
+
+#### `associate_public_ip_address` ####
+Beaker uses default setting from subnet policies for the boolean 
+variable "associate public ip address". Use this setting to 
+override that when needed.

data/lib/beaker-aws/version.rb

@@ -1,3 +1,3 @@
 module BeakerAws
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -342,12 +342,17 @@ module Beaker
           :enabled => true,
         },
         :key_name => ensure_key_pair(region).key_pairs.first.key_name,
-        :security_group_ids => [security_group.group_id, ping_security_group.group_id],
         :instance_type => amisize,
         :disable_api_termination => false,
         :instance_initiated_shutdown_behavior => "terminate",
-        :subnet_id => subnet_id,
+        :network_interfaces => [{
+          :subnet_id => subnet_id,
+          :groups => [security_group.group_id, ping_security_group.group_id],
+          :device_index => 0,
+        }],
       }
+      assoc_pub_ip_addr = host['associate_public_ip_address']
+      config[:network_interfaces][0][:associate_public_ip_address] = assoc_pub_ip_addr unless assoc_pub_ip_addr.nil?
       config[:block_device_mappings] = block_device_mappings if image.root_device_type == :ebs
       reservation = client(region).run_instances(config)
       reservation.instances.first

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -1213,5 +1213,45 @@ module Beaker
         aws
       end
     end
+
+    describe 'create_instance' do
+      let(:mock_client) { instance_double(Aws::EC2::Client) }
+
+      before(:each) do
+        allow(aws).to receive(:client).and_return(mock_client)
+        vpc = instance_double(Aws::EC2::Types::Vpc, :vpc_id => 1337)
+        describe_vpcs_result = instance_double(Aws::EC2::Types::DescribeVpcsResult, :vpcs => [vpc])
+        allow(mock_client).to receive(:describe_vpcs).and_return(describe_vpcs_result)
+        image = instance_double(Aws::EC2::Types::Image, :root_device_type => :no_device)
+        described_images = instance_double(Aws::EC2::Types::DescribeImagesResult, :images => [image])
+        allow(mock_client).to receive(:describe_images).and_return(described_images)
+        security_group = instance_double(Aws::EC2::Types::GroupIdentifier, :group_id => 69)
+        security_groups_result =
+            instance_double(Aws::EC2::Types::DescribeSecurityGroupsResult, :security_groups => [security_group])
+        allow(mock_client).to receive(:describe_security_groups).and_return(security_groups_result)
+        key_pair = instance_double(Aws::EC2::Types::KeyPairInfo, :key_name => 'a-key')
+        key_pair_result = instance_double(Aws::EC2::Types::DescribeKeyPairsResult, :key_pairs => [key_pair])
+        allow(aws).to receive(:ensure_key_pair).and_return(key_pair_result)
+      end
+
+      it 'sets associate_public_ip_address when included' do
+        host = @hosts[0]
+        host['associate_public_ip_address'] = true
+        variable_path = hash_including(
+            :network_interfaces => [hash_including(:associate_public_ip_address => true)])
+        reservation = instance_double(Aws::EC2::Types::Reservation, :instances => [instance_double(Aws::EC2::Types::Instance)])
+        expect(mock_client).to receive(:run_instances).with(variable_path).and_return(reservation)
+        aws.create_instance(host, amispec, nil)
+      end
+
+      it 'omits associate_public_ip_address when not included' do
+        host = @hosts[0]
+        variable_path = hash_including(
+            :network_interfaces => [hash_excluding(:associate_public_ip_address => anything)])
+        reservation = instance_double(Aws::EC2::Types::Reservation, :instances => [instance_double(Aws::EC2::Types::Instance)])
+        expect(mock_client).to receive(:run_instances).with(variable_path).and_return(reservation)
+        aws.create_instance(host, amispec, nil)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-aws
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-27 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec