puppet-resource_api 1.8.10 → 1.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c38c650148fd1697a642774a4b470e208f1f45c3e47dc75c1d93795be7bb38
-  data.tar.gz: 884337cc89bd510169e9822982fbed68866dff0d9f30c027b3ebfca600670ce1
+  metadata.gz: a97a74d2743c8dd71ef34a5ad182d3946464b0ee9ab3b0dc9fb9d084b1c0dbb2
+  data.tar.gz: 4440e7664869083fb353cb7ffd32e60e948ba99dee07fab5fb19ea58ded52bb6
 SHA512:
-  metadata.gz: 721c4d232ba09cef37c387bfec47d557de2873f858bbf7a3e72a9b7f66ef993e0298eb954cdd1864ad4d5091b9aa2fe83480f51a5324255861cd7fa2df80a6c2
-  data.tar.gz: af6b72118cc710bac4eec4b4fbae849f5620f1fc29b949afb0dd2baca5ebc2237b55ccf76c696ab6a5be8e534f7d3fbaead41829e256926a07791fc6a064c8e3
+  metadata.gz: b491366c3ee28299ee4c56745f8606d3f257e4f814367a97694f9b363b68f6f9bb4de02d9f743eb3272a7a432b47175c1fa10804fc6d55df001480ce10289768
+  data.tar.gz: 0e426a40343d84d3a9cca300b9f7fe45aa0ad35925c2b9c3b39facb07d7152b352e60a9e5fa7b91a98c4637ab2bb4264c7a12a1ccc309bb4d930928c9e9ff3b6

data/Gemfile

@@ -15,6 +15,8 @@ group :tests do
     # load a rubocop version that works on java for the Rakefile
     gem 'parser', '2.3.3.1'
     gem 'rubocop', '0.41.2'
+    # JRuby 1.7 does not like json 2.3.0, jruby 9.1.9.0 has RUBY_VERSION == '2.3.3'
+    gem 'json', '2.2.0' if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('2.3.0')
   elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.0')
     gem 'rubocop', '0.57.2'
     # the last version of parallel to support ruby 2.1

data/lib/puppet/resource_api.rb

@@ -35,7 +35,8 @@ module Puppet::ResourceApi
     end
 
     Puppet::Type.newtype(definition[:name].to_sym) do
-      @docs = definition[:desc]
+      # The :desc value is already cleaned up by the TypeDefinition validation
+      @doc = definition[:desc]
       @type_definition = type_def
 
       # Keeps a copy of the provider around. Weird naming to avoid clashes with puppet's own `provider` member
@@ -260,7 +261,7 @@ module Puppet::ResourceApi
 
         if @rsapi_current_state
           type_definition.check_schema(@rsapi_current_state)
-          strict_check(@rsapi_current_state) if type_definition.feature?('canonicalize')
+          strict_check(@rsapi_current_state)
         else
           @rsapi_current_state = if rsapi_title.is_a? Hash
                                    rsapi_title.dup
@@ -274,7 +275,7 @@ module Puppet::ResourceApi
       # Use this to set the current state from the `instances` method
       def cache_current_state(resource_hash)
         @rsapi_current_state = resource_hash
-        strict_check(@rsapi_current_state) if type_definition.feature?('canonicalize')
+        strict_check(@rsapi_current_state)
       end
 
       def retrieve
@@ -353,6 +354,22 @@ module Puppet::ResourceApi
       def strict_check(current_state)
         return if Puppet.settings[:strict] == :off
 
+        strict_check_canonicalize(current_state) if type_definition.feature?('canonicalize')
+        strict_check_title_parameter(current_state) if type_definition.namevars.size > 1 && !type_definition.title_patterns.empty?
+
+        nil
+      end
+
+      def strict_message(message)
+        case Puppet.settings[:strict]
+        when :warning
+          Puppet.warning(message)
+        when :error
+          raise Puppet::DevError, message
+        end
+      end
+
+      def strict_check_canonicalize(current_state)
         # if strict checking is on we must notify if the values are changed by canonicalize
         # make a deep copy to perform the operation on and to compare against later
         state_clone = Marshal.load(Marshal.dump(current_state))
@@ -369,15 +386,43 @@ Returned values:       #{current_state.inspect}
 Canonicalized values:  #{state_clone.inspect}
 MESSAGE
         #:nocov:
+        strict_message(message)
+      end
 
-        case Puppet.settings[:strict]
-        when :warning
-          Puppet.warning(message)
-        when :error
-          raise Puppet::DevError, message
+      def strict_check_title_parameter(current_state)
+        unless current_state.key?(:title)
+          strict_message("#{type_definition.name}[#{@title}]#get has not provided a title attribute.")
+          return
         end
 
-        nil
+        # Logic borrowed from Puppet::Resource.parse_title
+        title_hash = {}
+        self.class.title_patterns.each do |regexp, symbols|
+          captures = regexp.match(current_state[:title])
+          next if captures.nil?
+          symbols.zip(captures[1..-1]).each do |symbol_and_lambda, capture|
+            # The Resource API does not support passing procs in title_patterns
+            # so, unlike Puppet::Resource, we do not need to handle that here.
+            symbol = symbol_and_lambda[0]
+            title_hash[symbol] = capture
+          end
+          break
+        end
+
+        return if title_hash == rsapi_title
+
+        namevars = type_definition.namevars.reject { |namevar| title_hash[namevar] == rsapi_title[namevar] }
+
+        #:nocov:
+        # codecov fails to register this multiline as covered, even though simplecov does.
+        message = <<MESSAGE.strip
+#{type_definition.name}[#{@title}]#get has provided a title attribute which does not match all namevars.
+Namevars which do not match: #{namevars.inspect}
+Returned parsed title hash:  #{title_hash.inspect}
+Expected hash:               #{rsapi_title.inspect}
+MESSAGE
+        #:nocov:
+        strict_message(message)
       end
 
       define_singleton_method(:context) do

data/lib/puppet/resource_api/type_definition.rb

@@ -18,6 +18,10 @@ module Puppet::ResourceApi
       (definition[:features] && definition[:features].include?(feature))
     end
 
+    def title_patterns
+      definition[:title_patterns] ||= []
+    end
+
     def validate_schema(definition, attr_key)
       super(definition, attr_key)
       [:title, :provider, :alias, :audit, :before, :consume, :export, :loglevel, :noop, :notify, :require, :schedule, :stage, :subscribe, :tag].each do |name|

data/lib/puppet/resource_api/version.rb

@@ -1,5 +1,5 @@
 module Puppet
   module ResourceApi
-    VERSION = '1.8.10'.freeze
+    VERSION = '1.8.11'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-resource_api
 version: !ruby/object:Gem::Version
-  version: 1.8.10
+  version: 1.8.11
 platform: ruby
 authors:
 - David Schmitt