kitchen-ec2 1.3.2 → 1.4.0

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

@@ -27,7 +27,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
   let(:config) { Hash.new }
   let(:resource) { instance_double(Aws::EC2::Resource) }
   let(:ec2) { instance_double(Kitchen::Driver::Aws::Client, :resource => resource) }
-  let(:logger)        { instance_double(Logger) }
+  let(:logger) { instance_double(Logger) }
   let(:generator) { Kitchen::Driver::Aws::InstanceGenerator.new(config, ec2, logger) }
 
   describe "#prepared_user_data" do
@@ -57,6 +57,14 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         expect(decoded).to eq("foo\nbar")
       end
     end
+
+    context "when config[:user_data] is binary" do
+      let(:config) { { :user_data => "foo\0bar" } }
+
+      it "handles nulls in user_data" do
+        expect(Base64.decode64(generator.prepared_user_data)).to eq "foo\0bar"
+      end
+    end
   end
 
   describe "#ec2_instance_data" do
@@ -67,8 +75,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       :subnets => [
         {
           :subnet_id  => "s-123",
-          :tags       => [{ :key => "foo", :value => "bar" }]
-        }
+          :tags       => [{ :key => "foo", :value => "bar" }],
+        },
       ]
     )
 
@@ -77,8 +85,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       :security_groups => [
         {
           :group_id => "sg-123",
-          :tags => [{ :key => "foo", :value => "bar" }]
-        }
+          :tags => [{ :key => "foo", :value => "bar" }],
+        },
       ]
     )
 
@@ -100,7 +108,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :ebs_optimized                => true,
           :image_id                     => "ami-123",
           :subnet_id                    => "s-456",
-          :private_ip_address           => "0.0.0.0"
+          :private_ip_address           => "0.0.0.0",
         }
       end
 
@@ -124,7 +132,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :image_id                     => "ami-123",
           :aws_ssh_key_id               => "key",
           :subnet_id                    => "s-456",
-          :private_ip_address           => "0.0.0.0"
+          :private_ip_address           => "0.0.0.0",
         }
       end
 
@@ -152,8 +160,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :subnet_filter =>
             {
               :tag   => "foo",
-              :value => "bar"
-            }
+              :value => "bar",
+            },
         }
       end
 
@@ -163,8 +171,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :filters => [
             {
               :name => "tag:foo",
-              :values => ["bar"]
-            }
+              :values => ["bar"],
+            },
           ]
         ).and_return(ec2_stub.describe_subnets)
         expect(generator.ec2_instance_data[:subnet_id]).to eq("s-123")
@@ -184,8 +192,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :security_group_filter =>
             {
               :tag   => "foo",
-              :value => "bar"
-            }
+              :value => "bar",
+            },
         }
       end
 
@@ -195,8 +203,8 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :filters => [
             {
               :name => "tag:foo",
-              :values => ["bar"]
-            }
+              :values => ["bar"],
+            },
           ]
         ).and_return(ec2_stub.describe_security_groups)
         expect(generator.ec2_instance_data[:security_group_ids]).to eq(["sg-123"])
@@ -212,7 +220,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :aws_ssh_key_id               => "key",
           :subnet_id                    => "s-456",
           :private_ip_address           => "0.0.0.0",
-          :block_device_mappings        => []
+          :block_device_mappings        => [],
         }
       end
 
@@ -232,7 +240,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :availability_zone => "eu-west-1c"
+          :availability_zone => "eu-west-1c",
         }
       end
       it "returns that in the instance data" do
@@ -252,7 +260,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :availability_zone => "c"
+          :availability_zone => "c",
         }
       end
       it "adds the region to it in the instance data" do
@@ -271,7 +279,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
     context "when availability_zone is not provided" do
       let(:config) do
         {
-          :region => "eu-east-1"
+          :region => "eu-east-1",
         }
       end
       it "is not added to the instance data" do
@@ -291,7 +299,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         {
           :region => "eu-east-1",
           :availability_zone => "c",
-          :tenancy => "dedicated"
+          :tenancy => "dedicated",
         }
       end
       it "adds the region to it in the instance data" do
@@ -312,7 +320,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :tenancy => "default"
+          :tenancy => "default",
         }
       end
       it "is not added to the instance data" do
@@ -332,7 +340,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :tenancy => "ephemeral"
+          :tenancy => "ephemeral",
         }
       end
       it "is not added to the instance data" do
@@ -352,7 +360,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         {
           :region => "eu-east-1",
           :availability_zone => "c",
-          :tenancy => "dedicated"
+          :tenancy => "dedicated",
         }
       end
       it "adds the region to it in the instance data" do
@@ -373,7 +381,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :tenancy => "default"
+          :tenancy => "default",
         }
       end
       it "is not added to the instance data" do
@@ -393,7 +401,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
       let(:config) do
         {
           :region => "eu-east-1",
-          :tenancy => "ephemeral"
+          :tenancy => "ephemeral",
         }
       end
       it "is not added to the instance data" do
@@ -411,7 +419,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
     context "when subnet_id is provided" do
       let(:config) do
         {
-          :subnet_id => "s-456"
+          :subnet_id => "s-456",
         }
       end
 
@@ -430,7 +438,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
     context "when associate_public_ip is provided" do
       let(:config) do
         {
-          :associate_public_ip => true
+          :associate_public_ip => true,
         }
       end
 
@@ -445,7 +453,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
           :network_interfaces => [{
             :device_index => 0,
             :associate_public_ip_address => true,
-            :delete_on_termination => true
+            :delete_on_termination => true,
           }]
         )
       end
@@ -454,7 +462,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         let(:config) do
           {
             :associate_public_ip => true,
-            :subnet_id => "s-456"
+            :subnet_id => "s-456",
           }
         end
 
@@ -469,7 +477,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
               :device_index => 0,
               :associate_public_ip_address => true,
               :delete_on_termination => true,
-              :subnet_id => "s-456"
+              :subnet_id => "s-456",
             }]
           )
         end
@@ -479,7 +487,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         let(:config) do
           {
             :associate_public_ip => true,
-            :security_group_ids => ["sg-789"]
+            :security_group_ids => ["sg-789"],
           }
         end
 
@@ -495,7 +503,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
               :device_index => 0,
               :associate_public_ip_address => true,
               :delete_on_termination => true,
-              :groups => ["sg-789"]
+              :groups => ["sg-789"],
             }]
           )
         end
@@ -508,7 +516,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
               :device_index => 0,
               :associate_public_ip_address => true,
               :delete_on_termination => true,
-              :groups => ["only-one"]
+              :groups => ["only-one"],
             }]
           )
         end
@@ -518,7 +526,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
         let(:config) do
           {
             :associate_public_ip => true,
-            :private_ip_address => "0.0.0.0"
+            :private_ip_address => "0.0.0.0",
           }
         end
 
@@ -533,7 +541,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
               :device_index => 0,
               :associate_public_ip_address => true,
               :delete_on_termination => true,
-              :private_ip_address => "0.0.0.0"
+              :private_ip_address => "0.0.0.0",
             }]
           )
         end
@@ -558,14 +566,14 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
                 :volume_size => 15,
                 :delete_on_termination => false,
                 :volume_type => "gp2",
-                :snapshot_id => "id"
-              }
-            }
+                :snapshot_id => "id",
+              },
+            },
           ],
           :security_group_ids => ["sg-789"],
           :user_data => "foo",
           :iam_profile_name => "iam-123",
-          :associate_public_ip => true
+          :associate_public_ip => true,
         }
       end
 
@@ -583,9 +591,9 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
                 :volume_size => 15,
                 :delete_on_termination => false,
                 :volume_type => "gp2",
-                :snapshot_id => "id"
-              }
-            }
+                :snapshot_id => "id",
+              },
+            },
           ],
           :iam_instance_profile => { :name => "iam-123" },
           :network_interfaces => [{
@@ -594,7 +602,7 @@ describe Kitchen::Driver::Aws::InstanceGenerator do
             :subnet_id => "s-456",
             :delete_on_termination => true,
             :groups => ["sg-789"],
-            :private_ip_address =>  "0.0.0.0"
+            :private_ip_address =>  "0.0.0.0",
           }],
           :placement => { :availability_zone => "eu-west-1a" },
           :user_data => Base64.encode64("foo")

data/spec/kitchen/driver/ec2_spec.rb

@@ -29,7 +29,7 @@ describe Kitchen::Driver::Ec2 do
     {
       :aws_ssh_key_id => "key",
       :image_id => "ami-1234567",
-      :block_duration_minutes => 60
+      :block_duration_minutes => 60,
     }
   end
   let(:platform)      { Kitchen::Platform.new(:name => "fooos-99") }
@@ -79,18 +79,18 @@ describe Kitchen::Driver::Ec2 do
         allow(instance).to receive(:name).and_return("instance_name")
       end
       context "Windows 2016" do
-        let(:image) {
+        let(:image) do
           FakeImage.new(:name => "Windows_Server-2016-English-Full-Base-2017.01.11")
-        }
+        end
         it "sets :user_data to something" do
           expect(driver[:user_data]).to include
           '$logfile=C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Log\\kitchen-ec2.log'
         end
       end
       context "Windows 2012R2" do
-        let(:image) {
+        let(:image) do
           FakeImage.new(:name => "Windows_Server-2012-R2_RTM-English-64Bit-Base-2017.01.11")
-        }
+        end
         it "sets :user_data to something" do
           expect(driver[:user_data]).to include
           '$logfile=C:\\Program Files\\Amazon\\Ec2ConfigService\\Logs\\kitchen-ec2.log'
@@ -104,14 +104,14 @@ describe Kitchen::Driver::Ec2 do
     let(:private_dns_name) { nil }
     let(:public_ip_address) { nil }
     let(:private_ip_address) { nil }
-    let(:server) {
+    let(:server) do
       double("server",
         :public_dns_name => public_dns_name,
         :private_dns_name => private_dns_name,
         :public_ip_address => public_ip_address,
         :private_ip_address => private_ip_address
       )
-    }
+    end
 
     it "returns nil if all sources are nil" do
       expect(driver.hostname(server)).to eq(nil)
@@ -235,9 +235,9 @@ describe Kitchen::Driver::Ec2 do
 
   describe "#submit_spot" do
     let(:state) { {} }
-    let(:response) {
+    let(:response) do
       { :spot_instance_requests => [{ :spot_instance_request_id => "id" }] }
-    }
+    end
 
     before do
       expect(driver).to receive(:instance).at_least(:once).and_return(instance)
@@ -265,7 +265,7 @@ describe Kitchen::Driver::Ec2 do
       expect(server).to receive(:create_tags).with(
         :tags => [
           { :key => :key1, :value => :value1 },
-          { :key => :key2, :value => :value2 }
+          { :key => :key2, :value => :value2 },
         ]
       )
       driver.tag_server(server)
@@ -286,7 +286,7 @@ describe Kitchen::Driver::Ec2 do
       expect(volume).to receive(:create_tags).with(
         :tags => [
           { :key => :key1, :value => :value1 },
-          { :key => :key2, :value => :value2 }
+          { :key => :key2, :value => :value2 },
         ]
       )
       driver.tag_volumes(server)
@@ -407,7 +407,7 @@ describe Kitchen::Driver::Ec2 do
     let(:tries) { 111 }
     let(:sleep) { 222 }
     let(:msg) { "msg" }
-    given_block = lambda do; end
+    given_block = lambda { ; }
 
     before do
       config[:retryable_sleep] = sleep
@@ -429,14 +429,14 @@ describe Kitchen::Driver::Ec2 do
       expect(server).to receive(:wait_until).and_raise(::Aws::Waiters::Errors::WaiterFailed)
       expect(driver).to receive(:destroy).with(state)
       expect(driver).to receive(:error).with(/#{msg}/)
-      expect {
+      expect do
         driver.wait_with_destroy(server, state, msg, &given_block)
-      }.to raise_error(::Aws::Waiters::Errors::WaiterFailed)
+      end.to raise_error(::Aws::Waiters::Errors::WaiterFailed)
     end
   end
 
   describe "#create" do
-    let(:server) { double("aws server object", :id => id) }
+    let(:server) { double("aws server object", :id => id, :image_id => "ami-3f807145") }
     let(:id) { "i-12345" }
 
     it "returns if the instance is already created" do
@@ -444,6 +444,10 @@ describe Kitchen::Driver::Ec2 do
       expect(driver.create(state)).to eq(nil)
     end
 
+    image_data = Aws::EC2::Types::Image.new(:root_device_type => "ebs")
+    ec2_stub = Aws::EC2::Types::DescribeImagesResult.new
+    ec2_stub.images = [image_data]
+
     shared_examples "common create" do
       it "successfully creates and tags the instance" do
         expect(server).to receive(:wait_until_exists)
@@ -452,6 +456,7 @@ describe Kitchen::Driver::Ec2 do
         expect(driver).to receive(:tag_volumes).with(server)
         expect(driver).to receive(:wait_until_volumes_ready).with(server, state)
         expect(driver).to receive(:wait_until_ready).with(server, state)
+        allow(actual_client).to receive(:describe_images).with({ :image_ids => [server.image_id] }).and_return(ec2_stub)
         expect(transport).to receive_message_chain("connection.wait_until_ready")
         expect(driver).to receive(:create_ec2_json).with(state)
         driver.create(state)
@@ -459,7 +464,7 @@ describe Kitchen::Driver::Ec2 do
       end
     end
 
-    context "non-windows on-depand instance" do
+    context "non-windows on-demand instance" do
       before do
         expect(driver).to receive(:submit_server).and_return(server)
       end
@@ -476,6 +481,21 @@ describe Kitchen::Driver::Ec2 do
       include_examples "common create"
     end
 
+    context "instance is not ebs-backed" do
+      before do
+        ec2_stub.images[0].root_device_type = "instance-store"
+      end
+
+      it "does not tag volumes or wait for volumes to be ready" do
+        expect(driver).to_not receive(:tag_volumes).with(server)
+        expect(driver).to_not receive(:wait_until_volumes_ready).with(server, state)
+      end
+
+      after do
+        ec2_stub.images[0].root_device_type = "ebs"
+      end
+    end
+
     context "instance is a windows machine" do
       before do
         expect(driver).to receive(:windows_os?).and_return(true)