kitchen-ec2 0.10.0 → 1.0.0.beta.1

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"
+    EC2_VERSION = "1.0.0.beta.1"
   end
 end

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

@@ -57,22 +57,6 @@ describe Kitchen::Driver::Aws::Client do
       end
     end
 
-    it "loads deprecated credentials fourth to last" do
-      expect(shared).to_not receive(:loadable?)
-      ClimateControl.modify(
-        "AWS_ACCESS_KEY" => "key2",
-        "AWS_SECRET_KEY" => "value2",
-        "AWS_TOKEN" => "token2"
-      ) do
-        expect(Kitchen::Driver::Aws::Client.get_credentials("profile", nil, nil, nil)).to \
-          be_a(Aws::Credentials).and have_attributes(
-            :access_key_id => "key2",
-            :secret_access_key => "value2",
-            :session_token => "token2"
-          )
-      end
-    end
-
     it "loads provided credentials first" do
       expect(shared).to_not receive(:loadable?)
       expect(Kitchen::Driver::Aws::Client.get_credentials("profile", "key3", "value3", nil)).to \
@@ -115,7 +99,8 @@ describe Kitchen::Driver::Aws::Client do
           "access_key_id",
           "secret_access_key",
           "session_token",
-          "http_proxy"
+          "http_proxy",
+          999
         )
       }
       let(:creds) { double("creds") }
@@ -125,6 +110,7 @@ describe Kitchen::Driver::Aws::Client do
         expect(Aws.config[:region]).to eq("us-west-1")
         expect(Aws.config[:credentials]).to eq(creds)
         expect(Aws.config[:http_proxy]).to eq("http_proxy")
+        expect(Aws.config[:retry_limit]).to eq(999)
       end
     end
   end

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

@@ -0,0 +1,350 @@
+require "kitchen/driver/ec2"
+require "kitchen/provisioner/dummy"
+require "kitchen/transport/dummy"
+require "kitchen/verifier/dummy"
+
+describe "Default images for various platforms" do
+
+  class FakeImage
+    def self.next_ami
+      @n ||= 0
+      @n += 1
+      [sprintf("ami-%08x", @n), Time.now + @n]
+    end
+
+    def initialize(name: "foo")
+      @id, @creation_date = FakeImage.next_ami
+      @name = name
+      @creation_date = @creation_date.strftime("%F %T")
+      @architecture = :x86_64
+      @volume_type = "gp2"
+      @root_device_type = "ebs"
+      @virtualization_type = "hvm"
+      @root_device_name = "root"
+      @device_name = "root"
+    end
+    attr_reader :id
+    attr_reader :name
+    attr_reader :creation_date
+    attr_reader :architecture
+    attr_reader :volume_type
+    attr_reader :root_device_type
+    attr_reader :virtualization_type
+    attr_reader :root_device_name
+    attr_reader :device_name
+
+    def block_device_mappings
+      [self]
+    end
+
+    def ebs
+      self
+    end
+  end
+
+  let(:driver) do
+    Kitchen::Driver::Ec2.new(:region => "us-west-2", :aws_ssh_key_id => "foo", **config)
+  end
+  let(:config) { {} }
+  def new_instance(platform_name: "blarghle")
+    Kitchen::Instance.new(
+      :driver => driver,
+      :suite => Kitchen::Suite.new(:name => "suite-name"),
+      :platform => Kitchen::Platform.new(:name => platform_name),
+      :provisioner => Kitchen::Provisioner::Dummy.new,
+      :transport => Kitchen::Transport::Dummy.new,
+      :verifier => Kitchen::Verifier::Dummy.new,
+      :state_file => Kitchen::StateFile.new("/nonexistent", "suite-name-#{platform_name}")
+    )
+  end
+
+  PLATFORM_SEARCHES = {
+    "centos" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux *", "CentOS-*-GA-*"] }
+    ],
+    "centos-7" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux 7*", "CentOS-7*-GA-*"] }
+    ],
+    "centos-6" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux 6*", "CentOS-6*-GA-*"] }
+    ],
+    "centos-6.3" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] }
+    ],
+    "centos-x86_64" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux *", "CentOS-*-GA-*"] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "centos-6.3-x86_64" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux 6.3*", "CentOS-6.3*-GA-*"] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "centos-7-x86_64" => [
+      { :name => "owner-alias", :values => %w[aws-marketplace] },
+      { :name => "name", :values => ["CentOS Linux 7*", "CentOS-7*-GA-*"] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "debian" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-jessie-*] }
+    ],
+    "debian-8" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-jessie-*] }
+    ],
+    "debian-7" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-wheezy-*] }
+    ],
+    "debian-6" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-squeeze-*] }
+    ],
+    "debian-x86_64" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-jessie-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "debian-6-x86_64" => [
+      { :name => "owner-id", :values => %w[379101102735] },
+      { :name => "name", :values => %w[debian-squeeze-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "rhel" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-*] }
+    ],
+    "rhel-6" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-6*] }
+    ],
+    "rhel-7.1" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-7.1*] }
+    ],
+    "rhel-x86_64" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "rhel-6-x86_64" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-6*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "el" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-*] }
+    ],
+    "el-6-x86_64" => [
+      { :name => "owner-id", :values => %w[309956199498] },
+      { :name => "name", :values => %w[RHEL-6*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "fedora" => [
+      { :name => "owner-id", :values => %w[125523088429] },
+      { :name => "name", :values => %w[Fedora-Cloud-Base-*] }
+    ],
+    "fedora-22" => [
+      { :name => "owner-id", :values => %w[125523088429] },
+      { :name => "name", :values => %w[Fedora-Cloud-Base-22-*] }
+    ],
+    "fedora-x86_64" => [
+      { :name => "owner-id", :values => %w[125523088429] },
+      { :name => "name", :values => %w[Fedora-Cloud-Base-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "fedora-22-x86_64" => [
+      { :name => "owner-id", :values => %w[125523088429] },
+      { :name => "name", :values => %w[Fedora-Cloud-Base-22-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "freebsd" => [
+      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "name", :values => ["FreeBSD *-RELEASE*", "FreeBSD/EC2 *-RELEASE*"] }
+    ],
+    "freebsd-10" => [
+      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "name", :values => ["FreeBSD 10*-RELEASE*", "FreeBSD/EC2 10*-RELEASE*"] }
+    ],
+    "freebsd-10.1" => [
+      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "name", :values => ["FreeBSD 10.1*-RELEASE*", "FreeBSD/EC2 10.1*-RELEASE*"] }
+    ],
+    "freebsd-x86_64" => [
+      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "name", :values => ["FreeBSD *-RELEASE*", "FreeBSD/EC2 *-RELEASE*"] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "freebsd-10-x86_64" => [
+      { :name => "owner-id", :values => %w[118940168514] },
+      { :name => "name", :values => ["FreeBSD 10*-RELEASE*", "FreeBSD/EC2 10*-RELEASE*"] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "ubuntu" => [
+      { :name => "owner-id", :values => %w[099720109477] },
+      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-*] }
+    ],
+    "ubuntu-14" => [
+      { :name => "owner-id", :values => %w[099720109477] },
+      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-14*] }
+    ],
+    "ubuntu-12.04" => [
+      { :name => "owner-id", :values => %w[099720109477] },
+      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-12.04*] }
+    ],
+    "ubuntu-x86_64" => [
+      { :name => "owner-id", :values => %w[099720109477] },
+      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "ubuntu-14-x86_64" => [
+      { :name => "owner-id", :values => %w[099720109477] },
+      { :name => "name", :values => %w[ubuntu/images/*/ubuntu-*-14*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+
+    "windows" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-*-RTM-English-*-Base-*
+        Windows_Server-*-SP*-English-*-Base-*
+        Windows_Server-*-R*_RTM-English-*-Base-*
+        Windows_Server-*-R*_SP*-English-*-Base-*] }
+    ],
+    "windows-2008" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2008-RTM-English-*-Base-*
+        Windows_Server-2008-SP*-English-*-Base-*] }
+    ],
+    "windows-2012" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-RTM-English-*-Base-*
+        Windows_Server-2012-SP*-English-*-Base-*] }
+    ],
+    "windows-2012r2" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-R2_RTM-English-*-Base-*
+        Windows_Server-2012-R2_SP*-English-*-Base-*] }
+    ],
+    "windows-2012sp1" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-SP1-English-*-Base-*] }
+    ],
+    "windows-2012rtm" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-RTM-English-*-Base-*] }
+    ],
+    "windows-2012r2sp1" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-R2_SP1-English-*-Base-*] }
+    ],
+    "windows-2012r2rtm" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-R2_RTM-English-*-Base-*] }
+    ],
+    "windows-x86_64" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-*-RTM-English-*-Base-*
+        Windows_Server-*-SP*-English-*-Base-*
+        Windows_Server-*-R*_RTM-English-*-Base-*
+        Windows_Server-*-R*_SP*-English-*-Base-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "windows-2012r2-x86_64" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-R2_RTM-English-*-Base-*
+        Windows_Server-2012-R2_SP*-English-*-Base-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ],
+    "windows-server" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-*-RTM-English-*-Base-*
+        Windows_Server-*-SP*-English-*-Base-*
+        Windows_Server-*-R*_RTM-English-*-Base-*
+        Windows_Server-*-R*_SP*-English-*-Base-*] }
+    ],
+    "windows-server-2012r2-x86_64" => [
+      { :name => "owner-alias", :values => %w[amazon] },
+      { :name => "name", :values => %w[
+        Windows_Server-2012-R2_RTM-English-*-Base-*
+        Windows_Server-2012-R2_SP*-English-*-Base-*] },
+      { :name => "architecture", :values => %w[x86_64] }
+    ]
+  }
+
+  describe "Platform defaults" do
+    PLATFORM_SEARCHES.each do |platform_name, filters|
+      context "when platform is #{platform_name}" do
+        let(:image) { FakeImage.new(:name => platform_name.split("-", 2)[0]) }
+
+        it "searches for #{filters} and uses the resulting image" do
+          expect(driver.ec2.resource).
+            to receive(:images).with(:filters => filters).and_return([image])
+          expect(driver.ec2.resource).
+            to receive(:image).with(image.id).and_return(image)
+
+          instance = new_instance(:platform_name => platform_name)
+          expect(instance.driver.instance_generator.ec2_instance_data[:image_id]).
+            to eq image.id
+        end
+      end
+    end
+  end
+
+  context "when image_search is provided" do
+    let(:image) { FakeImage.new(:name => "ubuntu") }
+    let(:config) { { :image_search => { :name => "SuperImage" } } }
+
+    context "and platform.name is a well known platform name" do
+      it "searches for an image id without using the standard filters" do
+        expect(driver.ec2.resource).
+          to receive(:images).
+          with(:filters => [{ :name => "name", :values => %w[SuperImage] }]).
+          and_return([image])
+        expect(driver.ec2.resource).
+          to receive(:image).with(image.id).and_return(image)
+
+        instance = new_instance(:platform_name => "ubuntu")
+        expect(instance.driver.instance_generator.ec2_instance_data[:image_id]).
+          to eq image.id
+      end
+    end
+
+    context "and platform.name is not a well known platform name" do
+      let(:image) { FakeImage.new(:name => "ubuntu") }
+      it "does not search for (or find) an image, and informs the user they need to set image_id" do
+        expect(driver.ec2.resource).
+          to receive(:images).
+          with(:filters => [{ :name => "name", :values => %w[SuperImage] }]).
+          and_return([image])
+        expect(driver.ec2.resource).
+          to receive(:image).with(image.id).and_return(image)
+
+        instance = new_instance(:platform_name => "blarghle")
+        expect(instance.driver.instance_generator.ec2_instance_data[:image_id]).to eq image.id
+      end
+    end
+  end
+end

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

@@ -29,38 +29,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
   let(:logger)        { instance_double(Logger) }
   let(:generator) { Kitchen::Driver::Aws::InstanceGenerator.new(config, ec2, logger) }
 
-  describe "#debug_if_root_device" do
-    let(:image_id) { "ami-123456" }
-    let(:config) { { :image_id => image_id } }
-    let(:image) { double("image") }
-
-    before do
-      allow(resource).to receive(:image).with(image_id).and_return(image)
-    end
-
-    it "returns nil when provided nil" do
-      expect(generator.debug_if_root_device(nil)).to eq(nil)
-    end
-
-    it "returns nil when provided empty" do
-      expect(generator.debug_if_root_device([])).to eq(nil)
-    end
-
-    it "returns nil when the image cannot be found" do
-      expect(image).to receive(:root_device_name).and_raise(
-        ::Aws::EC2::Errors::InvalidAMIIDNotFound.new({}, "")
-      )
-      expect(logger).to_not receive(:info)
-      expect(generator.debug_if_root_device([{ :device_name => "name" }])).to eq(nil)
-    end
-
-    it "logs an info message when the device mappings are overriding the root device" do
-      expect(image).to receive(:root_device_name).and_return("name")
-      expect(logger).to receive(:info)
-      expect(generator.debug_if_root_device([{ :device_name => "name" }])).to eq(nil)
-    end
-  end
-
   describe "#prepared_user_data" do
     context "when config[:user_data] is a file" do
       let(:tmp_file) { Tempfile.new("prepared_user_data_test") }
@@ -90,180 +58,121 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
     end
   end
 
-  describe "block_device_mappings" do
-    before do
-      expect(generator).to receive(:debug_if_root_device)
-    end
-
-    it "returns empty if nothing is provided" do
-      expect(generator.block_device_mappings).to eq([])
+  describe "#ec2_instance_data" do
+    it "returns empty on nil" 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
 
-    context "when populated with multiple mappings" do
+    context "when populated with minimum requirements" do
       let(:config) do
-        { :block_device_mappings => [
-          {
-            :ebs_volume_size => 13,
-            :ebs_delete_on_termination => true,
-            :ebs_device_name => "/dev/sda1"
-          },
-          {
-            :ebs_volume_size => 15,
-            :ebs_delete_on_termination => false,
-            :ebs_device_name => "/dev/sda2",
-            :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
-          }
-        ] }
+        {
+          :instance_type                => "micro",
+          :ebs_optimized                => true,
+          :image_id                     => "ami-123",
+          :aws_ssh_key_id               => "key",
+          :subnet_id                    => "s-456",
+          :private_ip_address           => "0.0.0.0"
+        }
       end
 
-      it "returns the transformed mappings" do
-        expect(generator.block_device_mappings).to match(
-          [
-            {
-              :ebs => {
-                :volume_size => 13,
-                :delete_on_termination => true
-              },
-              :device_name => "/dev/sda1"
-            },
-            {
-              :ebs => {
-                :volume_size => 15,
-                :volume_type => "gp2",
-                :snapshot_id => "id",
-                :delete_on_termination => false
-              },
-              :device_name => "/dev/sda2",
-              :virtual_name => "test"
-            },
-            {
-              :ebs => {
-                :volume_size => 100,
-                :volume_type => "io1",
-                :iops => 100,
-                :delete_on_termination => true
-              },
-              :device_name => "/dev/sda3"
-            }
-          ]
+      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 => "key",
+          :subnet_id => "s-456",
+          :private_ip_address => "0.0.0.0"
         )
       end
-
     end
 
-    context "when populatd with deprecated configs" do
+    context "when passed an empty block_device_mappings" do
       let(:config) do
         {
-          :ebs_volume_size => 13,
-          :ebs_delete_on_termination => true,
-          :ebs_device_name => "/dev/sda1",
-          :ebs_volume_type => "gp2"
+          :instance_type                => "micro",
+          :ebs_optimized                => true,
+          :image_id                     => "ami-123",
+          :aws_ssh_key_id               => "key",
+          :subnet_id                    => "s-456",
+          :private_ip_address           => "0.0.0.0",
+          :block_device_mappings        => []
         }
       end
 
-      it "returns the transformed mappings" do
-        expect(generator.block_device_mappings).to match(
-          [
-            {
-              :ebs => {
-                :volume_size => 13,
-                :delete_on_termination => true,
-                :volume_type => "gp2"
-              },
-              :device_name => "/dev/sda1"
-            }
-          ]
+      it "does not return block_device_mappings" do
+        expect(generator.ec2_instance_data).to eq(
+          :instance_type => "micro",
+          :ebs_optimized => true,
+          :image_id => "ami-123",
+          :key_name => "key",
+          :subnet_id => "s-456",
+          :private_ip_address => "0.0.0.0"
         )
       end
     end
 
-    context "when populated with deprecated configs and new configs" do
+    context "when availability_zone is provided as 'eu-west-1c'" do
       let(:config) do
         {
-          :ebs_volume_size => 13,
-          :ebs_delete_on_termination => true,
-          :ebs_device_name => "/dev/sda1",
-          :ebs_volume_type => "gp2",
-          :block_device_mappings => [
-            {
-              :ebs_volume_size => 15,
-              :ebs_delete_on_termination => false,
-              :ebs_device_name => "/dev/sda2",
-              :ebs_volume_type => "gp2",
-              :ebs_snapshot_id => "id",
-              :ebs_virtual_name => "test"
-            }
-          ]
+          :region => "eu-east-1",
+          :availability_zone => "eu-west-1c"
         }
       end
-
-      it "ignores the old configs" do
-        expect(generator.block_device_mappings).to match(
-          [
-            {
-              :ebs => {
-                :volume_size => 15,
-                :volume_type => "gp2",
-                :snapshot_id => "id",
-                :delete_on_termination => false
-              },
-              :device_name => "/dev/sda2",
-              :virtual_name => "test"
-            }
-          ]
+      it "returns that in 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,
+          :placement => { :availability_zone => "eu-west-1c" }
         )
       end
     end
-  end
-
-  describe "#ec2_instance_data" do
-    before do
-      expect(generator).to receive(:debug_if_root_device)
-    end
 
-    it "returns empty on nil" do
-      expect(generator.ec2_instance_data).to eq(
-        :placement => { :availability_zone => nil },
-        :instance_type => nil,
-        :ebs_optimized => nil,
-        :image_id => nil,
-        :key_name => nil,
-        :subnet_id => nil,
-        :private_ip_address => nil
-      )
+    context "when availability_zone is provided as 'c'" do
+      let(:config) do
+        {
+          :region => "eu-east-1",
+          :availability_zone => "c"
+        }
+      end
+      it "adds the region to it in 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,
+          :placement => { :availability_zone => "eu-east-1c" }
+        )
+      end
     end
 
-    context "when populated with minimum requirements" do
+    context "when availability_zone is not provided" do
       let(:config) do
         {
-          :availability_zone            => "eu-west-1a",
-          :instance_type                => "micro",
-          :ebs_optimized                => true,
-          :image_id                     => "ami-123",
-          :aws_ssh_key_id               => "key",
-          :subnet_id                    => "s-456",
-          :private_ip_address           => "0.0.0.0"
+          :region => "eu-east-1"
         }
       end
-
-      it "returns the minimum data" do
+      it "is not added to the instance data" do
         expect(generator.ec2_instance_data).to eq(
-          :placement => { :availability_zone => "eu-west-1a" },
-          :instance_type => "micro",
-          :ebs_optimized => true,
-          :image_id => "ami-123",
-          :key_name => "key",
-          :subnet_id => "s-456",
-          :private_ip_address => "0.0.0.0"
+          :instance_type => nil,
+          :ebs_optimized => nil,
+          :image_id => nil,
+          :key_name => nil,
+          :subnet_id => nil,
+          :private_ip_address => nil
         )
       end
     end
@@ -277,7 +186,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
       it "adds a network_interfaces block" do
         expect(generator.ec2_instance_data).to eq(
-          :placement => { :availability_zone => nil },
           :instance_type => nil,
           :ebs_optimized => nil,
           :image_id => nil,
@@ -297,7 +205,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
       it "adds a network_interfaces block" do
         expect(generator.ec2_instance_data).to eq(
-          :placement => { :availability_zone => nil },
           :instance_type => nil,
           :ebs_optimized => nil,
           :image_id => nil,
@@ -322,7 +229,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
         it "adds a network_interfaces block" do
           expect(generator.ec2_instance_data).to eq(
-            :placement => { :availability_zone => nil },
             :instance_type => nil,
             :ebs_optimized => nil,
             :image_id => nil,
@@ -348,7 +254,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
         it "adds a network_interfaces block" do
           expect(generator.ec2_instance_data).to eq(
-            :placement => { :availability_zone => nil },
             :instance_type => nil,
             :ebs_optimized => nil,
             :image_id => nil,
@@ -388,7 +293,6 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
         it "adds a network_interfaces block" do
           expect(generator.ec2_instance_data).to eq(
-            :placement => { :availability_zone => nil },
             :instance_type => nil,
             :ebs_optimized => nil,
             :image_id => nil,
@@ -417,12 +321,14 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :private_ip_address           => "0.0.0.0",
           :block_device_mappings => [
             {
-              :ebs_volume_size => 15,
-              :ebs_delete_on_termination => false,
-              :ebs_device_name => "/dev/sda2",
-              :ebs_volume_type => "gp2",
-              :ebs_snapshot_id => "id",
-              :ebs_virtual_name => "test"
+              :device_name => "/dev/sda2",
+              :virtual_name => "test",
+              :ebs => {
+                :volume_size => 15,
+                :delete_on_termination => false,
+                :volume_type => "gp2",
+                :snapshot_id => "id"
+              }
             }
           ],
           :security_group_ids => ["sg-789"],
@@ -434,21 +340,20 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
 
       it "returns the maximum data" do
         expect(generator.ec2_instance_data).to eq(
-          :placement => { :availability_zone => "eu-west-1a" },
           :instance_type => "micro",
           :ebs_optimized => true,
           :image_id => "ami-123",
           :key_name => "key",
           :block_device_mappings => [
             {
+              :device_name => "/dev/sda2",
+              :virtual_name => "test",
               :ebs => {
                 :volume_size => 15,
                 :delete_on_termination => false,
                 :volume_type => "gp2",
                 :snapshot_id => "id"
-              },
-              :device_name => "/dev/sda2",
-              :virtual_name => "test"
+              }
             }
           ],
           :iam_instance_profile => { :name => "iam-123" },
@@ -460,6 +365,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
             :groups => ["sg-789"],
             :private_ip_address =>  "0.0.0.0"
           }],
+          :placement => { :availability_zone => "eu-west-1a" },
           :user_data => Base64.encode64("foo")
         )
       end