kitchen-ec2 0.10.0 → 1.0.0.beta.1

data/spec/kitchen/driver/ec2_spec.rb

@@ -70,26 +70,6 @@ describe Kitchen::Driver::Ec2 do
       expect { driver.finalize_config!(instance) }.to \
         raise_error(Kitchen::UserError, /:aws_ssh_key_id/)
     end
-
-    it "requires :image_id to be provided" do
-      config[:aws_ssh_key_id] = "key"
-      expect { driver.finalize_config!(instance) }.to \
-        raise_error(Kitchen::UserError, /:image_id/)
-    end
-  end
-
-  describe "#finalize_config!" do
-    it "defaults the availability zone if not provided" do
-      expect(config[:availability_zone]).to eq(nil)
-      driver.finalize_config!(instance)
-      expect(config[:availability_zone]).to eq("us-east-1b")
-    end
-
-    it "expands the availability zone if provided as a letter" do
-      config[:availability_zone] = "d"
-      driver.finalize_config!(instance)
-      expect(config[:availability_zone]).to eq("us-east-1d")
-    end
   end
 
   describe "#hostname" do
@@ -284,7 +264,9 @@ describe Kitchen::Driver::Ec2 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)
+      expect(server).to receive(:decrypt_windows_password).
+        with(File.expand_path("foo")).
+        and_return(password)
       driver.fetch_windows_admin_password(server, state)
     end
 
@@ -326,10 +308,6 @@ describe Kitchen::Driver::Ec2 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)
@@ -337,10 +315,8 @@ describe Kitchen::Driver::Ec2 do
 
     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(server).to receive(:wait_until_exists)
+        expect(driver).to receive(:update_username)
         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")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-ec2
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 1.0.0.beta.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -72,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: retryable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -187,13 +201,21 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- data/amis.json
 - kitchen-ec2.gemspec
 - lib/kitchen/driver/aws/client.rb
 - lib/kitchen/driver/aws/instance_generator.rb
+- lib/kitchen/driver/aws/standard_platform.rb
+- lib/kitchen/driver/aws/standard_platform/centos.rb
+- lib/kitchen/driver/aws/standard_platform/debian.rb
+- lib/kitchen/driver/aws/standard_platform/fedora.rb
+- lib/kitchen/driver/aws/standard_platform/freebsd.rb
+- lib/kitchen/driver/aws/standard_platform/rhel.rb
+- lib/kitchen/driver/aws/standard_platform/ubuntu.rb
+- lib/kitchen/driver/aws/standard_platform/windows.rb
 - lib/kitchen/driver/ec2.rb
 - lib/kitchen/driver/ec2_version.rb
 - spec/kitchen/driver/ec2/client_spec.rb
+- spec/kitchen/driver/ec2/image_selection_spec.rb
 - spec/kitchen/driver/ec2/instance_generator_spec.rb
 - spec/kitchen/driver/ec2_spec.rb
 - spec/spec_helper.rb
@@ -212,17 +234,18 @@ 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
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Amazon EC2
 test_files:
 - spec/kitchen/driver/ec2/client_spec.rb
+- spec/kitchen/driver/ec2/image_selection_spec.rb
 - spec/kitchen/driver/ec2/instance_generator_spec.rb
 - spec/kitchen/driver/ec2_spec.rb
 - spec/spec_helper.rb

data/data/amis.json

@@ -1,118 +0,0 @@
-{
-  "regions": {
-    "ap-northeast-1": {
-      "ubuntu-10.04": "ami-8326b382",
-      "ubuntu-12.04": "ami-bb9a08ba",
-      "ubuntu-12.10": "ami-4556c544",
-      "ubuntu-13.04": "ami-97099a96",
-      "ubuntu-13.10": "ami-45f1a744",
-      "ubuntu-14.04": "ami-955c0c94",
-      "centos-6.4": "ami-9ffa709e",
-      "debian-7.1.0": "ami-f1f064f0",
-      "windows-2012r2": "ami-28bc7428",
-      "windows-2008r2": "ami-5ace065a"
-    },
-    "ap-southeast-1": {
-      "ubuntu-10.04": "ami-34713866",
-      "ubuntu-12.04": "ami-881c57da",
-      "ubuntu-12.10": "ami-3ce0a86e",
-      "ubuntu-13.04": "ami-4af5bd18",
-      "ubuntu-13.10": "ami-02e6b850",
-      "ubuntu-14.04": "ami-9a7c25c8",
-      "centos-6.4": "ami-46f5bb14",
-      "debian-7.1.0": "ami-fe8ac3ac",
-      "windows-2012r2": "ami-062e1054",
-      "windows-2008r2": "ami-30291762"
-    },
-    "ap-southeast-2": {
-      "ubuntu-10.04": "ami-2f009315",
-      "ubuntu-12.04": "ami-cb26b4f1",
-      "ubuntu-12.10": "ami-1703912d",
-      "ubuntu-13.04": "ami-8f32a0b5",
-      "ubuntu-13.10": "ami-e54423df",
-      "ubuntu-14.04": "ami-f3b1d6c9",
-      "centos-6.4": "ami-9352c1a9",
-      "debian-7.1.0": "ami-4e099a74",
-      "windows-2012r2": "ami-6be19e51",
-      "windows-2008r2": "ami-fdd8a7c7"
-    },
-    "eu-west-1": {
-      "ubuntu-10.04": "ami-bbadb0cf",
-      "ubuntu-12.04": "ami-d3b5aea7",
-      "ubuntu-12.10": "ami-6b62791f",
-      "ubuntu-13.04": "ami-6fd4cf1b",
-      "ubuntu-13.10": "ami-39eb3f4e",
-      "ubuntu-14.04": "ami-c112c5b6",
-      "centos-6.4": "ami-75190b01",
-      "debian-7.1.0": "ami-954559e1",
-      "windows-2012r2": "ami-1387ed64",
-      "windows-2008r2": "ami-1b97fd6c"
-    },
-    "sa-east-1": {
-      "ubuntu-10.04": "ami-962c898b",
-      "ubuntu-12.04": "ami-c905a1d4",
-      "ubuntu-12.10": "ami-e759fdfa",
-      "ubuntu-13.04": "ami-4b2b8f56",
-      "ubuntu-13.10": "ami-076cc21a",
-      "ubuntu-14.04": "ami-052b8518",
-      "centos-6.4": "ami-a665c0bb",
-      "debian-7.1.0": "ami-b03590ad",
-      "windows-2012r2": "ami-7929ae64",
-      "windows-2008r2": "ami-9331b68e"
-    },
-    "us-east-1": {
-      "ubuntu-10.04": "ami-1ab3ce73",
-      "ubuntu-12.04": "ami-2f115c46",
-      "ubuntu-12.10": "ami-4d5b1824",
-      "ubuntu-13.04": "ami-a73371ce",
-      "ubuntu-13.10": "ami-a65393ce",
-      "ubuntu-14.04": "ami-4a915c22",
-      "centos-6.4": "ami-bf5021d6",
-      "debian-7.1.0": "ami-50d9a439",
-      "windows-2012r2": "ami-c01102a8",
-      "windows-2008r2": "ami-c8c0d3a0"
-    },
-    "us-west-1": {
-      "ubuntu-10.04": "ami-848ba2c1",
-      "ubuntu-12.04": "ami-eaf0daaf",
-      "ubuntu-12.10": "ami-02220847",
-      "ubuntu-13.04": "ami-fe052fbb",
-      "ubuntu-13.10": "ami-bb2a2afe",
-      "ubuntu-14.04": "ami-d99a9a9c",
-      "centos-6.4": "ami-5d456c18",
-      "debian-7.1.0": "ami-1a9bb25f",
-      "windows-2012r2": "ami-830ee0c7",
-      "windows-2008r2": "ami-af04eaeb"
-    },
-    "us-west-2": {
-      "ubuntu-10.04": "ami-f19407c1",
-      "ubuntu-12.04": "ami-e6f36fd6",
-      "ubuntu-12.10": "ami-0c069b3c",
-      "ubuntu-13.04": "ami-4ade427a",
-      "ubuntu-13.10": "ami-c18ff1f1",
-      "ubuntu-14.04": "ami-b7720b87",
-      "centos-6.4": "ami-b3bf2f83",
-      "debian-7.1.0": "ami-158a1925",
-      "windows-2012r2": "ami-c30a39f3",
-      "windows-2008r2": "ami-adf8cb9d"
-    }
-  },
-  "usernames": {
-    "ubuntu-10.04": "ubuntu",
-    "ubuntu-12.04": "ubuntu",
-    "ubuntu-12.10": "ubuntu",
-    "ubuntu-13.04": "ubuntu",
-    "ubuntu-13.10": "ubuntu",
-    "ubuntu-14.04": "ubuntu",
-    "centos-6.4": "root",
-    "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",
-    "windows": "http://aws.amazon.com/windows/"
-  }
-}