lib/kitchen/driver/ec2.rb in kitchen-ec2-1.3.1 vs lib/kitchen/driver/ec2.rb in kitchen-ec2-1.3.2

@@ -381,25 +381,25 @@
         response = ec2.client.request_spot_instances(request_data)
         response[:spot_instance_requests][0][:spot_instance_request_id]
       end
 
       def tag_server(server)
-        if config[:tags]
-          tags = []
-          config[:tags].each do |k, v|
-            tags << { :key => k, :value => v }
+        if config[:tags] && !config[:tags].empty?
+          tags = config[:tags].map do |k, v|
+            { :key => k, :value => v }
           end
           server.create_tags(:tags => tags)
         end
       end
 
       def tag_volumes(server)
-        tags = []
-        config[:tags].each do |k, v|
-          tags << { :key => k, :value => v }
-        end
-        server.volumes.each do |volume|
-          volume.create_tags(:tags => tags)
+        if config[:tags] && !config[:tags].empty?
+          tags = config[:tags].map do |k, v|
+            { :key => k, :value => v }
+          end
+          server.volumes.each do |volume|
+            volume.create_tags(:tags => tags)
+          end
         end
       end
 
       # Compares the requested volume count vs what has actually been set to be
       # attached to the instance. The information requested through