kitchen-ec2 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbb5b5baa43b4a35611f1fce155cf03e02112a442c9b6a92f76cda3ba429114
-  data.tar.gz: 1e9ebf93508345571c1805727e9bc2f978562e66d54ee1d92574252dc259b180
+  metadata.gz: 828a479cf1ebe8de5423fad1926bc74f1cb66ddc1a1b4f853977424e65dd4709
+  data.tar.gz: 67851982c4d376be9ca701040e38d8e7b5cb308a7cf52cd0056da8f898558dcd
 SHA512:
-  metadata.gz: 3781bd12154cb007e3d4ef735862b6411aad1f0923a994815d308507d765e8924d927a9d520649e7ab5a2c12227fe3ba775e5fdd5b78f2c844d743ec59b8cebc
-  data.tar.gz: 83a7d1855e0f8224f6844aa9fe4cb2342106a7966bf7fbd463606a39b8ae38b3e43e894ee8a2d1a5b35c5507f02055203ed4bdbb74505e2feb2f653a3cb14607
+  metadata.gz: 1165fa8225401552970c19983091d8cb38f234a08f9f84a68ebb45cdf05b5670271e92b780b9e8fa0fdecc1c18083e3702f3ddace3561a76628226d09f67ce26
+  data.tar.gz: abe70ab29dacefda005ec11ffa0710841532e7f8407c203daf6bd782acb1c1da59d95c1c188bfca81cc20bd010d2ce7df5c6e78371eff0960f46dcbf3c885245

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

@@ -127,7 +127,7 @@ module Kitchen
           if config[:iam_profile_name]
             i[:iam_instance_profile] = { name: config[:iam_profile_name] }
           end
-          if !config.fetch(:associate_public_ip, nil).nil?
+          unless config.fetch(:associate_public_ip, nil).nil?
             i[:network_interfaces] =
               [{
                 device_index: 0,

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

@@ -27,6 +27,7 @@ module Kitchen
             # Centos 6.x images use root as the username (but the "centos 6"
             # updateable image uses "centos")
             return "root" if version && version.start_with?("6.")
+
             "centos"
           end
 

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

@@ -27,8 +27,7 @@ module Kitchen
             "ec2-user"
           end
 
-          def sudo_command
-          end
+          def sudo_command; end
 
           def image_search
             search = {

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

@@ -47,6 +47,8 @@ module Kitchen
           #   Windows_Server-2012-R2_RTM-
           # "windows-2016" -> [2016, 0, nil]
           #   Windows_Server-2016-
+          # "windows-2019" -> [2019, 0, nil]
+          #   Windows_Server-2019-
           def image_search
             search = {
               "owner-alias" => "amazon",
@@ -94,6 +96,7 @@ module Kitchen
           # 2012sp4 -> [ 2012, 0, 4 ]
           # 2012rtm -> [ 2012, 0, 0 ]
           # 2016 -> [ 2016, 0, nil ]
+          # 2019 -> [ 2019, 0, nil ]
           # 1709 -> [ 1709, 0, nil ]
           # 1803 -> [ 1803, 0, nil ]
           def windows_version_parts
@@ -129,9 +132,8 @@ module Kitchen
 
           def windows_name_filter # rubocop:disable Metrics/MethodLength
             major, revision, service_pack = windows_version_parts
-
-            if major == 2016
-              "Windows_Server-2016-English-Full-Base-*"
+            if major == 2019 || major == 2016
+              "Windows_Server-#{major}-English-Full-Base-*"
             elsif major == 1709 || major == 1803
               "Windows_Server-#{major}-English-Core-ContainersLatest-*"
             else

data/lib/kitchen/driver/ec2.rb

@@ -56,9 +56,7 @@ module Kitchen
       default_config :region, ENV["AWS_REGION"] || "us-east-1"
       default_config :shared_credentials_profile, ENV["AWS_PROFILE"]
       default_config :availability_zone, nil
-      default_config :instance_type do |driver|
-        driver.default_instance_type
-      end
+      default_config :instance_type, &:default_instance_type
       default_config :ebs_optimized,      false
       default_config :security_group_ids, nil
       default_config :security_group_filter, nil
@@ -80,9 +78,7 @@ module Kitchen
       default_config :aws_secret_access_key, nil
       default_config :aws_session_token,  nil
       default_config :aws_ssh_key_id,     ENV["AWS_SSH_KEY_ID"]
-      default_config :image_id do |driver|
-        driver.default_ami
-      end
+      default_config :image_id, &:default_ami
       default_config :image_search,       nil
       default_config :username,           nil
       default_config :associate_public_ip, nil
@@ -110,7 +106,7 @@ module Kitchen
       end
 
       # TODO: remove these in 1.1
-      deprecated_configs = [:ebs_volume_size, :ebs_delete_on_termination, :ebs_device_name]
+      deprecated_configs = %i{ebs_volume_size ebs_delete_on_termination ebs_device_name}
       deprecated_configs.each do |d|
         validations[d] = lambda do |attr, val, driver|
           unless val.nil?
@@ -200,6 +196,7 @@ module Kitchen
 
       def create(state)
         return if state[:server_id]
+
         update_username(state)
 
         info(Kitchen::Util.outdent!(<<-END)) unless config[:skip_cost_warning]
@@ -422,6 +419,7 @@ module Kitchen
 
       def config
         return super unless @config
+
         @config
       end
 
@@ -429,7 +427,7 @@ module Kitchen
       def expand_config(conf, key)
         configs = []
 
-        if conf[key] && conf[key].kind_of?(Array)
+        if conf[key] && conf[key].is_a?(Array)
           values = conf[key]
           values.each do |value|
             new_config = conf.clone
@@ -446,7 +444,7 @@ module Kitchen
       def submit_spots(state)
         configs = [config]
         expanded = []
-        keys = [:instance_type, :subnet_id]
+        keys = %i{instance_type subnet_id}
 
         keys.each do |key|
           configs.each do |conf|
@@ -492,7 +490,7 @@ module Kitchen
       def create_spot_request
         request_duration = config[:spot_wait]
         config_spot_price = config[:spot_price].to_s
-        if ["ondemand", "on-demand"].include?(config_spot_price)
+        if %w{ondemand on-demand}.include?(config_spot_price)
           spot_price = ""
         else
           spot_price = config_spot_price
@@ -543,8 +541,7 @@ module Kitchen
           ready_volume_count = 0
           if aws_instance.exists?
             described_volume_count = ec2.client.describe_volumes(filters: [
-              { name: "attachment.instance-id", values: ["#{state[:server_id]}"] }]
-              ).volumes.length
+              { name: "attachment.instance-id", values: ["#{state[:server_id]}"] }]).volumes.length
             aws_instance.volumes.each { ready_volume_count += 1 }
           end
           (described_volume_count > 0) && (described_volume_count == ready_volume_count)
@@ -626,6 +623,7 @@ module Kitchen
           yield
         rescue ::Aws::EC2::Errors::RequestLimitExceeded, ::Aws::Waiters::Errors::UnexpectedError => e
           raise unless retries < 5 && e.message.include?("Request limit exceeded")
+
           retries += 1
           info("Request limit exceeded for instance <#{state[:server_id]}>." \
                " Trying again in #{retries**2} seconds.")
@@ -689,7 +687,7 @@ module Kitchen
       def default_windows_user_data
         base_script = Kitchen::Util.outdent!(<<-EOH)
 	$OSVersion = (get-itemproperty -Path "HKLM:\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" -Name ProductName).ProductName
-  If($OSVersion.contains('2016') -Or $OSVersion -eq 'Windows Server Datacenter') {
+  If($OSVersion.contains('2016') -Or $OSVersion.contains('2019') -Or $OSVersion -eq 'Windows Server Datacenter') {
     New-Item -ItemType Directory -Force -Path 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log'
     $logfile='C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
     # EC2Launch doesn't init extra disks by default
@@ -779,11 +777,17 @@ module Kitchen
       # @return [void]
       def create_security_group(state)
         return if state[:auto_security_group_id]
+
         # Work out which VPC, if any, we are creating in.
         vpc_id = if config[:subnet_id]
                    # Get the VPC ID for the subnet.
                    subnets = ec2.client.describe_subnets(filters: [{ name: "subnet-id", values: [config[:subnet_id]] }]).subnets
                    raise "Subnet #{config[:subnet_id]} not found during security group creation" if subnets.empty?
+
+                   subnets.first.vpc_id
+                 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.
@@ -799,13 +803,13 @@ module Kitchen
         # Create the SG.
         params = {
           group_name: "kitchen-#{Array.new(8) { rand(36).to_s(36) }.join}",
-          description: "Test Kitchen for #{instance.name} by #{Etc.getlogin || 'nologin'} on #{Socket.gethostname}",
+          description: "Test Kitchen for #{instance.name} by #{Etc.getlogin || "nologin"} on #{Socket.gethostname}",
         }
         params[:vpc_id] = vpc_id if vpc_id
         resp = ec2.client.create_security_group(params)
         state[:auto_security_group_id] = resp.group_id
         info("Created automatic security group #{state[:auto_security_group_id]}")
-        debug("  in VPC #{vpc_id || 'none'}")
+        debug("  in VPC #{vpc_id || "none"}")
         # Set up SG rules.
         ec2.client.authorize_security_group_ingress(
           group_id: state[:auto_security_group_id],
@@ -828,6 +832,7 @@ module Kitchen
       # @return [void]
       def create_key(state)
         return if state[:auto_key_id]
+
         # Encode a bunch of metadata into the name because that's all we can
         # set for a key pair.
         name_parts = [
@@ -842,7 +847,7 @@ module Kitchen
         # to rapidly exhaust local entropy by creating a lot of keys. So this is
         # probably fine. If you want very high security, probably don't use this
         # feature anyway.
-        resp = ec2.client.create_key_pair(key_name: "kitchen-#{name_parts.join('-')}")
+        resp = ec2.client.create_key_pair(key_name: "kitchen-#{name_parts.join("-")}")
         state[:auto_key_id] = resp.key_name
         info("Created automatic key pair #{state[:auto_key_id]}")
         # Write the key out with safe permissions
@@ -862,6 +867,7 @@ module Kitchen
       # @return [void]
       def delete_security_group(state)
         return unless state[:auto_security_group_id]
+
         info("Removing automatic security group #{state[:auto_security_group_id]}")
         ec2.client.delete_security_group(group_id: state[:auto_security_group_id])
         state.delete(:auto_security_group_id)
@@ -874,6 +880,7 @@ module Kitchen
       # @return [void]
       def delete_key(state)
         return unless state[:auto_key_id]
+
         info("Removing automatic key pair #{state[:auto_key_id]}")
         ec2.client.delete_key_pair(key_name: state[:auto_key_id])
         state.delete(:auto_key_id)

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.1.0".freeze
+    EC2_VERSION = "3.2.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -76,16 +76,22 @@ dependencies:
   name: retryable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +168,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.13.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.13.3
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement