kitchen-ec2 0.10.0.rc.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b5ac63e0a8fc23d1cd9d82558ef5367e295231
-  data.tar.gz: cdcb4408ce27f225cee44fe99ba53de0567e24b8
+  metadata.gz: b7d28f5952b83630a3d5da24788ff269318ddb78
+  data.tar.gz: ad437ab4aee9027473f8ce896f1816cc49fd334f
 SHA512:
-  metadata.gz: eecccf10147af42de15fe269e2f4253b26b222713b8b6c46d88cc3898fd7a6285a41575b513048794a46715fcdb4c0b2f94b8629b8320532fc342aa3d22db0fb
-  data.tar.gz: 7d8b1ff3d188c2bb608dfc3d1106a0f9cd6488a043210b0e5f33fbdae1c7e88d743952909626ed01b4d43c1ae9c9248f04c076dc1ce776a848539f92fa2216cd
+  metadata.gz: 555b1c421bfbb295e47ea4bd37ce152e43c0524395a47bcedd0f7c6ca184c377d6fea0004dcd641ad7a714f9f0fc39923fb8c6fefbeff06481e71e1d5ffe3ca4
+  data.tar.gz: 8b4ba45abccbcc9a499e2603f055ad6447a04dab4ff9f72a0c5acb1f4c1a4520d4a0ba60fedb29eb6dd81cb55016e800df9ed13db6784ff2df2e8f2d06960d1f

data/CHANGELOG.md

@@ -1,7 +1,11 @@
-## 0.10.0 / TBD
+## 0.10.0 / 2016-06-24
 
 ### Bug Fixes
 
+* Pull Request [#165][]: Added `ebs_iops` parameter to block_device_mappings, necessary when specifying volume type of `io1` ([@tyler-ball][])
+* Pull Request [#161][]: Fixing UTF error in hints file on Windows ([@zl4bv][])
+* Pull Request [#166][]: If `security_group_ids` is specified as a string instead of an array we coerce it to an array automatically ([@fnichol][])
+
 ### New Features
 
 * Pull Request [#150][]: Added support for managing Windows hosts in AWS
@@ -193,9 +197,13 @@
 [#142]: https://github.com/test-kitchen/kitchen-ec2/issues/142
 [#150]: https://github.com/test-kitchen/kitchen-ec2/issues/150
 [#151]: https://github.com/test-kitchen/kitchen-ec2/issues/151
+[#161]: https://github.com/test-kitchen/kitchen-ec2/issues/161
+[#165]: https://github.com/test-kitchen/kitchen-ec2/issues/165
+[#166]: https://github.com/test-kitchen/kitchen-ec2/issues/166
 [@Atalanta]: https://github.com/Atalanta
 [@Igorshp]: https://github.com/Igorshp
 [@JamesAwesome]: https://github.com/JamesAwesome
+[@afiune]: https://github.com/afiune
 [@anl]: https://github.com/anl
 [@arangamani]: https://github.com/arangamani
 [@bozinsky]: https://github.com/bozinsky
@@ -213,7 +221,6 @@
 [@mattray]: https://github.com/mattray
 [@mumoshu]: https://github.com/mumoshu
 [@nicgrayson]: https://github.com/nicgrayson
-[@afiune]: https://github.com/afiune
 [@scarolan]: https://github.com/scarolan
 [@sebbrandt87]: https://github.com/sebbrandt87
 [@sethvargo]: https://github.com/sethvargo

data/README.md

@@ -12,7 +12,7 @@ instances. Use Amazon's cloud for your infrastructure testing!
 ## Requirements
 
 There are **no** external system requirements for this driver. However you
-will need access to an [AWS][aws_site] account.
+will need access to an [AWS][aws_site] account.  [IAM][iam_site] users should have, at a minimum, permission to manage the lifecycle of an EC2 instance along with modifying components specified in kitchen driver configs.  Consider using a permissive managed IAM policy like ``arn:aws:iam::aws:policy/AmazonEC2FullAccess`` or tailor one specific to your security requirements.
 
 ## Installation and Setup
 
@@ -234,7 +234,7 @@ The default is `nil`.
 
 Specify a proxy to send AWS requests through.  Should be of the format `http://<host>:<port>`.
 
-The default is `ENV['HTTP_PROXY']`
+The default is `ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]`.  If you have these environment variables set and do not want to use a proxy when contacting aws set `http_proxy: nil`.
 
 **Note** - The AWS command line utility allow you to specify [two proxies](http://docs.aws.amazon.com/cli/latest/userguide/cli-http-proxy.html), one for HTTP and one for HTTPS.  The AWS Ruby SDK only allows you to specify 1 proxy and because all requests are `https://` this proxy needs to support HTTPS.
 
@@ -272,6 +272,11 @@ block_device_mappings:
     ebs_volume_size: 15
     ebs_delete_on_termination: true
     ebs_snapshot_id: snap-0015d0bc
+  - ebs_device_name: /dev/sdc
+    ebs_volume_size: 100
+    ebs_delete_on_termination: true
+    ebs_volume_type: io1
+    ebs_iops: 100
 ```
 
 The keys `ebs_device_name`, `ebs_volume_size` and `ebs_delete_on_termination` are required for every mapping.
@@ -280,7 +285,8 @@ storage config keys are present.
 
 The keys `ebs_volume_type`, `ebs_virtual_name` and `ebs_snapshot_id` are optional.  See
 [Amazon EBS Volume Types](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSVolumeTypes.html) to find out more about
-volume types. `ebs_volume_type` defaults to `standard` but can also be `gp2` or `io1`.
+volume types. `ebs_volume_type` defaults to `standard` but can also be `gp2` or `io1`.  If you specify `io1` you must
+also specify `ebs_iops`.
 
 If you have a block device mapping with a `ebs_device_name` equal to the root storage device name on your
 [image](#config-image-id) then the provided mapping will replace the settings in the image.
@@ -474,6 +480,7 @@ Apache 2.0 (see [LICENSE][license])
 [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

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

@@ -52,7 +52,7 @@ module Kitchen
             :private_ip_address           => config[:private_ip_address]
           }
           i[:block_device_mappings] = block_device_mappings unless block_device_mappings.empty?
-          i[:security_group_ids] = config[:security_group_ids] if config[:security_group_ids]
+          i[:security_group_ids] = Array(config[:security_group_ids]) if config[:security_group_ids]
           i[:user_data] = prepared_user_data if prepared_user_data
           if config[:iam_profile_name]
             i[:iam_instance_profile] = { :name => config[:iam_profile_name] }
@@ -110,6 +110,7 @@ module Kitchen
               :device_name             => bdm[:ebs_device_name]
             }
             b[:ebs][:volume_type] = bdm[:ebs_volume_type] if bdm[:ebs_volume_type]
+            b[:ebs][:iops] = bdm[:ebs_iops] if bdm[:ebs_iops]
             b[:ebs][:snapshot_id] = bdm[:ebs_snapshot_id] if bdm[:ebs_snapshot_id]
             b[:virtual_name] = bdm[:ebs_virtual_name] if bdm[:ebs_virtual_name]
             b

data/lib/kitchen/driver/ec2.rb

@@ -178,7 +178,6 @@ module Kitchen
         return if state[:server_id]
 
         info(Kitchen::Util.outdent!(<<-END))
-          Creating <#{state[:server_id]}>...
           If you are not using an account that qualifies under the AWS
           free-tier, you may be charged to run these suites. The charge
           should be minimal, but neither Test Kitchen nor its maintainers
@@ -427,7 +426,7 @@ module Kitchen
 
       def create_ec2_json(state)
         if windows_os?
-          cmd = "mkdir \\etc\\chef\\ohai\\hints; echo $null >> \\etc\\chef\\ohai\\hints\\ec2.json"
+          cmd = "New-Item -Force C:\\chef\\ohai\\hints\\ec2.json -ItemType File"
         else
           cmd = "sudo mkdir -p /etc/chef/ohai/hints;sudo touch /etc/chef/ohai/hints/ec2.json"
         end

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "0.10.0.rc.1"
+    EC2_VERSION = "0.10.0"
   end
 end

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

@@ -114,6 +114,13 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
             :ebs_volume_type => "gp2",
             :ebs_snapshot_id => "id",
             :ebs_virtual_name => "test"
+          },
+          {
+            :ebs_volume_size => 100,
+            :ebs_delete_on_termination => true,
+            :ebs_device_name => "/dev/sda3",
+            :ebs_volume_type => "io1",
+            :ebs_iops => 100
           }
         ] }
       end
@@ -137,6 +144,15 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
               },
               :device_name => "/dev/sda2",
               :virtual_name => "test"
+            },
+            {
+              :ebs => {
+                :volume_size => 100,
+                :volume_type => "io1",
+                :iops => 100,
+                :delete_on_termination => true
+              },
+              :device_name => "/dev/sda3"
             }
           ]
         )
@@ -347,6 +363,19 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
             }]
           )
         end
+
+        it "accepts a single string value" do
+          config[:security_group_ids] = "only-one"
+
+          expect(generator.ec2_instance_data).to include(
+            :network_interfaces => [{
+              :device_index => 0,
+              :associate_public_ip_address => true,
+              :delete_on_termination => true,
+              :groups => ["only-one"]
+            }]
+          )
+        end
       end
 
       context "and private_ip_address is provided" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.10.0.rc.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-19 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -212,9 +212,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7