kitchen-ec2 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28db84523fe129c18d97d7d4ce035e53018dae22
-  data.tar.gz: e9614c002ae5569a2142b0778bc55672820ae2c8
+  metadata.gz: 863664a181278e965fac6bb54cf85b705b88e72c
+  data.tar.gz: c2245899fe742f202ebe555038931d8df7776452
 SHA512:
-  metadata.gz: 4d6bb1cebdbf37961f07aab3e0b53f6397cf79f3f601889ddc8f82f478730e00099430258ff059c2ce34e9247f1a57da046b316672e987fa99c757e1da9310f8
-  data.tar.gz: 42722c4235563507a4b30e2b4f28edb6b8fbe08c46e6a3203b90b576674e9c4b0ba7d678d7daa5ece7c5d58a13ac437f02916a3f277cd871e1246e97e4c24af9
+  metadata.gz: ad29d9a33374c23d585d1ddbefda2712005a5a5c57117a2e071fffdde98ccb7b43e84b409f6eef9e4c0e0a23620714633d2bab7d2782ce6b99cd595f8da1a2fd
+  data.tar.gz: 542e97cb2aa201bac249aca2b3cfe790e2a604acefdd916e7eac59beecb644ed167f164d6e8119ff4bd390c636ca218122581f3654e650455f65bada09607fc0

data/.travis.yml

@@ -17,6 +17,5 @@ matrix:
     - rvm: ruby-head
       before_install:
       - gem update --system
-
-allow_failures:
+  allow_failures:
   - rvm: ruby-head

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v2.2.1](https://github.com/test-kitchen/kitchen-ec2/tree/v2.2.1) (2018-02-12)
+[Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v2.2.0...v2.2.1)
+
+**Fixed bugs:**
+
+- Fix `undefined` error when Windows AMIs don't include "windows" in name [\#322](https://github.com/test-kitchen/kitchen-ec2/issues/322) [\#324](https://github.com/test-kitchen/kitchen-ec2/pull/324) ([BenLiyanage](https://github.com/BenLiyanage))
+- Fix error behavior when security\_group\_filter is set but no security group found for those tags [\#386](https://github.com/test-kitchen/kitchen-ec2/pull/386) ([dpattmann](https://github.com/dpattmann))
+- Don't create security group if security\_group\_filter is set [\#385](https://github.com/test-kitchen/kitchen-ec2/pull/385) ([dpattmann](https://github.com/dpattmann))
+
 ## [v2.2.0](https://github.com/test-kitchen/kitchen-ec2/tree/v2.2.0) (2018-01-27)
 
 [Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v2.1.0...v2.2.0)

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

@@ -62,19 +62,21 @@ module Kitchen
           end
 
           if config[:security_group_ids].nil? && config[:security_group_filter]
-            config[:security_group_ids] = [::Aws::EC2::Client.
-              new(:region => config[:region]).describe_security_groups(
+            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]],
-                  },
+                    {
+                        :name => "tag:#{config[:security_group_filter][:tag]}",
+                        :values => [config[:security_group_filter][:value]],
+                    },
                 ]
-              )[0][0].group_id]
+            )[0][0]
 
-            if config[:security_group_ids].nil?
-              raise "The group tagged '#{config[:security_group_filter][:tag]}\
-              #{config[:security_group_filter][:value]}' does not exist!"
+            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!"
             end
           end
 

data/lib/kitchen/driver/ec2.rb

@@ -61,6 +61,7 @@ module Kitchen
       end
       default_config :ebs_optimized,      false
       default_config :security_group_ids, nil
+      default_config :security_group_filter, nil
       default_config :tags, "created-by" => "test-kitchen"
       default_config :user_data do |driver|
         if driver.windows_os?
@@ -210,7 +211,7 @@ module Kitchen
         END
 
         # If no security group IDs are specified, create one automatically.
-        unless config[:security_group_ids]
+        unless config[:security_group_ids] || config[:security_group_filter]
           create_security_group(state)
           config[:security_group_ids] = [state[:auto_security_group_id]]
         end
@@ -622,6 +623,36 @@ module Kitchen
       end
 
       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'
+	}
+        # Allow script execution
+        Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force
+        #PS Remoting and & winrm.cmd basic config
+        $enableArgs=@{Force=$true}
+        $command=Get-Command Enable-PSRemoting
+        if($command.Parameters.Keys -contains "skipnetworkprofilecheck"){
+            $enableArgs.skipnetworkprofilecheck=$true
+        }
+        Enable-PSRemoting @enableArgs
+        & winrm.cmd set winrm/config '@{MaxTimeoutms="1800000"}' >> $logfile
+        & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
+        & winrm.cmd set winrm/config/winrs '@{MaxShellsPerUser="50"}' >> $logfile
+        & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
+        #Firewall Config
+        & netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any  >> $logfile
+        Set-ItemProperty -Name LocalAccountTokenFilterPolicy -Path HKLM:\\software\\Microsoft\\Windows\\CurrentVersion\\Policies\\system -Value 1
+	EOH
+
         # Preparing custom static admin user if we defined something other than Administrator
         custom_admin_script = ""
         if !(instance.transport[:username] =~ /administrator/i) && instance.transport[:password]
@@ -642,35 +673,10 @@ module Kitchen
           EOH
         end
 
-        if actual_platform.version =~ /2016/
-          logfile_name = 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
-          disk_init = 'C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeDisks.ps1'
-        else
-          logfile_name = 'C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
-          disk_init = ""
-        end
         # Returning the fully constructed PowerShell script to user_data
         Kitchen::Util.outdent!(<<-EOH)
         <powershell>
-        $logfile="#{logfile_name}"
-        # EC2Launch doesn't init extra disks by default
-        #{disk_init}
-        # Allow script execution
-        Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force
-        #PS Remoting and & winrm.cmd basic config
-        $enableArgs=@{Force=$true}
-        $command=Get-Command Enable-PSRemoting
-        if($command.Parameters.Keys -contains "skipnetworkprofilecheck"){
-            $enableArgs.skipnetworkprofilecheck=$true
-        }
-        Enable-PSRemoting @enableArgs
-        & winrm.cmd set winrm/config '@{MaxTimeoutms="1800000"}' >> $logfile
-        & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
-        & winrm.cmd set winrm/config/winrs '@{MaxShellsPerUser="50"}' >> $logfile
-        & winrm.cmd set winrm/config/winrs '@{MaxMemoryPerShellMB="1024"}' >> $logfile
-        #Firewall Config
-        & netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any  >> $logfile
-        Set-ItemProperty -Name LocalAccountTokenFilterPolicy -Path HKLM:\\software\\Microsoft\\Windows\\CurrentVersion\\Policies\\system -Value 1
+        #{base_script}
         #{custom_admin_script}
         </powershell>
         EOH
@@ -764,6 +770,11 @@ module Kitchen
           Time.now.utc.iso8601,
           Array.new(8) { rand(36).to_s(36) }.join(""),
         ]
+        # In a perfect world this would generate the key locally and use ImportKey
+        # instead for better security, but given the use case that is very likely
+        # 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('-')}")
         state[:auto_key_id] = resp.key_name
         info("Created automatic key pair #{state[: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 = "2.2.0"
+    EC2_VERSION = "2.2.1"
   end
 end

data/spec/kitchen/driver/ec2/instance_generator_spec.rb

@@ -212,6 +212,42 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       end
     end
 
+    context "when provided a non existing security_group tag filter" do
+      ec2_stub_whithout_security_group = Aws::EC2::Client.new(:stub_responses => true)
+
+      let(:config) do
+        {
+          :instance_type                => "micro",
+          :ebs_optimized                => true,
+          :image_id                     => "ami-123",
+          :aws_ssh_key_id               => "key",
+          :subnet_id                    => "s-123",
+          :security_group_ids           => nil,
+          :region                       => "us-west-2",
+          :security_group_filter =>
+            {
+              :tag   => "foo",
+              :value => "bar",
+            },
+        }
+      end
+
+      it "generates id from the provided tag" do
+        allow(::Aws::EC2::Client).to receive(:new).and_return(ec2_stub_whithout_security_group)
+        expect(ec2_stub_whithout_security_group).to receive(:describe_security_groups).with(
+          :filters => [
+            {
+              :name => "tag:foo",
+              :values => ["bar"],
+            },
+          ]
+        ).and_return(ec2_stub_whithout_security_group.describe_security_groups)
+
+        expect { generator.ec2_instance_data }.to raise_error("The group tagged '#{config[:security_group_filter][:tag]} " +
+                                                              "#{config[:security_group_filter][:value]}' does not exist!")
+      end
+    end
+
     context "when passed an empty block_device_mappings" do
       let(:config) do
         {

data/spec/kitchen/driver/ec2_spec.rb

@@ -646,6 +646,18 @@ describe Kitchen::Driver::Ec2 do
       end
     end
 
+    context "with no security group but filter specified" do
+      before do
+        config.delete(:security_group_ids)
+        config[:security_group_filter] = { tag: "SomeTag", value: "SomeValue" }
+        expect(driver).not_to receive(:create_security_group)
+        expect(driver).to receive(:submit_server).and_return(server)
+        allow(instance).to receive(:name).and_return("instance_name")
+      end
+
+      include_examples "common create"
+    end
+
     context "with no key pair configured" do
       before do
         config[:kitchen_root] = "/kitchen"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-03 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen