Adding support for tenancy parameter in placement config.

lib/kitchen/driver/aws/instance_generator.rb

@@ -56,6 +56,14 @@ def ec2_instance_data # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
             end
             i[:placement] = { :availability_zone => availability_zone.downcase }
           end
+          tenancy = config[:tenancy]
+          if tenancy && %w[default dedicated].include?(tenancy)
+            if i.key?(:placement)
+              i[:placement][:tenancy] = tenancy
+            else
+              i[:placement] = { :tenancy => tenancy }
+            end
+          end
           unless config[:block_device_mappings].nil? || config[:block_device_mappings].empty?
             i[:block_device_mappings] = config[:block_device_mappings]
           end

lib/kitchen/driver/ec2.rb

@@ -79,6 +79,7 @@ class Ec2 < Kitchen::Driver::Base # rubocop:disable Metrics/ClassLength
       default_config :interface,           nil
       default_config :http_proxy,          ENV["HTTPS_PROXY"] || ENV["HTTP_PROXY"]
       default_config :retry_limit,         3
+      default_config :tenancy,             "dedicated"
 
       required_config :aws_ssh_key_id
 

spec/kitchen/driver/ec2/instance_generator_spec.rb

@@ -177,6 +177,67 @@
       end
     end
 
+    context "when availability_zone and tenancy are provided" do
+      let(:config) do
+        {
+          :region => "eu-east-1",
+          :availability_zone => "c",
+          :tenancy => "dedicated"
+        }
+      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",
+                          :tenancy => "dedicated" }
+        )
+      end
+    end
+
+    context "when tenancy is provided but availability_zone isn't" do
+      let(:config) do
+        {
+          :region => "eu-east-1",
+          :tenancy => "default"
+        }
+      end
+      it "is not added to 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 => { :tenancy => "default" }
+        )
+      end
+    end
+
+    context "when tenancy is not supported" do
+      let(:config) do
+        {
+          :region => "eu-east-1",
+          :tenancy => "ephemeral"
+        }
+      end
+      it "is not added to 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
+        )
+      end
+    end
+
     context "when subnet_id is provided" do
       let(:config) do
         {