kitchen-ec2 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 959a1ab9d5bc68f378d275e54b2582173dd1b639
-  data.tar.gz: e1860a9b7dd6edc37eb04af7ef451d0b0e05575b
+  metadata.gz: 28db84523fe129c18d97d7d4ce035e53018dae22
+  data.tar.gz: e9614c002ae5569a2142b0778bc55672820ae2c8
 SHA512:
-  metadata.gz: 3d8825aab45d7c154f9e4f718fad006ff0e3b469f51da94ba531a7de42e99c05595d41f0195ac4ac05998d6e2e26f30f89f52da93401e40b689b2b21c8d525ed
-  data.tar.gz: fb078de3ae30c8eac13bf7b24b7db968c5083f281aeae3f425230d941aace2f2405e6a7eedfb3c3fed34a7d8cdce43a078ff360df0c2e921fccbe07e72415cce
+  metadata.gz: 4d6bb1cebdbf37961f07aab3e0b53f6397cf79f3f601889ddc8f82f478730e00099430258ff059c2ce34e9247f1a57da046b316672e987fa99c757e1da9310f8
+  data.tar.gz: 42722c4235563507a4b30e2b4f28edb6b8fbe08c46e6a3203b90b576674e9c4b0ba7d678d7daa5ece7c5d58a13ac437f02916a3f277cd871e1246e97e4c24af9

data/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Change Log
 
+## [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)
+
+- When config validation fails we now show you just the error message instead of the full stack trace with a buried error message
+- Removed the username logic for FreeBSD < 9.1 as those releases are EOL
+- Add support for Debian 10/11 so we'll support them as soon as they're released
+- Added support for the 'host' tenancy value
+- Added proper config validation for tenancy instead of silently skipping bad data
+- Properly handle Integers in tags instead of failing the run
+- Properly handle nil values in tags instead of failing the run
+- Add validation to make sure the tags are passed as a single hash instead of an array of each tag
+- Update our Yard dev dependency to make sure we have 0.9.11+ to avoid a CVE in earlier releases
+- Update links in docs and distros in the examples
+- Removed Rubocop comments that weren't necessary from the code
+
 ## [v2.1.0](https://github.com/test-kitchen/kitchen-ec2/tree/v2.1.0) (2018-01-27)
+
 [Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v2.0.0...v2.1.0)
 
 **Merged pull requests:**

data/README.md

@@ -14,7 +14,7 @@ instances. Use Amazon's cloud for your infrastructure testing!
 1. Install [ChefDK](https://downloads.chef.io/chefdk). If testing things other
    than Chef cookbooks, please consult your driver's documentation for information
    on what to install.
-2. Install the [AWS command line tools](http://docs.aws.amazon.com/cli/latest/userguide/cli-chap-getting-set-up.html).
+2. Install the [AWS command line tools](https://docs.aws.amazon.com/cli/latest/userguide/installing.html).
 3. Run `aws configure`. This will set up your AWS credentials for both the AWS
    CLI tools and kitchen-ec2.
 4. Add or exit the `driver` section of your `.kitchen.yml`:
@@ -152,7 +152,7 @@ specify.
 
 #### SSH
 
-The `aws_ssh_key_id` value is the name of the AWS key pair you want to use. The default will be read from the `AWS_SSH_KEY_ID` environment variable if set.  If a key ID is not specified, a temporary key will be created for you.
+The `aws_ssh_key_id` value is the name of the AWS key pair you want to use. The default will be read from the `AWS_SSH_KEY_ID` environment variable if set.  If a key ID is not specified, a temporary key will be created for you (**>= 2.1.0**).
 
 To see a list of existing key pair IDs in a region, run `aws ec2 describe-key-pairs --region us-east-1`.
 
@@ -194,7 +194,7 @@ or `paravirtual`. (`paravirtual` images are incompatible with `t2.micro`.)
 
 An Array of EC2 [security groups][group_docs] which will be applied to the
 instance. If no security group is specified, a temporary group will be created
-automatically which allows SSH and WinRM.
+automatically which allows SSH and WinRM (**>= 2.1.0**).
 
 #### `security_group_filter`
 
@@ -425,18 +425,8 @@ transport:
   username: ubuntu
 
 platforms:
-  - name: ubuntu-12.04
-  - name: centos-6.4
-  - name: ubuntu-15.04
-    driver:
-      image_id: ami-83211eb3
-      block_device_mappings:
-        - device_name: /dev/sda1
-          ebs:
-            volume_type: standard
-            virtual_name: test
-            volume_size: 15
-            delete_on_termination: true
+  - name: ubuntu-16.04
+  - name: centos-6.9
   - name: centos-7
     driver:
       image_id: ami-c7d092f7
@@ -450,7 +440,7 @@ platforms:
     transport:
       username: centos
   - name: windows-2012r2
-  - name: windows-2008r2
+  - name: windows-2016
 
 suites:
 # ...
@@ -481,17 +471,17 @@ Apache 2.0 (see [LICENSE][license])
 [license]:          https://github.com/test-kitchen/kitchen-ec2/blob/master/LICENSE
 [repo]:             https://github.com/test-kitchen/kitchen-ec2
 [driver_usage]:     https://github.com/test-kitchen/kitchen-ec2
-[chef_omnibus_dl]:  https://downloads.chef.io/chef-client/
+[chef_omnibus_dl]:  https://downloads.chef.io/chef
 [amis_json]:        https://github.com/test-kitchen/kitchen-ec2/blob/master/data/amis.json
 [ami_docs]:         http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ComponentsAMIs.html
 [aws_site]:         http://aws.amazon.com/
 [iam_site]:         http://aws.amazon.com/iam
-[credentials_docs]: http://blogs.aws.amazon.com/security/post/Tx3D6U6WSFGOK2H/A-New-and-Standardized-Way-to-Manage-Credentials-in-the-AWS-SDKs
-[aws_sdk_gem]:      http://docs.aws.amazon.com/sdkforruby/api/index.html
-[group_docs]:       http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
-[instance_docs]:    http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
-[key_id_docs]:      http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/verifying-your-key-pair.html
-[kitchenci]:        http://kitchen.ci/
-[region_docs]:      http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
-[subnet_docs]:      http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
-[vpc_docs]:         http://docs.aws.amazon.com/AmazonVPC/latest/GettingStartedGuide/ExerciseOverview.html
+[credentials_docs]: https://aws.amazon.com/blogs/security/a-new-and-standardized-way-to-manage-credentials-in-the-aws-sdks/
+[aws_sdk_gem]:      https://docs.aws.amazon.com/sdkforruby/api/index.html
+[group_docs]:       https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-network-security.html
+[instance_docs]:    https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html
+[key_id_docs]:      https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html
+[kitchenci]:        https://kitchen.ci/
+[region_docs]:      https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html
+[subnet_docs]:      https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
+[vpc_docs]:         https://docs.aws.amazon.com/AmazonVPC/latest/GettingStartedGuide/ExerciseOverview.html

data/kitchen-ec2.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["fnichol@nichol.ca"]
   gem.description   = "A Test Kitchen Driver for Amazon EC2"
   gem.summary       = gem.description
-  gem.homepage      = "http://kitchen.ci/"
+  gem.homepage      = "https://kitchen.ci/"
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.executables   = []
@@ -30,7 +30,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "countloc",  "~> 0.4"
   gem.add_development_dependency "maruku",    "~> 0.6"
   gem.add_development_dependency "simplecov", "~> 0.7"
-  gem.add_development_dependency "yard",      "~> 0.8"
+  gem.add_development_dependency "yard",      "~> 0.9", ">= 0.9.11"
 
   # style and complexity libraries are tightly version pinned as newer releases
   # may introduce new and undesireable style choices which would be immediately

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

@@ -2,7 +2,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2015-2018, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,7 +33,7 @@ module Kitchen
       # @author Tyler Ball <tball@chef.io>
       class Client
 
-        def initialize( # rubocop:disable Metrics/ParameterLists
+        def initialize(
           region,
           profile_name = "default",
           http_proxy = nil,
@@ -48,8 +49,6 @@ module Kitchen
           ::Aws.config.update(:retry_limit => retry_limit) unless retry_limit.nil?
         end
 
-        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-
         def create_instance(options)
           resource.create_instances(options)[0]
         end

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

@@ -2,7 +2,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2015-2018, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -94,7 +95,7 @@ module Kitchen
             i[:placement] = { :availability_zone => availability_zone.downcase }
           end
           tenancy = config[:tenancy]
-          if tenancy && %w{default dedicated}.include?(tenancy)
+          if tenancy
             if i.key?(:placement)
               i[:placement][:tenancy] = tenancy
             else
@@ -137,7 +138,7 @@ module Kitchen
             i[:placement] = { :availability_zone => availability_zone.downcase }
           end
           tenancy = config[:tenancy]
-          if tenancy && %w{default dedicated}.include?(tenancy)
+          if tenancy
             if i.key?(:placement)
               i[:placement][:tenancy] = tenancy
             else

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

@@ -1,3 +1,19 @@
+#
+# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2015-2018, Fletcher Nichol
+#
+# 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.
+
 module Kitchen
   module Driver
     class Aws

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

@@ -1,3 +1,18 @@
+#
+# 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

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

@@ -1,3 +1,18 @@
+#
+# 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

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

@@ -1,3 +1,18 @@
+#
+# 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
@@ -8,11 +23,15 @@ module Kitchen
         class Debian < StandardPlatform
           StandardPlatform.platforms["debian"] = self
 
+          # 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",
           }
 
           def username

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

@@ -1,3 +1,18 @@
+#
+# 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

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

@@ -1,3 +1,18 @@
+#
+# 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
@@ -9,7 +24,7 @@ module Kitchen
           StandardPlatform.platforms["freebsd"] = self
 
           def username
-            (version && version.to_f < 9.1) ? "root" : "ec2-user"
+            "ec2-user"
           end
 
           def sudo_command

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

@@ -1,3 +1,18 @@
+#
+# 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

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

@@ -1,3 +1,18 @@
+#
+# 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

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

@@ -1,3 +1,18 @@
+#
+# 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

data/lib/kitchen/driver/ec2.rb

@@ -2,7 +2,8 @@
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2015-2018, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -46,7 +47,7 @@ module Kitchen
     # Amazon EC2 driver for Test Kitchen.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
-    class Ec2 < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
+    class Ec2 < Kitchen::Driver::Base
 
       kitchen_driver_api_version 2
 
@@ -103,8 +104,9 @@ module Kitchen
       end
 
       def self.validation_error(driver, old_key, new_key)
-        raise "ERROR: The driver[#{driver.class.name}] config key `#{old_key}` " \
+        warn "ERROR: The driver[#{driver.class.name}] config key `#{old_key}` " \
           "has been removed, please use `#{new_key}`"
+        exit!
       end
 
       # TODO: remove these in 1.1
@@ -142,37 +144,61 @@ module Kitchen
         end
       end
 
+      # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-instance.html
+      validations[:tenancy] = lambda do |attr, val, _driver|
+        unless %w{default host dedicated}.include?(val)
+          warn "'#{val}' is an invalid value for option '#{attr}'. " \
+            "Valid values are 'default', 'host', or 'dedicated'."
+          exit!
+        end
+      end
+
       # The access key/secret are now using the priority list AWS uses
       # Providing these inside the .kitchen.yml is no longer recommended
       validations[:aws_access_key_id] = lambda do |attr, val, _driver|
         unless val.nil?
-          raise "#{attr} is no longer valid, please use " \
-            "ENV['AWS_ACCESS_KEY_ID'] or ~/.aws/credentials.  See " \
+          warn "#{attr} is no longer a valid config option, please use " \
+            "ENV['AWS_ACCESS_KEY_ID'] or ~/.aws/credentials. See " \
             "the README for more details"
+          exit!
         end
       end
       validations[:aws_secret_access_key] = lambda do |attr, val, _driver|
         unless val.nil?
-          raise "#{attr} is no longer valid, please use " \
-            "ENV['AWS_SECRET_ACCESS_KEY'] or ~/.aws/credentials.  See " \
+          warn "#{attr} is no longer a valid config option, please use " \
+            "ENV['AWS_SECRET_ACCESS_KEY'] or ~/.aws/credentials. See " \
             "the README for more details"
+          exit!
         end
       end
       validations[:aws_session_token] = lambda do |attr, val, _driver|
         unless val.nil?
-          raise "#{attr} is no longer valid, please use " \
-            "ENV['AWS_SESSION_TOKEN'] or ~/.aws/credentials.  See " \
+          warn "#{attr} is no longer a valid config option, please use " \
+            "ENV['AWS_SESSION_TOKEN'] or ~/.aws/credentials. See " \
             "the README for more details"
+          exit!
         end
       end
       validations[:instance_initiated_shutdown_behavior] = lambda do |attr, val, _driver|
         unless [nil, "stop", "terminate"].include?(val)
-          raise "'#{val}' is an invalid value for option '#{attr}'. " \
+          warn "'#{val}' is an invalid value for option '#{attr}'. " \
             "Valid values are 'stop' or 'terminate'"
+          exit!
+        end
+      end
+
+      # empty keys cause failures when tagging and they make no sense
+      validations[:tags] = lambda do |attr, val, _driver|
+        # if someone puts the tags each on their own line it's an array not a hash
+        # @todo we should probably just do the right thing and support this format
+        if val.class == Array
+          warn "AWS instance tags must be specified as a single hash, not a tag " \
+            "on each line. Example: {:foo => 'bar', :bar => 'foo'}"
+          exit!
         end
       end
 
-      def create(state) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      def create(state)
         return if state[:server_id]
         update_username(state)
 
@@ -211,7 +237,7 @@ module Kitchen
 
         # See https://github.com/aws/aws-sdk-ruby/issues/859
         # Tagging can fail with a NotFound error even though we waited until the server exists
-        # Waiting can also fail, so we have to also retry on that.  If it means we re-tag the
+        # Waiting can also fail, so we have to also retry on that. If it means we re-tag the
         # instance, so be it.
         # Tagging an instance is possible before volumes are attached. Tagging the volumes after
         # instance creation is consistent.
@@ -350,7 +376,7 @@ module Kitchen
       def update_username(state)
         # BUG: With the following equality condition on username, if the user specifies 'root'
         # as the transport's username then we will overwrite that value with one from the standard
-        # platform definitions.  This seems difficult to handle here as the default username is
+        # platform definitions. This seems difficult to handle here as the default username is
         # provided by the underlying transport classes, and is often non-nil (eg; 'root'), leaving
         # us no way to distinguish a user-set value from the transport's default.
         # See https://github.com/test-kitchen/kitchen-ec2/pull/273
@@ -388,7 +414,7 @@ module Kitchen
         ec2.create_instance(instance_data)
       end
 
-      def submit_spot(state) # rubocop:disable Metrics/AbcSize
+      def submit_spot(state)
         debug("Creating EC2 Spot Instance..")
 
         spot_request_id = create_spot_request
@@ -428,7 +454,10 @@ module Kitchen
       def tag_server(server)
         if config[:tags] && !config[:tags].empty?
           tags = config[:tags].map do |k, v|
-            { :key => k, :value => v }
+            # we convert the value to a string because
+            # nils should be passed as an empty String
+            # and Integers need to be represented as Strings
+            { :key => k, :value => v.to_s }
           end
           server.create_tags(:tags => tags)
         end
@@ -437,7 +466,7 @@ module Kitchen
       def tag_volumes(server)
         if config[:tags] && !config[:tags].empty?
           tags = config[:tags].map do |k, v|
-            { :key => k, :value => v }
+            { :key => k, :value => v.to_s }
           end
           server.volumes.each do |volume|
             volume.create_tags(:tags => tags)
@@ -487,7 +516,7 @@ module Kitchen
         end
       end
 
-      # Poll a block, waiting for it to return true.  If it does not succeed
+      # Poll a block, waiting for it to return true. If it does not succeed
       # within the configured time we destroy the instance to save people money
       def wait_with_destroy(server, state, status_msg, &block)
         wait_log = proc do |attempts|
@@ -512,7 +541,6 @@ module Kitchen
         end
       end
 
-      # rubocop:disable Lint/UnusedBlockArgument
       def fetch_windows_admin_password(server, state)
         wait_with_destroy(server, state, "to fetch windows admin password") do |aws_instance|
           enc = server.client.get_password_data(
@@ -527,7 +555,6 @@ module Kitchen
         state[:password] = pass
         info("Retrieved Windows password for instance <#{state[:server_id]}>.")
       end
-      # rubocop:enable Lint/UnusedBlockArgument
 
       def with_request_limit_backoff(state)
         retries = 0
@@ -544,7 +571,7 @@ module Kitchen
       end
 
       #
-      # Ordered mapping from config name to Fog name.  Ordered by preference
+      # Ordered mapping from config name to Fog name. Ordered by preference
       # when looking up hostname.
       #
       INTERFACE_TYPES =
@@ -556,8 +583,8 @@ module Kitchen
         }
 
       #
-      # Lookup hostname of provided server.  If interface_type is provided use
-      # that interface to lookup hostname.  Otherwise, try ordered list of
+      # Lookup hostname of provided server. If interface_type is provided use
+      # that interface to lookup hostname. Otherwise, try ordered list of
       # options.
       #
       def hostname(server, interface_type = nil)
@@ -584,7 +611,6 @@ module Kitchen
         instance.provisioner[:sudo] ? instance.provisioner[:sudo_command].to_s : ""
       end
 
-      # rubocop:disable Metrics/MethodLength, Metrics/LineLength
       def create_ec2_json(state)
         if windows_os?
           cmd = "New-Item -Force C:\\chef\\ohai\\hints\\ec2.json -ItemType File"
@@ -649,7 +675,6 @@ module Kitchen
         </powershell>
         EOH
       end
-      # rubocop:enable Metrics/MethodLength, Metrics/LineLength
 
       def show_chosen_image
         # Print some debug stuff

data/lib/kitchen/driver/ec2_version.rb

@@ -2,7 +2,8 @@
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
-# Copyright (C) 2012, Fletcher Nichol
+# Copyright:: 2016-2018, Chef Software, Inc.
+# Copyright:: 2012-2018, Fletcher Nichol
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,6 +22,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "2.1.0"
+    EC2_VERSION = "2.2.0"
   end
 end

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

@@ -2,7 +2,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2015-2018, Fletcher Nichol
+# 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.

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

@@ -1,3 +1,19 @@
+#
+# Copyright:: 2015-2018, Fletcher Nichol
+# 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/ec2"
 require "kitchen/provisioner/dummy"
 require "kitchen/transport/dummy"

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

@@ -2,7 +2,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2015-2018, Fletcher Nichol
+# 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.
@@ -336,25 +337,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       end
     end
 
-    context "when tenancy is not supported" do
-      let(:config) do
-        {
-          :region => "eu-east-1",
-          :tenancy => "ephemeral",
-        }
-      end
-      it "is not added to the instance data" do
-        expect(generator.ec2_instance_data).to eq(
-          :instance_type => nil,
-          :ebs_optimized => nil,
-          :image_id => nil,
-          :key_name => nil,
-          :subnet_id => nil,
-          :private_ip_address => nil
-        )
-      end
-    end
-
     context "when availability_zone and tenancy are provided" do
       let(:config) do
         {
@@ -397,25 +379,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       end
     end
 
-    context "when tenancy is not supported" do
-      let(:config) do
-        {
-          :region => "eu-east-1",
-          :tenancy => "ephemeral",
-        }
-      end
-      it "is not added to the instance data" do
-        expect(generator.ec2_instance_data).to eq(
-          :instance_type => nil,
-          :ebs_optimized => nil,
-          :image_id => nil,
-          :key_name => nil,
-          :subnet_id => nil,
-          :private_ip_address => nil
-        )
-      end
-    end
-
     context "when subnet_id is provided" do
       let(:config) do
         {

data/spec/kitchen/driver/ec2_spec.rb

@@ -2,7 +2,8 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2015-2018, Fletcher Nichol
+# 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.
@@ -264,19 +265,50 @@ describe Kitchen::Driver::Ec2 do
   end
 
   describe "#tag_server" do
-    it "tags the server" do
-      config[:tags] = { :key1 => :value1, :key2 => :value2 }
-      expect(server).to receive(:create_tags).with(
-        :tags => [
-          { :key => :key1, :value => :value1 },
-          { :key => :key2, :value => :value2 },
-        ]
-      )
-      driver.tag_server(server)
+    context "with no tags specified" do
+      it "does not raise" do
+        config[:tags] = nil
+        expect { driver.tag_server(server) }.not_to raise_error
+      end
+    end
+
+    context "with standard string tags" do
+      it "tags the server" do
+        config[:tags] = { :key1 => "value1", :key2 => "value2" }
+        expect(server).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "value2" },
+          ]
+        )
+        driver.tag_server(server)
+      end
     end
-    it "does not raise" do
-      config[:tags] = nil
-      expect { driver.tag_server(server) }.not_to raise_error
+
+    context "with a tag that includes a Integer value" do
+      it "tags the server" do
+        config[:tags] = { :key1 => "value1", :key2 => 1 }
+        expect(server).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "1" },
+          ]
+        )
+        driver.tag_server(server)
+      end
+    end
+
+    context "with a tag that includes a Nil value" do
+      it "tags the server" do
+        config[:tags] = { :key1 => "value1", :key2 => nil }
+        expect(server).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "" },
+          ]
+        )
+        driver.tag_server(server)
+      end
     end
   end
 
@@ -285,15 +317,43 @@ describe Kitchen::Driver::Ec2 do
     before do
       allow(server).to receive(:volumes).and_return([volume])
     end
-    it "tags the instance volumes" do
-      config[:tags] = { :key1 => :value1, :key2 => :value2 }
-      expect(volume).to receive(:create_tags).with(
-        :tags => [
-          { :key => :key1, :value => :value1 },
-          { :key => :key2, :value => :value2 },
-        ]
-      )
-      driver.tag_volumes(server)
+    context "with standard string tags" do
+      it "tags the instance volumes" do
+        config[:tags] = { :key1 => "value1", :key2 => "value2" }
+        expect(volume).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "value2" },
+          ]
+        )
+        driver.tag_volumes(server)
+      end
+    end
+
+    context "with a tag that includes a Integer value" do
+      it "tags the instance volumes" do
+        config[:tags] = { :key1 => "value1", :key2 => 2 }
+        expect(volume).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "2" },
+          ]
+        )
+        driver.tag_volumes(server)
+      end
+    end
+
+    context "with a tag that includes a Nil value" do
+      it "tags the instance volumes" do
+        config[:tags] = { :key1 => "value1", :key2 => nil }
+        expect(volume).to receive(:create_tags).with(
+          :tags => [
+            { :key => :key1, :value => "value1" },
+            { :key => :key2, :value => "" },
+          ]
+        )
+        driver.tag_volumes(server)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 #
-# Copyright (C) 2015, Fletcher Nichol
+# Copyright:: 2015-2018, Fletcher Nichol
+# 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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -148,14 +148,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.11
 - !ruby/object:Gem::Dependency
   name: chefstyle
   requirement: !ruby/object:Gem::Requirement
@@ -219,7 +225,7 @@ files:
 - spec/kitchen/driver/ec2/instance_generator_spec.rb
 - spec/kitchen/driver/ec2_spec.rb
 - spec/spec_helper.rb
-homepage: http://kitchen.ci/
+homepage: https://kitchen.ci/
 licenses:
 - Apache 2.0
 metadata: {}