kitchen-ec2 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 828a479cf1ebe8de5423fad1926bc74f1cb66ddc1a1b4f853977424e65dd4709
-  data.tar.gz: 67851982c4d376be9ca701040e38d8e7b5cb308a7cf52cd0056da8f898558dcd
+  metadata.gz: 1132f5a8bcb58e6a8c4d38ad342ac2e38afeabbd51abf63b6980a6b4c9474339
+  data.tar.gz: 876fb813038936051338a3be5682fc6633b420aa6faa201b3156879bc9f29430
 SHA512:
-  metadata.gz: 1165fa8225401552970c19983091d8cb38f234a08f9f84a68ebb45cdf05b5670271e92b780b9e8fa0fdecc1c18083e3702f3ddace3561a76628226d09f67ce26
-  data.tar.gz: abe70ab29dacefda005ec11ffa0710841532e7f8407c203daf6bd782acb1c1da59d95c1c188bfca81cc20bd010d2ce7df5c6e78371eff0960f46dcbf3c885245
+  metadata.gz: ae1058987c9efd9e8b7e0f2e0fa152b0a7cefb297d82fb6ab50cc77e1ee84f59e7b9a7fb54b391e9a3b35ae3ee7f3ef704ab6edd7e8fb908c1abe90870cc2c3d
+  data.tar.gz: 5fd929e0e1752d3b7cd1ff5b1e83383be321c95569bc00fee8ab9ad19539e815a3a1d9f692c516550cf5d4da5f667e500bc2ea8d64704a0fc337152fe34744df

data/lib/kitchen/driver/aws/instance_generator.rb

@@ -43,25 +43,26 @@ module Kitchen
         # can be passed in null, others need to be ommitted if they are null
         def ec2_instance_data # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
           # Support for looking up security group id and subnet id using tags.
-
+          vpc_id = nil
+          client = ::Aws::EC2::Client.new(region: config[:region])
           if config[:subnet_id].nil? && config[:subnet_filter]
-            config[:subnet_id] = ::Aws::EC2::Client
-              .new(region: config[:region]).describe_subnets(
-                filters: [
-                  {
-                    name: "tag:#{config[:subnet_filter][:tag]}",
-                    values: [config[:subnet_filter][:value]],
-                  },
-                ]
-              )[0][0].subnet_id
-
-            if config[:subnet_id].nil?
-              raise "The subnet tagged '#{config[:subnet_filter][:tag]}\
-              #{config[:subnet_filter][:value]}' does not exist!"
-            end
+            subnets = client.describe_subnets(
+              filters: [
+                {
+                  name: "tag:#{config[:subnet_filter][:tag]}",
+                  values: [config[:subnet_filter][:value]],
+                },
+              ]
+            ).subnets
+            raise "The subnet tagged '#{config[:subnet_filter][:tag]}:#{config[:subnet_filter][:value]}' does not exist!" unless subnets.any?
+
+            vpc_id = subnets[0].vpc_id
+            config[:subnet_id] = subnets[0].subnet_id
           end
 
           if config[:security_group_ids].nil? && config[:security_group_filter]
+            # => Grab the VPC in the case a Subnet ID rather than Filter was set
+            vpc_id ||= client.describe_subnets(subnet_ids: [config[:subnet_id]]).subnets[0].vpc_id
             security_groups = []
             filters = [config[:security_group_filter]].flatten
             filters.each do |sg_filter|
@@ -72,6 +73,10 @@ module Kitchen
                     name: "group-name",
                     values: [sg_filter[:name]],
                   },
+                  {
+                    name: "vpc-id",
+                    values: [vpc_id],
+                  },
                 ]
               end
 
@@ -81,13 +86,17 @@ module Kitchen
                     name: "tag:#{sg_filter[:tag]}",
                     values: [sg_filter[:value]],
                   },
+                  {
+                    name: "vpc-id",
+                    values: [vpc_id],
+                  },
                 ]
               end
 
-              security_group = ::Aws::EC2::Client.new(region: config[:region]).describe_security_groups(r)[0][0]
+              security_group = client.describe_security_groups(r).security_groups
 
-              if security_group
-                security_groups.push(security_group.group_id)
+              if security_group.any?
+                security_group.each { |sg| security_groups.push(sg.group_id) }
               else
                 raise "A Security Group matching the following filter could not be found:\n#{sg_filter}"
               end

data/lib/kitchen/driver/aws/standard_platform/amazon.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/amazon2.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/centos.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/debian.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/fedora.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/freebsd.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/rhel.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/ubuntu.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/aws/standard_platform/windows.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/driver/aws/standard_platform"
+require_relative "../standard_platform"
 
 module Kitchen
   module Driver

data/lib/kitchen/driver/ec2.rb

@@ -277,7 +277,7 @@ module Kitchen
 
         info("EC2 instance <#{state[:server_id]}> ready (hostname: #{state[:hostname]}).")
         instance.transport.connection(state).wait_until_ready
-        create_ec2_json(state) if instance.provisioner.name =~ /chef/
+        create_ec2_json(state) if instance.provisioner.name =~ /chef/i
         debug("ec2:create '#{state[:hostname]}'")
       rescue Exception
         # Clean up any auto-created security groups or keys on the way out.
@@ -454,15 +454,16 @@ module Kitchen
           expanded = []
         end
 
+        errs = []
         configs.each do |conf|
           begin
             @config = conf
             return submit_spot(state)
-          rescue
+          rescue => e
+            errs.append(e)
           end
         end
-
-        raise "Could not create a spot"
+        raise ["Could not create a spot instance:", errs].flatten.join("\n")
       end
 
       def submit_spot(state)
@@ -788,6 +789,7 @@ module Kitchen
                  elsif config[:subnet_filter]
                    subnets = ec2.client.describe_subnets(filters: [{ name: "tag:#{config[:subnet_filter][:tag]}", values: [config[:subnet_filter][:value]] }]).subnets
                    raise "Subnets with tag '#{config[:subnet_filter][:tag]}=#{config[:subnet_filter][:value]}' not found during security group creation" if subnets.empty?
+
                    subnets.first.vpc_id
                  else
                    # Try to check for a default VPC.

data/lib/kitchen/driver/ec2_version.rb

@@ -2,7 +2,7 @@
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
-# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2016-2020, Chef Software, Inc.
 # Copyright:: 2012-2018, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +22,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "3.2.0".freeze
+    EC2_VERSION = "3.3.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2020-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -168,14 +168,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement