chef-provisioning-aws 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60ebd61ee3e107a614c90db71adbdfcf2f10af7f
-  data.tar.gz: f95d73cf8361f9e5e9b6d235f82f84bffaa7b65f
+  metadata.gz: dd5c21364731d0404bcc87495c3a1e7fddc9b107
+  data.tar.gz: b0f57238cd577c5be3b7ee652079d1185a3fef8f
 SHA512:
-  metadata.gz: 9a421dd9254887af2fd4d1d07c8bd00d6f638da36b36e8ddea987eae6cbd465b8d265490856cb1a46800d2a67749285cc33619d950b09959d35507e9a16d8038
-  data.tar.gz: af3179a1ff3b3ab61e7c7a331119ad0f56423893d40e294c7e364228dfe89a89ffe5e84139107455a1479c48e6d5cd03d7462f32306f72190a705c8aa36c98cc
+  metadata.gz: 9676f4c941de6c694f9df2d58d04b0fd03a5958a23c10cacae91a50c4bfe52d1aadf249e36346ab2c003f4931d127d599a744ba9740505ee2d3c457f08ba6d79
+  data.tar.gz: c84c5149b0127cfabed5ad71f967a48cc0dce1cf05ebc80b8b90e3433b1ac485f5ff2a42459d4167aa1e954112617cf8cf8d4f295c6623b547ef97f8c60c85f3

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

@@ -1,45 +1,64 @@
 require 'chef/resource/lwrp_base'
 
 class Chef
-  module Provisioning
-    module AWSDriver
-      class SuperLWRP < Chef::Resource::LWRPBase
-        #
-        # Add the :lazy_default and :coerce validation_opts to `attribute`
-        #
-        def self.attribute(attr_name, validation_opts={})
-          lazy_default = validation_opts.delete(:lazy_default)
-          coerce = validation_opts.delete(:coerce)
-          if lazy_default || coerce
-            define_method(attr_name) do |arg=nil|
-              arg = instance_exec(arg, &coerce) if coerce && !arg.nil?
+module Provisioning
+module AWSDriver
+  class SuperLWRP < Chef::Resource::LWRPBase
+    #
+    # Add the :lazy_default and :coerce validation_opts to `attribute`
+    #
+    def self.attribute(attr_name, validation_opts={})
+      lazy_default = validation_opts.delete(:lazy_default)
+      coerce = validation_opts.delete(:coerce)
+      if lazy_default || coerce
+        define_method(attr_name) do |arg=nil|
+          arg = instance_exec(arg, &coerce) if coerce && !arg.nil?
 
-              result = set_or_return(attr_name.to_sym, arg, validation_opts)
+          result = set_or_return(attr_name.to_sym, arg, validation_opts)
 
-              if result.nil? && arg.nil?
-                result = instance_eval(&lazy_default) if lazy_default
-              end
+          if result.nil? && arg.nil?
+            result = instance_eval(&lazy_default) if lazy_default
+          end
 
-              result
-            end
-            define_method(:"#{attr_name}=") do |arg|
-              if arg.nil?
-                remove_instance_variable(:"@#{arg}")
-              else
-                set_or_return(attr_name.to_sym, arg, validation_opts)
-              end
-            end
+          result
+        end
+        define_method(:"#{attr_name}=") do |arg|
+          if arg.nil?
+            remove_instance_variable(:"@#{arg}")
           else
-            super
+            set_or_return(attr_name.to_sym, arg, validation_opts)
           end
         end
+      else
+        super
+      end
+    end
 
-        # FUUUUUU cloning
-        def load_prior_resource(*args)
-          Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
-        end
+    # FUUUUUU cloning - this works for Chef 11 or 12.1
+    def load_prior_resource(*args)
+      Chef::Log.debug "Overloading #{self.resource_name} load_prior_resource with NOOP"
+    end
+  end
+end
+end
+end
 
-      end
+module NoResourceCloning
+  def prior_resource
+    if resource_class.kind_of?(Chef::Provisioning::AWSDriver::SuperLWRP)
+      Chef::Log.debug "Canceling resource cloning for #{resource_class}"
+      nil
+    else
+      super
     end
   end
+  def emit_cloned_resource_warning; end
+  def emit_harmless_cloning_debug; end
+end
+
+# Chef 12.2 changed `load_prior_resource` logic to be in the Chef::ResourceBuilder class
+# but that class only exists in 12.2 and up
+if defined? Chef::ResourceBuilder
+  # Ruby 2.0.0 has prepend as a protected method
+  Chef::ResourceBuilder.send(:prepend, NoResourceCloning)
 end

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

@@ -1,7 +1,7 @@
 class Chef
 module Provisioning
 module AWSDriver
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-aws
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - John Ewart
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: