beaker-aws 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b26a191837d6178ca381188d630580e7164fb81
-  data.tar.gz: 8f99f771202aac99eca8c1398d0b8c6c9c72df81
+  metadata.gz: 25ed7d4088360b6932af6030241fbec171819c1f
+  data.tar.gz: 5a087caf648e84fc6886f7cb77aea9c430569fa5
 SHA512:
-  metadata.gz: d8097804f569ec2a6ff9138de95df973af467b2f49d7c03c34b1062313af88a20ae3dc69a1c6f9aafc1d7aaf453574c5e0bf164566b675ab1f5f48669336d297
-  data.tar.gz: 41146639bd25556a5e0a3853c7ad96adaf4b7ae3a20984efb26dd6a0bfd65f22ad1dad3710701c966f24837b98ff5d0a2380e5e313066a456565405b1355ea98
+  metadata.gz: 0e8141e8939e84487128d04be5315dd7e3ac747076d6a01201aa75d16ede330650c06eed48d8d6ef1b052ef8c32abe80a3993db562866492f3d33212ae838263
+  data.tar.gz: bc3a0e59c45667e3a38939a7f8896f404a4997facf5dc7942f826385af689dbf915d6a1424add235ee2c6a32de41212aba0a53a32250e1e410b168974190da71

data/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log
 
-[Unreleased](https://github.com/puppetlabs/beaker-aws/compare/0.8.0...master)
+[Unreleased](https://github.com/puppetlabs/beaker-aws/compare/0.8.1...master)
+
+## [0.8.1](https://github.com/puppetlabs/beaker-aws/tree/0.8.0) (2018-12-21)
+[Full Changelog](https://github.com/puppetlabs/beaker-aws/compare/0.8.0...0.8.1)
+
+**Merged pull requests:**
+
+- \(maint\) Fix BKR-1546 for the case where subnet is nil
 
 ## [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)

data/lib/beaker-aws/version.rb

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

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -267,10 +267,15 @@ module Beaker
       vpc_id = host['vpc_id'] || @options['vpc_id'] || nil
       host['sg_cidr_ips'] = host['sg_cidr_ips'] || '0.0.0.0/0';
       sg_cidr_ips = host['sg_cidr_ips'].split(',')
+      assoc_pub_ip_addr = host['associate_public_ip_address']
 
       if vpc_id && !subnet_id
         raise RuntimeError, "A subnet_id must be provided with a vpc_id"
       end
+      
+      if assoc_pub_ip_addr && !subnet_id
+        raise RuntimeError, "A subnet_id must be provided when configuring assoc_pub_ip_addr"
+      end
 
       # Use snapshot provided for this host
       image_type = host['snapshot']
@@ -345,14 +350,17 @@ module Beaker
         :instance_type => amisize,
         :disable_api_termination => false,
         :instance_initiated_shutdown_behavior => "terminate",
-        :network_interfaces => [{
+      }
+      if assoc_pub_ip_addr
+        config[: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?
+          :associate_public_ip_address => assoc_pub_ip_addr,
+        }]
+      else
+        config[:subnet_id] = subnet_id
+      end
       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

@@ -1234,6 +1234,12 @@ module Beaker
         allow(aws).to receive(:ensure_key_pair).and_return(key_pair_result)
       end
 
+      it 'raises an error when associate_public_ip_address is included without subnet_id' do
+        host = @hosts[0]
+        host['associate_public_ip_address'] = true
+        expect{ aws.create_instance(host, amispec, nil) }.to raise_error("A subnet_id must be provided when configuring assoc_pub_ip_addr")
+      end
+
       it 'sets associate_public_ip_address when included' do
         host = @hosts[0]
         host['associate_public_ip_address'] = true
@@ -1241,13 +1247,13 @@ module Beaker
             :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)
+        aws.create_instance(host, amispec, "subnetfoo")
       end
 
-      it 'omits associate_public_ip_address when not included' do
+      it 'omits network_interfaces and associate_public_ip_address when not included, instead using subnet_id' do
         host = @hosts[0]
         variable_path = hash_including(
-            :network_interfaces => [hash_excluding(:associate_public_ip_address => anything)])
+            :subnet_id => nil)
         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)

metadata

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