kitchen-ec2 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2928484fa583fa992ebcf1fa003d63ddaeae94eb
-  data.tar.gz: 3ad8a26f85c5f05667096e0c305b036a25788411
+  metadata.gz: 8f4428e6497e1981ef132bd6c518ca4f347ed0aa
+  data.tar.gz: 8f2014042f18b8f1ab66e8b694141535ff365696
 SHA512:
-  metadata.gz: c35455b314bd2fd04e239b960ed59b42ec9cc1aab1c4044f7bfa38329679ec8f7644740a76398ff822ae8ea827f424bcb823e14cd3a3fa57e03d0d9104665d3d
-  data.tar.gz: 0215c4bed37d0f12d6a2f9993c86a2af4dae7d1858673e602270c14bda5e1202a89d729fb062da0297f5c34ca4b8f906648a2c78b18dc63d3c1c7c266ebe8ee1
+  metadata.gz: c6f81b68882cb0d853f9b111543373e7c545fa5f57f3c8bf60de9a38aaea237ea2955e6768a632823722e0d482f56444e317c7f670940f2d6db19ebb32946334
+  data.tar.gz: a6e0a708723aef725301b6690b83eb5b7807cbb2fd1aff89e2ab86f5f460ce09d59c0a380ff0ecce585178e41cf6caf0dfb6c39d20a1b58013105268ba571dde

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [1.1.0](https://github.com/test-kitchen/kitchen-ec2/tree/1.1.0) (2016-08-09)
-[Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v1.0.1...1.1.0)
+## [1.2.0](https://github.com/test-kitchen/kitchen-ec2/tree/1.2.0) (2016-09-12)
+[Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v1.1.0...1.2.0)
+
+**Fixed bugs:**
+
+- Turn on eager loading for AWS resources [\#255](https://github.com/test-kitchen/kitchen-ec2/pull/255) ([hfinucane](https://github.com/hfinucane))
+
+**Merged pull requests:**
+
+- Add optional config for shutdown\_behavior [\#274](https://github.com/test-kitchen/kitchen-ec2/pull/274) ([alexpop](https://github.com/alexpop))
+- pin rack to ~\> 1.0 [\#272](https://github.com/test-kitchen/kitchen-ec2/pull/272) ([mwrock](https://github.com/mwrock))
+- Fix \#268 [\#269](https://github.com/test-kitchen/kitchen-ec2/pull/269) ([gasserk](https://github.com/gasserk))
+- Allow PowerShell script execution [\#234](https://github.com/test-kitchen/kitchen-ec2/pull/234) ([dlukman](https://github.com/dlukman))
+
+## [v1.1.0](https://github.com/test-kitchen/kitchen-ec2/tree/v1.1.0) (2016-08-09)
+[Full Changelog](https://github.com/test-kitchen/kitchen-ec2/compare/v1.0.1...v1.1.0)
 
 **Implemented enhancements:**
 
@@ -15,6 +29,7 @@
 
 **Closed issues:**
 
+- Do not require aws\_ssh\_key\_id in ec2.rb [\#268](https://github.com/test-kitchen/kitchen-ec2/issues/268)
 - Retrieve AMI IDs from the EC2 API [\#147](https://github.com/test-kitchen/kitchen-ec2/issues/147)
 
 ## [v1.0.1](https://github.com/test-kitchen/kitchen-ec2/tree/v1.0.1) (2016-07-20)
@@ -358,4 +373,4 @@
 ## [v0.1.0](https://github.com/test-kitchen/kitchen-ec2/tree/v0.1.0) (2012-12-27)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/README.md

@@ -178,7 +178,8 @@ The ID of the AWS key pair you want to use.
 The default will be read from the `AWS_SSH_KEY_ID` environment variable if set,
 or `nil` otherwise.
 
-This must be one of the KeyName values shown by the AWS CLI: `aws ec2 describe-key-pairs`
+If `aws_ssh_key_id` is specified, it must be one of the KeyName values shown by the AWS CLI: `aws ec2 describe-key-pairs`.
+Otherwise, if not specified, you must either have a user pre-provisioned on the AMI, or provision the user using `user_data`.
 
 #### `transport.ssh_key`
 
@@ -290,6 +291,12 @@ The price you bid in order to submit a spot request. An additional step will be
 
 The default is `nil`.
 
+### `instance_initiated_shutdown_behavior`
+
+Control whether an instance should `stop` or `terminate` when shutdown is initiated from the instance using an operating system command for system shutdown.
+
+The default is `nil`.
+
 ### block_duration_minutes
 
 The [specified duration](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html#fixed-duration-spot-instances) for a spot instance, in minutes. This value must be a multiple of 60 (60, 120, 180, 240, 300, or 360).

data/kitchen-ec2.gemspec

@@ -38,4 +38,8 @@ Gem::Specification.new do |gem|
   # enforced in CI
   gem.add_development_dependency "finstyle",  "1.4.0"
   gem.add_development_dependency "climate_control"
+
+  # github_changelog_generator -> github-api -> oauth2 -> rack
+  # rack being unconstrained breaks Ruby 2.1 installs
+  gem.add_development_dependency "rack", "~> 1.0"
 end

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

@@ -84,6 +84,10 @@ module Kitchen
               i[:network_interfaces][0][:groups] = i.delete(:security_group_ids)
             end
           end
+          unless config[:instance_initiated_shutdown_behavior].nil? ||
+              config[:instance_initiated_shutdown_behavior].empty?
+            i[:instance_initiated_shutdown_behavior] = config[:instance_initiated_shutdown_behavior]
+          end
           i
         end
 

data/lib/kitchen/driver/ec2.rb

@@ -33,6 +33,8 @@ require_relative "aws/standard_platform/windows"
 require "aws-sdk-core/waiters/errors"
 require "retryable"
 
+Aws.eager_autoload!
+
 module Kitchen
 
   module Driver
@@ -79,8 +81,7 @@ module Kitchen
       default_config :interface,           nil
       default_config :http_proxy,          ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]
       default_config :retry_limit,         3
-
-      required_config :aws_ssh_key_id
+      default_config :instance_initiated_shutdown_behavior, nil
 
       def initialize(*args, &block)
         super
@@ -157,6 +158,12 @@ module Kitchen
             "the README for more details"
         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}'. " \
+            "Valid values are 'stop' or 'terminate'"
+        end
+      end
 
       def create(state) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         return if state[:server_id]
@@ -510,6 +517,8 @@ module Kitchen
         Kitchen::Util.outdent!(<<-EOH)
         <powershell>
         $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
         Enable-PSRemoting -Force -SkipNetworkProfileCheck
         & winrm.cmd set winrm/config '@{MaxTimeoutms="1800000"}' >> $logfile

data/lib/kitchen/driver/ec2_version.rb

@@ -21,6 +21,6 @@ module Kitchen
   module Driver
 
     # Version string for EC2 Test Kitchen driver
-    EC2_VERSION = "1.1.0"
+    EC2_VERSION = "1.2.0"
   end
 end

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

@@ -71,6 +71,29 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
     end
 
     context "when populated with minimum requirements" do
+      let(:config) do
+        {
+          :instance_type                => "micro",
+          :ebs_optimized                => true,
+          :image_id                     => "ami-123",
+          :subnet_id                    => "s-456",
+          :private_ip_address           => "0.0.0.0"
+        }
+      end
+
+      it "returns the minimum data" do
+        expect(generator.ec2_instance_data).to eq(
+           :instance_type => "micro",
+           :ebs_optimized => true,
+           :image_id => "ami-123",
+           :key_name => nil,
+           :subnet_id => "s-456",
+           :private_ip_address => "0.0.0.0"
+        )
+      end
+    end
+
+    context "when populated with ssh key" do
       let(:config) do
         {
           :instance_type                => "micro",

data/spec/kitchen/driver/ec2_spec.rb

@@ -70,14 +70,6 @@ describe Kitchen::Driver::Ec2 do
       Kitchen::Driver::EC2_VERSION)
   end
 
-  describe "configuration" do
-    let(:config) { {} }
-    it "requires :aws_ssh_key_id to be provided" do
-      expect { driver.finalize_config!(instance) }.to \
-        raise_error(Kitchen::UserError, /:aws_ssh_key_id/)
-    end
-  end
-
   describe "#hostname" do
     let(:public_dns_name) { nil }
     let(:private_dns_name) { nil }
@@ -195,6 +187,23 @@ describe Kitchen::Driver::Ec2 do
     end
   end
 
+  describe "submit_server with terminate shutdown behaviour" do
+    before do
+      config[:instance_initiated_shutdown_behavior] = "terminate"
+      expect(driver).to receive(:instance).at_least(:once).and_return(instance)
+    end
+
+    it "submits the server request" do
+      expect(generator).to receive(:ec2_instance_data).and_return(
+        :instance_initiated_shutdown_behavior => "terminate"
+      )
+      expect(client).to receive(:create_instance).with(
+        :min_count => 1, :max_count => 1, :instance_initiated_shutdown_behavior => "terminate"
+      )
+      driver.submit_server
+    end
+  end
+
   describe "#submit_spot" do
     let(:state) { {} }
     let(:response) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-09 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -184,6 +184,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: A Test Kitchen Driver for Amazon EC2
 email:
 - fnichol@nichol.ca
@@ -239,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2
@@ -249,3 +263,4 @@ test_files:
 - spec/kitchen/driver/ec2/instance_generator_spec.rb
 - spec/kitchen/driver/ec2_spec.rb
 - spec/spec_helper.rb
+has_rdoc: