kitchen-ec2 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bc71d150397e78c72c0e48f96d8eebf93ee227bb67cce40098a4e0849f90b06
-  data.tar.gz: 9a6dbe12a9e3d4dff4f1be3b261853947dddccc9efd8ee48527da3d50fb1d9f7
+  metadata.gz: 0cbb5b5baa43b4a35611f1fce155cf03e02112a442c9b6a92f76cda3ba429114
+  data.tar.gz: 1e9ebf93508345571c1805727e9bc2f978562e66d54ee1d92574252dc259b180
 SHA512:
-  metadata.gz: a43e3f090636c341507d99c45fa488659133c7d322f65c19593d17ae0b3f4db62140999571d2ea5233d76d7bcfc3bf3ad08ddb88f58cd6e032f03df25283d229
-  data.tar.gz: 4ce417d3f551c5eb7ca892b745255922deaf2ca5a88d20ebe6aba1ba2d0bd3b46b70408d9affbb5ff6716efd51b3bcff81f3bd3eafb473f8f124d8117478ed60
+  metadata.gz: 3781bd12154cb007e3d4ef735862b6411aad1f0923a994815d308507d765e8924d927a9d520649e7ab5a2c12227fe3ba775e5fdd5b78f2c844d743ec59b8cebc
+  data.tar.gz: 83a7d1855e0f8224f6844aa9fe4cb2342106a7966bf7fbd463606a39b8ae38b3e43e894ee8a2d1a5b35c5507f02055203ed4bdbb74505e2feb2f653a3cb14607

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

@@ -62,22 +62,37 @@ module Kitchen
           end
 
           if config[:security_group_ids].nil? && config[:security_group_filter]
-            security_group = ::Aws::EC2::Client
-                .new(region: config[:region]).describe_security_groups(
-                filters: [
-                    {
-                        name: "tag:#{config[:security_group_filter][:tag]}",
-                        values: [config[:security_group_filter][:value]],
-                    },
+            security_groups = []
+            filters = [config[:security_group_filter]].flatten
+            filters.each do |sg_filter|
+              r = {}
+              if sg_filter[:name]
+                r[:filters] = [
+                  {
+                    name: "group-name",
+                    values: [sg_filter[:name]],
+                  },
                 ]
-            )[0][0]
+              end
 
-            if security_group
-              config[:security_group_ids] = [security_group.group_id]
-            else
-              raise "The group tagged '#{config[:security_group_filter][:tag]} " +
-                "#{config[:security_group_filter][:value]}' does not exist!"
+              if sg_filter[:tag]
+                r[:filters] = [
+                  {
+                    name: "tag:#{sg_filter[:tag]}",
+                    values: [sg_filter[:value]],
+                  },
+                ]
+              end
+
+              security_group = ::Aws::EC2::Client.new(region: config[:region]).describe_security_groups(r)[0][0]
+
+              if security_group
+                security_groups.push(security_group.group_id)
+              else
+                raise "A Security Group matching the following filter could not be found:\n#{sg_filter}"
+              end
             end
+            config[:security_group_ids] = security_groups
           end
 
           i = {

data/lib/kitchen/driver/ec2.rb

@@ -74,6 +74,7 @@ module Kitchen
       default_config :spot_price,         nil
       default_config :block_duration_minutes, nil
       default_config :retryable_tries,    60
+      default_config :spot_wait,          60
       default_config :retryable_sleep,    5
       default_config :aws_access_key_id,  nil
       default_config :aws_secret_access_key, nil
@@ -229,18 +230,15 @@ module Kitchen
 
         if config[:spot_price]
           # Spot instance when a price is set
-          server = with_request_limit_backoff(state) { submit_spot(state) }
+          server = with_request_limit_backoff(state) { submit_spots(state) }
         else
           # On-demand instance
           server = with_request_limit_backoff(state) { submit_server }
         end
         info("Instance <#{server.id}> requested.")
         with_request_limit_backoff(state) do
-          server.wait_until_exists do |w|
-            w.before_attempt do |attempts|
-              info("Polling AWS for existence, attempt #{attempts}...")
-            end
-          end
+          logging_proc = ->(attempts) { info("Polling AWS for existence, attempt #{attempts}...") }
+          server.wait_until_exists(before_attempt: logging_proc)
         end
 
         # See https://github.com/aws/aws-sdk-ruby/issues/859
@@ -407,7 +405,7 @@ module Kitchen
       end
 
       def instance_generator
-        @instance_generator ||= Aws::InstanceGenerator.new(config, ec2, instance.logger)
+        @instance_generator = Aws::InstanceGenerator.new(config, ec2, instance.logger)
       end
 
       # Fog AWS helper for creating the instance
@@ -422,6 +420,53 @@ module Kitchen
         ec2.create_instance(instance_data)
       end
 
+      def config
+        return super unless @config
+        @config
+      end
+
+      # Take one config and expand to multiple configs
+      def expand_config(conf, key)
+        configs = []
+
+        if conf[key] && conf[key].kind_of?(Array)
+          values = conf[key]
+          values.each do |value|
+            new_config = conf.clone
+            new_config[key] = value
+            configs.push new_config
+          end
+        else
+          configs.push conf
+        end
+
+        configs
+      end
+
+      def submit_spots(state)
+        configs = [config]
+        expanded = []
+        keys = [:instance_type, :subnet_id]
+
+        keys.each do |key|
+          configs.each do |conf|
+            expanded.push expand_config(conf, key)
+          end
+          configs = expanded.flatten
+          expanded = []
+        end
+
+        configs.each do |conf|
+          begin
+            @config = conf
+            return submit_spot(state)
+          rescue
+          end
+        end
+
+        raise "Could not create a spot"
+      end
+
       def submit_spot(state)
         debug("Creating EC2 Spot Instance..")
 
@@ -433,11 +478,11 @@ module Kitchen
           :spot_instance_request_fulfilled,
           spot_instance_request_ids: [spot_request_id]
         ) do |w|
-          w.max_attempts = config[:retryable_tries]
+          w.max_attempts = config[:spot_wait] / config[:retryable_sleep]
           w.delay = config[:retryable_sleep]
           w.before_attempt do |attempts|
             c = attempts * config[:retryable_sleep]
-            t = config[:retryable_tries] * config[:retryable_sleep]
+            t = config[:spot_wait]
             info "Waited #{c}/#{t}s for spot request <#{spot_request_id}> to become fulfilled."
           end
         end
@@ -445,9 +490,15 @@ module Kitchen
       end
 
       def create_spot_request
-        request_duration = config[:retryable_tries] * config[:retryable_sleep]
+        request_duration = config[:spot_wait]
+        config_spot_price = config[:spot_price].to_s
+        if ["ondemand", "on-demand"].include?(config_spot_price)
+          spot_price = ""
+        else
+          spot_price = config_spot_price
+        end
         request_data = {
-          spot_price: config[:spot_price].to_s,
+          spot_price: spot_price,
           launch_specification: instance_generator.ec2_instance_data,
           valid_until: Time.now + request_duration,
         }
@@ -593,6 +644,7 @@ module Kitchen
           "public" => "public_ip_address",
           "private" => "private_ip_address",
           "private_dns" => "private_dns_name",
+          "id" => "id",
         }.freeze
 
       #

data/lib/kitchen/driver/ec2_version.rb

@@ -22,6 +22,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "3.0.1".freeze
+    EC2_VERSION = "3.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen