puppet-resource_api 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d14e2bf3972db6032efa89ba6051d141c97f0e68a8977f6f667650051a06bdf4
-  data.tar.gz: 4a1609c8cf63542580ad8145ccaa971991b354266496b8f1067a91bf141b66af
+  metadata.gz: d66c960b7ed4b6ed6123bdf2c8cc158320354f32fb15499b09b92a8a3942d36d
+  data.tar.gz: 1ba82297b72a4df466c2084feaeb02ed6e883b19d3ee6c913581b5edecd2ca69
 SHA512:
-  metadata.gz: 88e11a56b4494310be4e5912f9e48f0cb845bcc693f8e16888704db464e3e989c051afe2aece82ec393b3b1237eed002606a8c1600f396b42a54294669e14447
-  data.tar.gz: cf6597f4ef293e46ae1791b693a344dc7e7624cec153a86983c6199db311280a706a5b3efae2aa30739e2631e107ff44d3ba493ca6226f24246ae1e1f7a086b8
+  metadata.gz: b22b37590ff1ac73fdf22d5d0012cd8ac6b46a0e2541ba4b3096a6ede49c12bdaa37e895746194cc1257744dec6403f6428610f5e4b29742fe624f3c505ff211
+  data.tar.gz: 2f44e9690a905edd1eafaad645f62c82bfe035c7f4f9ace31620b47d56d2eb963cf117edb4652f8b3c0feecea98e8f7cf13ae90993c1d7b291d8343b32741924

data/lib/puppet/resource_api/transport.rb

@@ -8,6 +8,11 @@ module Puppet::ResourceApi::Transport
     raise Puppet::DevError, 'requires `:desc`' unless schema.key? :desc
     raise Puppet::DevError, 'requires `:connection_info`' unless schema.key? :connection_info
     raise Puppet::DevError, '`:connection_info` must be a hash, not `%{other_type}`' % { other_type: schema[:connection_info].class } unless schema[:connection_info].is_a?(Hash)
+    if schema[:connection_info_order].nil?
+      schema[:connection_info_order] = schema[:connection_info].keys
+    else
+      raise Puppet::DevError, '`:connection_info_order` must be an array, not `%{other_type}`' % { other_type: schema[:connection_info_order].class } unless schema[:connection_info_order].is_a?(Array)
+    end
 
     unless transports[schema[:name]].nil?
       raise Puppet::DevError, 'Transport `%{name}` is already registered for `%{environment}`' % {
@@ -21,6 +26,8 @@ module Puppet::ResourceApi::Transport
 
   # retrieve a Hash of transport schemas, keyed by their name.
   # Only already loaded transports are returned.
+  # use Puppet::Util::Autoload.new(self, 'puppet/transport/schema').loadall(current_environment) to load all transport schemas
+  # note that loadall uses `require` and thus does not re-load changed files, nor does it re-populate the internal cache
   def list
     Marshal.load(Marshal.dump(transports))
   end
@@ -39,13 +46,25 @@ module Puppet::ResourceApi::Transport
   end
   module_function :list_all_transports # rubocop:disable Style/AccessModifierDeclarations
 
-  # Loads all schemas using the Puppet Autoloader.
+  # Loads all schemas using the Puppet Autoloader. This method is clearing the cache and forcing `Kernel.load`, so that the cache is up-to-date.
   def self.load_all_schemas
     require 'puppet'
     require 'puppet/settings'
     require 'puppet/util/autoload'
-    @autoloader ||= Puppet::Util::Autoload.new(self, 'puppet/transport/schema')
-    @autoloader.loadall(current_environment)
+
+    # Since we're force-loading all schemas below, we can replace the cache here completely
+    @transports = {}
+
+    loader = Puppet::Util::Autoload
+    # from puppetlabs/puppet:lib/puppet/util/autoload.rb
+    # Puppet::Util::Autoload.loadall('puppet/transport/schema', current_environment)
+    path = 'puppet/transport/schema'
+    env = current_environment
+    # Load every instance of everything we can find.
+    loader.files_to_load(path, env).each do |file|
+      name = file.chomp('.rb')
+      loader.load_file(name, env)
+    end
   end
   private_class_method :load_all_schemas
 
@@ -108,12 +127,7 @@ module Puppet::ResourceApi::Transport
   private_class_method :wrap_sensitive
 
   def self.transports
-    env = current_environment
-    if env
-      ObjectIdCacheAdapter.adapt(env).retrieve(:rsapi_transport_cache)
-    else
-      @transports_default ||= {}
-    end
+    @transports ||= {}
   end
   private_class_method :transports
 
@@ -159,19 +173,4 @@ module Puppet::ResourceApi::Transport
     nil
   end
   private_class_method :clean_bolt_attributes
-
-  # copy from https://github.com/puppetlabs/puppet/blob/8cae8a17dbac08d2db0238d5bce2f1e4d1898d65/lib/puppet/pops/adapters.rb#L6-L17
-  # to keep backwards compatibility with puppet4 and 5, which don't have this yet.
-  class ObjectIdCacheAdapter < Puppet::Pops::Adaptable::Adapter
-    attr_accessor :cache
-
-    def initialize
-      @cache = {}
-    end
-
-    # Retrieves a mutable hash with all stored values
-    def retrieve(obj)
-      @cache[obj.__id__] ||= {}
-    end
-  end
 end

data/lib/puppet/resource_api/version.rb

@@ -1,5 +1,5 @@
 module Puppet
   module ResourceApi
-    VERSION = '1.8.8'.freeze
+    VERSION = '1.8.9'.freeze
   end
 end

metadata

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