kitchen-ec2 2.3.4 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 714d5ed1bda973c33eedf4647ef020a93fc675c6c02c09bcf937a4c0ec301b28
-  data.tar.gz: d85332b3502961f84742295f6b026dca2f0007acec694c1d407094864728cd2d
+  metadata.gz: 817c9661208d141986f8c3472fd9a4b5bc4bcb6c7a290d7c400b99336c0b32a8
+  data.tar.gz: a375e11a4dae0946170a813988df073550374d5b682de5f0d1fcc6e6356f4bb5
 SHA512:
-  metadata.gz: 4c68dc46ff65c7a55281554601e1f5fd7245b110678e022588884a4836d9ab2162ec483b077daae260de53bba1719e21b302ec6740ec24026837190102718914
-  data.tar.gz: df920b4f903ba95d3ba2b885149d0bef4f678db5919a257e3eb72684f9ba8487c9c8611f0bb35d27c5115b0f8ecbedad17bec2897e54f0a75ae8c3a4fe87ac4c
+  metadata.gz: 0b67befd11e0dfacf356ca1fe0bcb36a9d2cf26fa553312203771a77d4123ef7fa4718ef76ad152d0625b744edaa4c14f086303eef3bf59d7228df7187cac0df
+  data.tar.gz: 7ee59275ba3647c4c1d7771e22da109a81258f813c3c45142aacf6e7a08ea2846b5cf67e26f2abb2e7c97960f2daa133858df839ae594685d6b5bc154676f131

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

@@ -0,0 +1,49 @@
+#
+# Copyright:: 2016-2018, Chef Software, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "kitchen/driver/aws/standard_platform"
+
+module Kitchen
+  module Driver
+    class Aws
+      class StandardPlatform
+        # https://aws.amazon.com/de/amazon-linux-2/release-notes/
+        class Amazon2 < StandardPlatform
+          StandardPlatform.platforms["amazon2"] = self
+
+          def username
+            "ec2-user"
+          end
+
+          def image_search
+            search = {
+              "owner-id" => "137112412989",
+              "name" => version ? "amzn2-ami-hvm-2.0.#{version}*" : "amzn2-ami-hvm-2.0.*",
+            }
+            search["architecture"] = architecture if architecture
+            search
+          end
+
+          def self.from_image(driver, image)
+            if image.name =~ /amzn2-ami/i
+              image.name =~ /\b(\d+(\.\d+[\.\d])?)/i
+              new(driver, "amazon2", (Regexp.last_match || [])[1], image.architecture)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -94,6 +94,8 @@ module Kitchen
           # 2012sp4 -> [ 2012, 0, 4 ]
           # 2012rtm -> [ 2012, 0, 0 ]
           # 2016 -> [ 2016, 0, nil ]
+          # 1709 -> [ 1709, 0, nil ]
+          # 1803 -> [ 1803, 0, nil ]
           def windows_version_parts
             version = self.version
             if version
@@ -130,6 +132,8 @@ module Kitchen
 
             if major == 2016
               "Windows_Server-2016-English-Full-Base-*"
+            elsif major == 1709 || major == 1803
+              "Windows_Server-#{major}-English-Core-ContainersLatest-*"
             else
               case revision
               when nil

data/lib/kitchen/driver/ec2.rb

@@ -25,6 +25,7 @@ require_relative "aws/client"
 require_relative "aws/instance_generator"
 require_relative "aws/standard_platform"
 require_relative "aws/standard_platform/amazon"
+require_relative "aws/standard_platform/amazon2"
 require_relative "aws/standard_platform/centos"
 require_relative "aws/standard_platform/debian"
 require_relative "aws/standard_platform/rhel"
@@ -632,15 +633,14 @@ 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'))
-	{
-      	$logfile='C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
-	# EC2Launch doesn't init extra disks by default
-	C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1
-	}
-	Else
-	{
-	$logfile='C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
+  If($OSVersion.contains('2016') -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
+    C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1
+  } Else {
+     New-Item -ItemType Directory -Force -Path 'C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs'
+     $logfile='C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
   }
 
         # Logfile fail-safe in case the directory does not exist

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.3.4"
+    EC2_VERSION = "2.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.4.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -202,6 +202,7 @@ files:
 - lib/kitchen/driver/aws/instance_generator.rb
 - lib/kitchen/driver/aws/standard_platform.rb
 - lib/kitchen/driver/aws/standard_platform/amazon.rb
+- lib/kitchen/driver/aws/standard_platform/amazon2.rb
 - lib/kitchen/driver/aws/standard_platform/centos.rb
 - lib/kitchen/driver/aws/standard_platform/debian.rb
 - lib/kitchen/driver/aws/standard_platform/fedora.rb