Implementation of Atomic tagging

.travis.yml

@@ -3,7 +3,7 @@ cache: bundler
 sudo: false
 branches:
   only:
-  - master
+  - atomic-tags
 rvm:
   - 2.3.7
   - 2.4.4

README.md

@@ -252,6 +252,8 @@ The Hash of EC tag name/value pairs which will be applied to the instance.
 
 The default is `{ "created-by" => "test-kitchen" }`.
 
+Tags are applied post creation, if tags should be added during instance creation then set `create_instance_with_tags` to `true`
+
 #### `user_data`
 
 The user_data script or the path to a script to feed the instance.

kitchen-ec2.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "test-kitchen", "~> 1.4", ">= 1.4.1"
   gem.add_dependency "excon"
   gem.add_dependency "multi_json"
-  gem.add_dependency "aws-sdk", "~> 2"
+  gem.add_dependency "aws-sdk", "~> 3"
   gem.add_dependency "retryable", "~> 2.0"
 
   gem.add_development_dependency "rspec",     "~> 3.2"

lib/kitchen/driver/ec2.rb

@@ -419,6 +419,17 @@ def submit_server
         end
         instance_data[:min_count] = 1
         instance_data[:max_count] = 1
+        if config[:create_instance_with_tags] && config[:tags] && !config[:tags].empty?
+          tags = config[:tags].map do |k, v|
+            # we convert the value to a string because
+            # nils should be passed as an empty String
+            # and Integers need to be represented as Strings
+            { :key => k, :value => v.to_s }
+          end
+          instance_tag_spec = { :resource_type => "instance", :tags => tags }
+          volume_tag_spec = { :resource_type => "volume", :tags => tags }
+          instance_data[:tag_specifications] = [instance_tag_spec, volume_tag_spec]
+        end
         ec2.create_instance(instance_data)
       end
 

spec/kitchen/driver/ec2_spec.rb

@@ -521,6 +521,19 @@
     end
   end
 
+  describe "#create_instance_with_tags" do
+    before do
+      config[:create_instance_with_tags] = true
+      expect(driver).to receive(:instance).at_least(:once).and_return(instance)
+    end
+
+    it "submits the server request" do
+      expect(generator).to receive(:ec2_instance_data).and_return({})
+      expect(client).to receive(:create_instance).with(:min_count => 1, :max_count => 1, :tag_specifications => anything)
+      driver.submit_server
+    end
+  end
+
   describe "#create" do
     let(:server) { double("aws server object", :id => id, :image_id => "ami-3f807145") }
     let(:id) { "i-12345" }