bolt 3.18.0 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1da7c437e5ea72a7f457ee51a06dbe434c85099ac2313491fffc63caa19b5acb
-  data.tar.gz: 5c081782bc847bf233e21a40094ffb0878e3bf0bf2da9ffd4ab527f1239d587e
+  metadata.gz: f615bd259875c82b953db516b48975c66863ef4f4002a4f55317f9f867a0cf6c
+  data.tar.gz: 0027a9463d88e77455c7a83e5716f3097d921a32f172b931530b5f58827f427e
 SHA512:
-  metadata.gz: f1cf5097a426a55de0e69f62cb266b15a91521991ad777d8b21ce81653b828bc279d6111fc0d02fb2f289dc53170db0d13bc99580fcd73fab4ce67ac64751795
-  data.tar.gz: 0fef7a9159cc63e167a9014d25a4a1937194adcbcf35492f5286d1c0c88b9202436b1fe64ea92770895350c795900e3ed701a108bfb1814570386c6411079f00
+  metadata.gz: 8c0d779b31ff416f05d625ba4effb197a7b453f02e19489220e228c3e35b20abf3bc04e85f09562faf8e0b12b415f20c8e6facfcded1d09212f45df2d2d73690
+  data.tar.gz: d5ed05307adf5ff3c71d6db4a076b972284259aa837945eaf389d71434d795f90bb95efb783006fee32076b6311c8b4baad11627511cfad9957fa60f726de937

data/Puppetfile

@@ -10,15 +10,15 @@ mod 'puppetlabs-puppet_agent', '4.9.0'
 mod 'puppetlabs-facts', '1.4.0'
 
 # Core types and providers for Puppet 6
-mod 'puppetlabs-augeas_core', '1.1.2'
-mod 'puppetlabs-host_core', '1.0.3'
+mod 'puppetlabs-augeas_core', '1.2.0'
+mod 'puppetlabs-host_core', '1.1.0'
 mod 'puppetlabs-scheduled_task', '3.0.1'
-mod 'puppetlabs-sshkeys_core', '2.2.0'
-mod 'puppetlabs-zfs_core', '1.2.0'
-mod 'puppetlabs-cron_core', '1.0.5'
-mod 'puppetlabs-mount_core', '1.0.4'
-mod 'puppetlabs-selinux_core', '1.1.0'
-mod 'puppetlabs-yumrepo_core', '1.0.7'
+mod 'puppetlabs-sshkeys_core', '2.3.0'
+mod 'puppetlabs-zfs_core', '1.3.0'
+mod 'puppetlabs-cron_core', '1.1.0'
+mod 'puppetlabs-mount_core', '1.1.0'
+mod 'puppetlabs-selinux_core', '1.2.0'
+mod 'puppetlabs-yumrepo_core', '1.1.0'
 mod 'puppetlabs-zone_core', '1.0.3'
 
 # Useful additional modules
@@ -29,7 +29,7 @@ mod 'puppetlabs-python_task_helper', '0.5.0'
 mod 'puppetlabs-reboot', '4.1.0'
 mod 'puppetlabs-ruby_task_helper', '0.6.0'
 mod 'puppetlabs-ruby_plugin_helper', '0.2.0'
-mod 'puppetlabs-stdlib', '8.0.0'
+mod 'puppetlabs-stdlib', '8.1.0'
 
 # Plugin modules
 mod 'puppetlabs-aws_inventory', '0.7.0'

data/lib/bolt/inventory/inventory.rb

@@ -71,7 +71,7 @@ module Bolt
           @config
         else
           @config_resolved = true
-          @config.transform_values! { |t| t.resolved? ? t : t.resolve(@plugins) }
+          @config.each_value { |t| t.resolve(@plugins) unless t.resolved? }
         end
       end
 

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '3.18.0'
+  VERSION = '3.19.0'
 end

data/lib/bolt_server/transport_app.rb

@@ -414,6 +414,8 @@ module BoltServer
           'path' => case mount_segment
                     when 'files'
                       "/puppet/v3/file_content/modules/#{module_segment}/#{name_segment}"
+                    when 'scripts'
+                      "/puppet/v3/file_content/scripts/#{module_segment}/#{name_segment}"
                     when 'tasks'
                       "/puppet/v3/file_content/tasks/#{module_segment}/#{name_segment}"
                     when 'lib'
@@ -463,7 +465,7 @@ module BoltServer
     end
 
     def file_metadatas(versioned_project, module_name, file)
-      abs_file_path = @pal_mutex.synchronize do
+      result = @pal_mutex.synchronize do
         bolt_config = config_from_project(versioned_project)
         pal = pal_from_project_bolt_config(bolt_config)
         pal.in_bolt_compiler do
@@ -473,31 +475,36 @@ module BoltServer
           # If not found, and the path starts with `files` or `scripts`, munge
           # the path and look inside that directory.
           if (abs_path = mod.file(file))
-            abs_path
+            { abs_file_path: abs_path, puppetserver_root: "modules/#{module_name}/#{file}" }
           else
             subdir, relative_path = file.split(File::SEPARATOR, 2)
-            case subdir
-            when 'files'
-              mod.file(relative_path)
-            when 'scripts'
-              mod.script(relative_path)
-            end
+            abs_path, mount = case subdir
+                              when 'files'
+                                [mod.file(relative_path), 'modules']
+                              when 'scripts'
+                                [mod.script(relative_path), 'scripts']
+                              end
+            next nil unless abs_path
+            { abs_file_path: abs_path, puppetserver_root: "#{mount}/#{module_name}/#{relative_path}" }
           end
         end
       end
 
-      unless abs_file_path
+      unless result
         raise BoltServer::RequestError,
               "file: '#{file}' does not exist inside #{module_name} 'files' or 'scripts' directories"
       end
 
+      abs_file_path = result[:abs_file_path]
+      puppetserver_root = result[:puppetserver_root]
+
       fileset = Puppet::FileServing::Fileset.new(abs_file_path, 'recurse' => 'yes')
       Puppet::FileServing::Fileset.merge(fileset).collect do |relative_file_path, base_path|
         metadata = Puppet::FileServing::Metadata.new(base_path, relative_path: relative_file_path)
         metadata.checksum_type = 'sha256'
         metadata.links = 'follow'
         metadata.collect
-        metadata.to_data_hash
+        metadata.to_data_hash.merge(puppetserver_root: puppetserver_root)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-20 00:00:00.000000000 Z
+date: 2021-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable