kitchen-ec2 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 817c9661208d141986f8c3472fd9a4b5bc4bcb6c7a290d7c400b99336c0b32a8
-  data.tar.gz: a375e11a4dae0946170a813988df073550374d5b682de5f0d1fcc6e6356f4bb5
+  metadata.gz: 2b5b61ce04ba14b628c624fe6d1fdcbce3be710b2b2bb9f560309c1f2e49a6b0
+  data.tar.gz: fdf1eefb690ff096a6188c1149f479d626d5b93d1fbd2016876f1f422fa2823e
 SHA512:
-  metadata.gz: 0b67befd11e0dfacf356ca1fe0bcb36a9d2cf26fa553312203771a77d4123ef7fa4718ef76ad152d0625b744edaa4c14f086303eef3bf59d7228df7187cac0df
-  data.tar.gz: 7ee59275ba3647c4c1d7771e22da109a81258f813c3c45142aacf6e7a08ea2846b5cf67e26f2abb2e7c97960f2daa133858df839ae594685d6b5bc154676f131
+  metadata.gz: 5fc7e6be44b888c3b30def5287e992ff487aede57c450e10e8879c12cd45e66a1d565111844f6cb3f80dcea7462defee9b1d1fc129468b3a75521ccf7f32169e
+  data.tar.gz: be5dfb400e19d6dc433d4f700b318591455a8ba3dfe53fd79585c1efd594c6bcaf974872da5a4c247fb1cc2a7a3f7d48f9da52e971b6e4f611b655b6b2bda082

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

@@ -26,20 +26,25 @@ module Kitchen
           # 10/11 are listed last since we default to the first item in the hash
           # and 10/11 are not released yet. When they're released move them up
           DEBIAN_CODENAMES = {
-            "9" => "stretch",
-            "8" => "jessie",
-            "7" => "wheezy",
-            "6" => "squeeze",
-            "11" => "bullseye",
-            "10" => "buster",
-          }
+            9 => "stretch",
+            8 => "jessie",
+            7 => "wheezy",
+            6 => "squeeze",
+            11 => "bullseye",
+            10 => "buster",
+          }.freeze
 
           def username
             "admin"
           end
 
           def codename
-            version ? DEBIAN_CODENAMES[version] : DEBIAN_CODENAMES.values.first
+            v = version
+            if v && v.size > 1
+              warn("WARN: Debian version #{version} specified, but searching for #{version.to_i} instead.")
+              v = v.to_i
+            end
+            v ? DEBIAN_CODENAMES[v.to_i] : DEBIAN_CODENAMES.values.first
           end
 
           def image_search

data/lib/kitchen/driver/ec2.rb

@@ -63,6 +63,7 @@ module Kitchen
       default_config :ebs_optimized,      false
       default_config :security_group_ids, nil
       default_config :security_group_filter, nil
+      default_config :security_group_cidr_ip, "0.0.0.0/0"
       default_config :tags, "created-by" => "test-kitchen"
       default_config :user_data do |driver|
         if driver.windows_os?
@@ -513,6 +514,11 @@ module Kitchen
           ready = aws_instance.exists? &&
             aws_instance.state.name == "running" &&
             hostname != "0.0.0.0"
+
+          if ready && ( hostname.nil? || hostname == "" )
+            debug("Unable to detect hostname using interface_type #{config[:interface]}. Fallback to ordered mapping")
+            state[:hostname] = hostname(aws_instance, nil)
+          end
           if ready && windows_os?
             output = server.console_output.output
             unless output.nil?
@@ -759,7 +765,7 @@ module Kitchen
               ip_protocol: "tcp",
               from_port: port,
               to_port: port,
-              ip_ranges: [{ cidr_ip: "0.0.0.0/0" }],
+              ip_ranges: [{ cidr_ip: config[:security_group_cidr_ip] }],
             }
           end
         )

data/lib/kitchen/driver/ec2_version.rb

@@ -22,6 +22,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "2.4.0"
+    EC2_VERSION = "2.5.0"
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-20 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -146,9 +146,6 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.11
@@ -156,9 +153,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.11
@@ -231,8 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2