kitchen-ec2 0.9.5 → 0.10.0.rc.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4c3c1651c87e7efe1021c8c7f42eea85b1bd50
-  data.tar.gz: 4f9beb18601e10e003b579da74f2920061040543
+  metadata.gz: b1afe405e2b2540e860aa776f26f53df005aa9fb
+  data.tar.gz: 0893be9f82b85a878670574ec6e4edd36f2b979f
 SHA512:
-  metadata.gz: 0a8da55831097f198d69c3de6c0474cc9a85aedbaf15b96180a198c9ce3455ef5ce8081f75aeecb80a211ca0d2002118f39a1e5b23ae83d3f41aa692d7adcf01
-  data.tar.gz: 5aa911a240efb08e0fce0d17adab20a7851fd8ec4ec1718459739e8ad5a0a264f10e7c4267b1fb0cdbb231d3973aec9b7067570f5364ed3074c7273900b4e8fc
+  metadata.gz: 3c5483cdbb6079926207e3c1291191c647512bc0076748bf29ea8724f83e84ab7515f2c738e12cdeedc69024485664e31d8d4a5d88e95e2da5528643129b2003
+  data.tar.gz: 4c11b5f222aa4c6502ac8a2c0733548c959eac5267047e68a75fd4e445a17c2f33e1b405f19a030273126a65dca53bace16e626b4d0664ac4af6ec95bf68f2fb

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-## 0.9.4 / 2015-06-05
+## 0.10.0 / TBD
+
+### Bug Fixes
+
+### New Features
+
+* Pull Request [#150][]: Added support for managing Windows hosts in AWS
+    * Updated `amis.json` to include AMIs for Windows Server 2008 and 2012R2.
+    * Add default user data which enables winrm.  See `ec2.rb` for the exact user data that is uploaded.
+    * Default user data will add a non-`administrator` user to the Administrator group if `username` and `password` transport options are specified.
+    * EC2 will automatically generate the `administrator` user password if it is not specified as `password` transport options.  This will be stored and used for further kitchen commands.
+        * Unfortunately this cannot be passed to the RDP client initiated by `kitchen login`.  Look at `.kitchen/<name>.yml` for the password in this case.
+    * A HUGE thanks to [@zl4bv][] and [@afiune][] for the majority of the work on these changes!
+
+### Improvements
+
+## 0.9.5 / 2015-06-05
 
 ### Bug Fixes
 
@@ -175,6 +191,7 @@
 [#131]: https://github.com/test-kitchen/kitchen-ec2/issues/131
 [#140]: https://github.com/test-kitchen/kitchen-ec2/issues/140
 [#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
 [@Atalanta]: https://github.com/Atalanta
 [@Igorshp]: https://github.com/Igorshp
@@ -196,10 +213,12 @@
 [@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
 [@someara]: https://github.com/someara
 [@spheromak]: https://github.com/spheromak
 [@tiwilliam]: https://github.com/tiwilliam
-[@tyler-ball]: https://github.com/tyler-ball
+[@tyler-ball]: https://github.com/tyler-ball
+[@zl4bv]: https://github.com/zl4bv

data/README.md

@@ -21,8 +21,13 @@ Please read the [Driver usage][driver_usage] page for more details.
 ## Default Configuration
 
 This driver can determine AMI and username login for a select number of
-platforms in each region. Currently, the following platform names are
-supported:
+platforms in each region.
+
+For Windows instances the generated Administrator password is fetched
+automatically from Amazon EC2 with the same private key as we use for
+SSH logins to Linux.
+
+Currently, the following platform names are supported:
 
 ```ruby
 ---
@@ -35,6 +40,8 @@ platforms:
   - name: ubuntu-14.04
   - name: centos-6.4
   - name: debian-7.1.0
+  - name: windows-2012r2
+  - name: windows-2008r2
 ```
 
 This will effectively generate a configuration similar to:
@@ -45,17 +52,21 @@ platforms:
   - name: ubuntu-10.04
     driver:
       image_id: ami-1ab3ce73
-      username: ubuntu
-  - name: ubuntu-12.04
-    driver:
-      image_id: ami-2f115c46
+    transport:
       username: ubuntu
   # ...
   - name: centos-6.4
     driver:
       image_id: ami-bf5021d6
+    transport:
       username: root
   # ...
+  - name: windows-2012r2
+    driver:
+      image_id: ami-28bc7428
+    transport:
+      username: administrator
+  # ...
 ```
 
 For specific default values, please consult [amis.json][amis_json].
@@ -178,14 +189,18 @@ The Hash of EC tag name/value pairs which will be applied to the instance.
 
 The default is `{ "created-by" => "test-kitchen" }`.
 
-### user_data
+### user\_data
 
 The user_data script or the path to a script to feed the instance.
 Use bash to install dependencies or download artifacts before chef runs.
 This is just for some cases. If you can do the stuff with chef, then do it with
 chef!
 
-The default is unset, or `nil`.
+On linux instances the default is unset, or `nil`.
+
+On Windows instances we specify a default that enables winrm and
+adds a non-administrator user specified in the `username` transport
+options to the Administrator's User Group.
 
 ### iam\_profile\_name
 
@@ -232,10 +247,10 @@ name of your ebs device, for example: `/dev/sda1`
 A list of block device mappings for the machine.  An example of all available keys looks like:
 ```yaml
 block_device_mappings:
-  - ebs_device_name: /dev/sda1
+  - ebs_device_name: /dev/sda
     ebs_volume_size: 20
     ebs_delete_on_termination: true
-  - ebs_device_name: /dev/sda2
+  - ebs_device_name: /dev/sdb
     ebs_volume_type: gp2
     ebs_virtual_name: test
     ebs_volume_size: 15
@@ -361,21 +376,14 @@ driver:
   name: ec2
   aws_ssh_key_id: id_rsa-aws
   security_group_ids: ["sg-1a2b3c4d"]
-  region: us-east-1
+  region: us-west-2
   availability_zone: b
   require_chef_omnibus: true
-  subnet_id: subnet-6d6...
+  subnet_id: subnet-6e5d4c3b
   iam_profile_name: chef-client
-  instance_type: t2.micro
+  instance_type: m3.medium
   associate_public_ip: true
-  private_ip_address: 10.0.0.27
   interface: dns
-  block_device_mappings:
-    - ebs_device_name: /dev/sda0
-      ebs_volume_type: gp2
-      ebs_virtual_name: test
-      ebs_volume_size: 15
-      ebs_delete_on_termination: true
 
 transport:
   ssh_key: /path/to/id_rsa-aws
@@ -385,13 +393,29 @@ transport:
 
 platforms:
   - name: ubuntu-12.04
+  - name: centos-6.4
+  - name: ubuntu-15.04
     driver:
-      image_id: ami-fd20ad94
-      username: ubuntu
-  - name: centos-6.3
+      image_id: ami-83211eb3
+      block_device_mappings:
+        - ebs_device_name: /dev/sda1
+          ebs_volume_type: standard
+          ebs_virtual_name: test
+          ebs_volume_size: 15
+          ebs_delete_on_termination: true
+  - name: centos-7
     driver:
-      image_id: ami-ef5ff086
-      username: ec2-user
+      image_id: ami-c7d092f7
+      block_device_mappings:
+        - ebs_device_name: /dev/sdb
+          ebs_volume_type: gp2
+          ebs_virtual_name: test
+          ebs_volume_size: 8
+          ebs_delete_on_termination: true
+    transport:
+      username: centos
+  - name: windows-2012r2
+  - name: windows-2008r2
 
 suites:
 # ...

data/Rakefile

@@ -19,19 +19,8 @@ RuboCop::RakeTask.new(:style) do |task|
   task.options << "--display-cop-names"
 end
 
-if RUBY_ENGINE != "jruby"
-  require "cane/rake_task"
-  desc "Run cane to check quality metrics"
-  Cane::RakeTask.new do |cane|
-    cane.canefile = "./.cane"
-  end
-
-  desc "Run all quality tasks"
-  task :quality => [:cane, :style, :stats]
-else
-  desc "Run all quality tasks"
-  task :quality => [:style, :stats]
-end
+desc "Run all quality tasks"
+task :quality => [:style, :stats]
 
 require "yard"
 YARD::Rake::YardocTask.new

data/data/amis.json

@@ -8,7 +8,9 @@
       "ubuntu-13.10": "ami-45f1a744",
       "ubuntu-14.04": "ami-955c0c94",
       "centos-6.4": "ami-9ffa709e",
-      "debian-7.1.0": "ami-f1f064f0"
+      "debian-7.1.0": "ami-f1f064f0",
+      "windows-2012r2": "ami-28bc7428",
+      "windows-2008r2": "ami-5ace065a"
     },
     "ap-southeast-1": {
       "ubuntu-10.04": "ami-34713866",
@@ -18,7 +20,9 @@
       "ubuntu-13.10": "ami-02e6b850",
       "ubuntu-14.04": "ami-9a7c25c8",
       "centos-6.4": "ami-46f5bb14",
-      "debian-7.1.0": "ami-fe8ac3ac"
+      "debian-7.1.0": "ami-fe8ac3ac",
+      "windows-2012r2": "ami-062e1054",
+      "windows-2008r2": "ami-30291762"
     },
     "ap-southeast-2": {
       "ubuntu-10.04": "ami-2f009315",
@@ -28,7 +32,9 @@
       "ubuntu-13.10": "ami-e54423df",
       "ubuntu-14.04": "ami-f3b1d6c9",
       "centos-6.4": "ami-9352c1a9",
-      "debian-7.1.0": "ami-4e099a74"
+      "debian-7.1.0": "ami-4e099a74",
+      "windows-2012r2": "ami-6be19e51",
+      "windows-2008r2": "ami-fdd8a7c7"
     },
     "eu-west-1": {
       "ubuntu-10.04": "ami-bbadb0cf",
@@ -38,7 +44,9 @@
       "ubuntu-13.10": "ami-39eb3f4e",
       "ubuntu-14.04": "ami-c112c5b6",
       "centos-6.4": "ami-75190b01",
-      "debian-7.1.0": "ami-954559e1"
+      "debian-7.1.0": "ami-954559e1",
+      "windows-2012r2": "ami-1387ed64",
+      "windows-2008r2": "ami-1b97fd6c"
     },
     "sa-east-1": {
       "ubuntu-10.04": "ami-962c898b",
@@ -48,7 +56,9 @@
       "ubuntu-13.10": "ami-076cc21a",
       "ubuntu-14.04": "ami-052b8518",
       "centos-6.4": "ami-a665c0bb",
-      "debian-7.1.0": "ami-b03590ad"
+      "debian-7.1.0": "ami-b03590ad",
+      "windows-2012r2": "ami-7929ae64",
+      "windows-2008r2": "ami-9331b68e"
     },
     "us-east-1": {
       "ubuntu-10.04": "ami-1ab3ce73",
@@ -58,7 +68,9 @@
       "ubuntu-13.10": "ami-a65393ce",
       "ubuntu-14.04": "ami-4a915c22",
       "centos-6.4": "ami-bf5021d6",
-      "debian-7.1.0": "ami-50d9a439"
+      "debian-7.1.0": "ami-50d9a439",
+      "windows-2012r2": "ami-c01102a8",
+      "windows-2008r2": "ami-c8c0d3a0"
     },
     "us-west-1": {
       "ubuntu-10.04": "ami-848ba2c1",
@@ -68,7 +80,9 @@
       "ubuntu-13.10": "ami-bb2a2afe",
       "ubuntu-14.04": "ami-d99a9a9c",
       "centos-6.4": "ami-5d456c18",
-      "debian-7.1.0": "ami-1a9bb25f"
+      "debian-7.1.0": "ami-1a9bb25f",
+      "windows-2012r2": "ami-830ee0c7",
+      "windows-2008r2": "ami-af04eaeb"
     },
     "us-west-2": {
       "ubuntu-10.04": "ami-f19407c1",
@@ -78,7 +92,9 @@
       "ubuntu-13.10": "ami-c18ff1f1",
       "ubuntu-14.04": "ami-b7720b87",
       "centos-6.4": "ami-b3bf2f83",
-      "debian-7.1.0": "ami-158a1925"
+      "debian-7.1.0": "ami-158a1925",
+      "windows-2012r2": "ami-c30a39f3",
+      "windows-2008r2": "ami-adf8cb9d"
     }
   },
   "usernames": {
@@ -89,11 +105,14 @@
     "ubuntu-13.10": "ubuntu",
     "ubuntu-14.04": "ubuntu",
     "centos-6.4": "root",
-    "debian-7.1.0": "admin"
+    "debian-7.1.0": "admin",
+    "windows-2008r2": "administrator",
+    "windows-2012r2": "administrator"
   },
   "references": {
     "ubuntu": "http://uec-images.ubuntu.com/query/",
     "debian": "https://wiki.debian.org/Cloud/AmazonEC2Image",
-    "centos": "http://wiki.centos.org/Cloud/AWS"
+    "centos": "http://wiki.centos.org/Cloud/AWS",
+    "windows": "http://aws.amazon.com/windows/"
   }
 }

data/kitchen-ec2.gemspec

@@ -18,10 +18,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "test-kitchen", "~> 1.4"
+  gem.add_dependency "test-kitchen", "~> 1.4", ">= 1.4.1"
   gem.add_dependency "excon"
   gem.add_dependency "multi_json"
-  gem.add_dependency "aws-sdk-v1", "~> 1.59.0"
   gem.add_dependency "aws-sdk", "~> 2"
 
   gem.add_development_dependency "rspec",     "~> 3.2"
@@ -34,6 +33,5 @@ Gem::Specification.new do |gem|
   # may introduce new and undesireable style choices which would be immediately
   # enforced in CI
   gem.add_development_dependency "finstyle",  "1.4.0"
-  gem.add_development_dependency "cane",      "2.6.2"
   gem.add_development_dependency "climate_control"
 end

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

@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "kitchen/logging"
 require "base64"
 
 module Kitchen

data/lib/kitchen/driver/ec2.rb

@@ -46,7 +46,11 @@ module Kitchen
       default_config :ebs_optimized,      false
       default_config :security_group_ids, nil
       default_config :tags,                "created-by" => "test-kitchen"
-      default_config :user_data,          nil
+      default_config :user_data do |driver|
+        if driver.windows_os?
+          driver.default_windows_user_data
+        end
+      end
       default_config :private_ip_address, nil
       default_config :iam_profile_name,   nil
       default_config :price,              nil
@@ -200,6 +204,14 @@ module Kitchen
         info("EC2 instance <#{state[:server_id]}> created.")
         wait_until_ready(server, state)
 
+        if windows_os? &&
+            instance.transport[:username] =~ /administrator/i &&
+            instance.transport[:password].nil?
+          # If we're logging into the administrator user and a password isn't
+          # supplied, try to fetch it from the AWS instance
+          fetch_windows_admin_password(server, state)
+        end
+
         info("EC2 instance <#{state[:server_id]}> ready.")
         instance.transport.connection(state).wait_until_ready
         create_ec2_json(state)
@@ -322,11 +334,35 @@ module Kitchen
           # we still have it, even if it will change later
           state[:hostname] = hostname
           # Euca instances often report ready before they have an IP
-          aws_instance.exists? &&
+          ready = aws_instance.exists? &&
             aws_instance.state.name == "running" &&
             hostname != "0.0.0.0"
+          if ready && windows_os?
+            output = server.console_output.output
+            unless output.nil?
+              output = Base64.decode64(output)
+              debug "Console output: --- \n#{output}"
+            end
+            ready = !!(output =~ /Windows is Ready to use/)
+          end
+          ready
+        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(
+            :instance_id => state[:server_id]
+          ).password_data
+          # Password data is blank until password is available
+          !enc.nil? && !enc.empty?
         end
+        pass = server.decrypt_windows_password(instance.transport[:ssh_key])
+        state[:password] = pass
+        info("Retrieved Windows password for instance <#{state[:server_id]}>.")
       end
+      # rubocop:enable Lint/UnusedBlockArgument
 
       def wait_with_destroy(server, state, status_msg, &block)
         wait_log = proc do |attempts|
@@ -391,10 +427,56 @@ module Kitchen
       end
 
       def create_ec2_json(state)
-        instance.transport.connection(state).execute(
-          "sudo mkdir -p /etc/chef/ohai/hints;sudo touch /etc/chef/ohai/hints/ec2.json"
-        )
+        if windows_os?
+          cmd = "mkdir \\etc\\chef\\ohai\\hints; echo $null >> \\etc\\chef\\ohai\\hints\\ec2.json"
+        else
+          cmd = "sudo mkdir -p /etc/chef/ohai/hints;sudo touch /etc/chef/ohai/hints/ec2.json"
+        end
+        instance.transport.connection(state).execute(cmd)
+      end
+
+      # rubocop:disable Metrics/MethodLength, Metrics/LineLength
+      def default_windows_user_data
+        # Preparing custom static admin user if we defined something other than Administrator
+        custom_admin_script = ""
+        if !(instance.transport[:username] =~ /administrator/i) && instance.transport[:password]
+          custom_admin_script = Kitchen::Util.outdent!(<<-EOH)
+          "Disabling Complex Passwords" >> $logfile
+          $seccfg = [IO.Path]::GetTempFileName()
+          & secedit.exe /export /cfg $seccfg >> $logfile
+          (Get-Content $seccfg) | Foreach-Object {$_ -replace "PasswordComplexity\\s*=\\s*1", "PasswordComplexity = 0"} | Set-Content $seccfg
+          & secedit.exe /configure /db $env:windir\\security\\new.sdb /cfg $seccfg /areas SECURITYPOLICY >> $logfile
+          & cp $seccfg "c:\\"
+          & del $seccfg
+          $username="#{instance.transport[:username]}"
+          $password="#{instance.transport[:password]}"
+          "Creating static user: $username" >> $logfile
+          & net.exe user /y /add $username $password >> $logfile
+          "Adding $username to Administrators" >> $logfile
+          & net.exe localgroup Administrators /add $username >> $logfile
+          EOH
+        end
+
+        # Returning the fully constructed PowerShell script to user_data
+        Kitchen::Util.outdent!(<<-EOH)
+        <powershell>
+        $logfile="C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log"
+        #PS Remoting and & winrm.cmd basic config
+        Enable-PSRemoting -Force -SkipNetworkProfileCheck
+        & 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
+        #Server settings - support username/password login
+        & winrm.cmd set winrm/config/service/auth '@{Basic="true"}' >> $logfile
+        & winrm.cmd set winrm/config/service '@{AllowUnencrypted="true"}' >> $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
+        #{custom_admin_script}
+        </powershell>
+        EOH
       end
+      # rubocop:enable Metrics/MethodLength, Metrics/LineLength
 
     end
   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.9.5"
+    EC2_VERSION = "0.10.0.rc.0"
   end
 end

data/spec/kitchen/driver/ec2_spec.rb

@@ -27,11 +27,7 @@ describe Kitchen::Driver::Ec2 do
   let(:logger)        { Logger.new(logged_output) }
   let(:config)        { { :aws_ssh_key_id => "key", :image_id => "ami-1234567" } }
   let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
-  let(:suite)         { Kitchen::Suite.new(:name => "suitey") }
-  let(:verifier)      { Kitchen::Verifier::Dummy.new }
-  let(:provisioner)   { Kitchen::Provisioner::Dummy.new }
   let(:transport)     { Kitchen::Transport::Dummy.new }
-  let(:state_file)    { double("state_file") }
   let(:generator)     { instance_double(Kitchen::Driver::Aws::InstanceGenerator) }
   # There is too much name overlap I let creep in - my `client` is actually
   # a wrapper around the actual ec2 client
@@ -43,21 +39,20 @@ describe Kitchen::Driver::Ec2 do
   let(:driver) { Kitchen::Driver::Ec2.new(config) }
 
   let(:instance) do
-    Kitchen::Instance.new(
-      :verifier => verifier,
-      :driver => driver,
+    instance_double(
+      Kitchen::Instance,
       :logger => logger,
-      :suite => suite,
-      :platform => platform,
-      :provisioner => provisioner,
       :transport => transport,
-      :state_file => state_file
+      :platform => platform,
+      :to_str => "str"
     )
   end
 
   before do
     allow(Kitchen::Driver::Aws::InstanceGenerator).to receive(:new).and_return(generator)
     allow(Kitchen::Driver::Aws::Client).to receive(:new).and_return(client)
+    allow(driver).to receive(:windows_os?).and_return(false)
+    allow(driver).to receive(:instance).and_return(instance)
   end
 
   it "driver api_version is 2" do
@@ -267,6 +262,34 @@ describe Kitchen::Driver::Ec2 do
     end
   end
 
+  describe "#fetch_windows_admin_password" do
+    let(:msg) { "to fetch windows admin password" }
+    let(:aws_instance) { double("aws instance") }
+    let(:server_id) { "server_id" }
+    let(:encrypted_password) { "alksdofw" }
+    let(:data) { double("data", :password_data => encrypted_password) }
+    let(:password) { "password" }
+    let(:transport) { { :ssh_key => "foo" } }
+
+    before do
+      state[:server_id] = server_id
+      expect(driver).to receive(:wait_with_destroy).with(server, state, msg).and_yield(aws_instance)
+    end
+
+    after do
+      expect(state[:password]).to eq(password)
+    end
+
+    it "fetches and decrypts the windows password" do
+      expect(server).to receive_message_chain("client.get_password_data").with(
+        :instance_id => server_id
+      ).and_return(data)
+      expect(server).to receive(:decrypt_windows_password).with("foo").and_return(password)
+      driver.fetch_windows_admin_password(server, state)
+    end
+
+  end
+
   describe "#wait_with_destroy" do
     let(:tries) { 111 }
     let(:sleep) { 222 }
@@ -299,6 +322,65 @@ describe Kitchen::Driver::Ec2 do
     end
   end
 
+  describe "#create" do
+    let(:server) { double("aws server object", :id => id) }
+    let(:id) { "i-12345" }
+
+    before do
+      expect(driver).to receive(:copy_deprecated_configs).with(state)
+    end
+
+    it "returns if the instance is already created" do
+      state[:server_id] = id
+      expect(driver.create(state)).to eq(nil)
+    end
+
+    shared_examples "common create" do
+      it "successfully creates and tags the instance" do
+        expect(actual_client).to receive(:wait_until).with(
+          :instance_exists,
+          :instance_ids => [server.id]
+        )
+        expect(driver).to receive(:tag_server).with(server)
+        expect(driver).to receive(:wait_until_ready).with(server, state)
+        expect(transport).to receive_message_chain("connection.wait_until_ready")
+        expect(driver).to receive(:create_ec2_json).with(state)
+        driver.create(state)
+        expect(state[:server_id]).to eq(id)
+      end
+    end
+
+    context "non-windows on-depand instance" do
+      before do
+        expect(driver).to receive(:submit_server).and_return(server)
+      end
+
+      include_examples "common create"
+    end
+
+    context "config is for a spot instance" do
+      before do
+        config[:price] = 1
+        expect(driver).to receive(:submit_spot).with(state).and_return(server)
+      end
+
+      include_examples "common create"
+    end
+
+    context "instance is a windows machine" do
+      before do
+        expect(driver).to receive(:windows_os?).and_return(true)
+        expect(transport).to receive(:[]).with(:username).and_return("administrator")
+        expect(transport).to receive(:[]).with(:password).and_return(nil)
+        expect(driver).to receive(:submit_server).and_return(server)
+        expect(driver).to receive(:fetch_windows_admin_password).with(server, state)
+      end
+
+      include_examples "common create"
+    end
+
+  end
+
   describe "#destroy" do
     context "when state[:server_id] is nil" do
       it "returns nil" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0.rc.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk-v1
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.59.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.59.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -164,20 +156,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: cane
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.6.2
 - !ruby/object:Gem::Dependency
   name: climate_control
   requirement: !ruby/object:Gem::Requirement
@@ -199,7 +177,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".cane"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -235,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.7

data/.cane

@@ -1,2 +0,0 @@
---abc-max 40
---style-measure 100