chef-provisioning-aws 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c249f182469f97f148ae38d524c4d968cdd8f1e3
-  data.tar.gz: da61c4cfe294ca2f50605e63ff77042feffb1b74
+  metadata.gz: 09d8cd1f113c14f6f206a03b49d89cae4d9294a6
+  data.tar.gz: 0fbe0de96accf8f7cc030920f108f1a68df09ece
 SHA512:
-  metadata.gz: 0cce99948b3f6f240fddae731ce3de418c9a239761a8a18776629e27e0b8c82843b202d4b91061d4cd002344c03e14ad36e02f6eecd4437fbbadd0347558affb
-  data.tar.gz: 28e75762b4b912ff030150ea2c9ca09290286b9eda36d6efbe0ed5e15b93f31ba16ffec6657220eabf0fbd85452a2ea9e8439cfd3f78082c10f7c1b6a2c230e6
+  metadata.gz: b5d93a2add78c31d46ced5badef87b3ead4da4fb203b2b00352f15e569e309afc1d2ccc87a2bf2c2f2468f5e02de64908144d0f577a983e7462b17170f2eae51
+  data.tar.gz: 37d9e8b8c2461bcf26a8488127a3ab241c0e731bc7ad3e3dd98f4e892906d8bb8d8b94dc2d9a07da9bdca2841c2f642f65bbb319a64a15c1283bb2aa7f084f64

data/lib/chef/provisioning/aws_driver/aws_provider.rb

@@ -235,6 +235,7 @@ class AWSProvider < Chef::Provider::LWRPBase
   # @param aws_object Aws SDK Object to update tags
   #
   def converge_tags(aws_object)
+    return unless new_resource.respond_to?(:aws_tags)
     desired_tags = new_resource.aws_tags
     # If aws_tags were not provided we exit
     if desired_tags.nil?

data/lib/chef/provisioning/aws_driver/driver.rb

@@ -437,11 +437,9 @@ EOD
           Chef::Log.debug "Creating instance with bootstrap options #{bootstrap_options}"
 
           actual_instance = ec2.instances.create(bootstrap_options.to_hash)
-
           # Make sure the instance is ready to be tagged
-          Retryable.retryable(:tries => 12, :sleep => 5, :on => [AWS::EC2::Errors::InvalidInstanceID::NotFound, TimeoutError]) do
-            raise TimeoutError unless actual_instance.status == :pending || actual_instance.status == :running
-          end
+          wait_until_taggable(actual_instance)
+
           # TODO add other tags identifying user / node url (same as fog)
           actual_instance.tags['Name'] = machine_spec.name
           actual_instance.source_dest_check = machine_options[:source_dest_check] if machine_options.has_key?(:source_dest_check)
@@ -1005,6 +1003,7 @@ EOD
       parallelizer.parallelize(1.upto(num_servers)) do |i|
         clean_bootstrap_options = Marshal.load(Marshal.dump(bootstrap_options))
         instance = ec2.instances.create(clean_bootstrap_options.to_hash)
+        wait_until_taggable(instance)
 
         yield instance if block_given?
         instance
@@ -1048,6 +1047,12 @@ EOD
       end
     end
 
+    def wait_until_taggable(instance)
+      Retryable.retryable(:tries => 12, :sleep => 5, :on => [AWS::EC2::Errors::InvalidInstanceID::NotFound, TimeoutError]) do
+        raise TimeoutError unless instance.status == :pending || instance.status == :running
+      end
+    end
+
     def get_listeners(listeners)
       case listeners
       when Hash

data/lib/chef/provisioning/aws_driver/version.rb

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
 end
 end

data/spec/integration/aws_tagged_items_spec.rb

@@ -155,6 +155,12 @@ describe "AWS Tagged Items" do
         ).and be_idempotent
       end
 
+      it "does not error when a class does not define #aws_tags" do
+        expect_recipe {
+          aws_eip_address 'test_address'
+        }.to create_an_aws_eip_address('test_address')
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - John Ewart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef