bolt 2.35.0 → 2.40.2

data/lib/bolt/version.rb

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

data/lib/bolt_server/base_config.rb

@@ -7,7 +7,9 @@ module BoltServer
   class BaseConfig
     def config_keys
       %w[host port ssl-cert ssl-key ssl-ca-cert
-         ssl-cipher-suites loglevel logfile allowlist projects-dir]
+         ssl-cipher-suites loglevel logfile allowlist
+         projects-dir environments-codedir
+         environmentpath basemodulepath]
     end
 
     def env_keys

data/lib/bolt_server/config.rb

@@ -7,7 +7,9 @@ require 'bolt/error'
 module BoltServer
   class Config < BoltServer::BaseConfig
     def config_keys
-      super + %w[concurrency cache-dir file-server-conn-timeout file-server-uri projects-dir]
+      super + %w[concurrency cache-dir file-server-conn-timeout
+                 file-server-uri projects-dir environments-codedir
+                 environmentpath basemodulepath]
     end
 
     def env_keys

data/lib/bolt_server/plugin.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'bolt/error'
+
+module BoltServer
+  class Plugin
+    class PluginNotSupported < Bolt::Error
+      def initialize(msg, plugin_name)
+        super(msg, 'bolt/plugin-not-supported', { "plugin_name" => plugin_name })
+      end
+    end
+  end
+end

data/lib/bolt_server/plugin/puppet_connect_data.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module BoltServer
+  class Plugin
+    class PuppetConnectData
+      def initialize(data, **_opts)
+        @data = data
+      end
+
+      def name
+        'puppet_connect_data'
+      end
+
+      def hooks
+        %i[resolve_reference validate_resolve_reference]
+      end
+
+      def resolve_reference(opts)
+        key = opts['key']
+
+        @data.dig(key, 'value')
+      end
+
+      def validate_resolve_reference(opts)
+        unless opts['key']
+          raise Bolt::ValidationError,
+                "puppet_connect_data plugin requires that 'key' be specified"
+        end
+
+        unless @data.key?(opts['key'])
+          raise Bolt::ValidationError,
+                "puppet_connect_data plugin tried to lookup key '#{opts['key']}' but no value was found"
+        end
+      end
+    end
+  end
+end

data/lib/bolt_server/schemas/connect-data.json

@@ -0,0 +1,22 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "project_inventory_targets connect plugin data",
+  "description": "POST project_inventory_targets connect plugin data",
+  "type": "object",
+  "properties": {
+    "puppet_connect_data": {
+      "type": "object",
+      "patternProperties": {
+        ".*": {
+          "type": "object",
+          "properties": {
+            "value": {}
+          },
+          "required": ["value"]
+        }
+      },
+      "additionalProperties": false
+    }
+  },
+  "required": ["puppet_connect_data"]
+}

data/lib/bolt_server/schemas/partials/task.json

@@ -37,7 +37,7 @@
         },
         "input_method": {
           "type": "string",
-          "enum": ["stdin", "environment", "powershell"],
+          "enum": ["stdin", "environment", "powershell", "both"],
           "description": "What input method should be used to pass params to the task"
         }
       }
@@ -64,7 +64,7 @@
                     "description": "Environment the task is in",
                     "type": "string"
                   },
-                  "project": {
+                  "versioned_project": {
                     "description": "Project the task is in",
                     "type": "string"
                   }
@@ -77,7 +77,7 @@
                   },
                   {
                     "required": [
-                      "project"
+                      "versioned_project"
                     ]
                   }
                 ],              

data/lib/bolt_server/transport_app.rb

@@ -8,6 +8,8 @@ require 'bolt/inventory'
 require 'bolt/project'
 require 'bolt/target'
 require 'bolt_server/file_cache'
+require 'bolt_server/plugin'
+require 'bolt_server/plugin/puppet_connect_data'
 require 'bolt/task/puppet_server'
 require 'json'
 require 'json-schema'
@@ -35,6 +37,7 @@ module BoltServer
       action-upload_file
       transport-ssh
       transport-winrm
+      connect-data
     ].freeze
 
     # PE_BOLTLIB_PATH is intended to function exactly like the BOLTLIB_PATH used
@@ -48,8 +51,8 @@ module BoltServer
     # See the `orchestrator.bolt.codedir` tk config setting.
     DEFAULT_BOLT_CODEDIR = '/opt/puppetlabs/server/data/orchestration-services/code'
 
-    MISSING_PROJECT_REF_RESPONSE = [
-      400, Bolt::ValidationError.new('`project_ref` is a required argument').to_json
+    MISSING_VERSIONED_PROJECT_RESPONSE = [
+      400, Bolt::ValidationError.new('`versioned_project` is a required argument').to_json
     ].freeze
 
     def initialize(config)
@@ -235,9 +238,9 @@ module BoltServer
     #
     # WARNING: THIS FUNCTION SHOULD ONLY BE CALLED INSIDE A SYNCHRONIZED PAL MUTEX
     def modulepath_from_environment(environment_name)
-      codedir = DEFAULT_BOLT_CODEDIR
-      environmentpath = "#{codedir}/environments"
-      basemodulepath = "#{codedir}/modules:/opt/puppetlabs/puppet/modules"
+      codedir = @config['environments-codedir'] || DEFAULT_BOLT_CODEDIR
+      environmentpath = @config['environmentpath'] || "#{codedir}/environments"
+      basemodulepath = @config['basemodulepath'] || "#{codedir}/modules:/opt/puppetlabs/puppet/modules"
       modulepath_dirs = nil
       with_pe_pal_init_settings(codedir, environmentpath, basemodulepath) do
         environment = Puppet.lookup(:environments).get!(environment_name)
@@ -265,16 +268,16 @@ module BoltServer
       end
     end
 
-    def config_from_project(project_ref)
-      project_dir = File.join(@config['projects-dir'], project_ref)
-      raise Bolt::ValidationError, "`project_ref`: #{project_dir} does not exist" unless Dir.exist?(project_dir)
+    def config_from_project(versioned_project)
+      project_dir = File.join(@config['projects-dir'], versioned_project)
+      raise Bolt::ValidationError, "`versioned_project`: #{project_dir} does not exist" unless Dir.exist?(project_dir)
       project = Bolt::Project.create_project(project_dir)
       Bolt::Config.from_project(project, { log: { 'bolt-debug.log' => 'disable' } })
     end
 
-    def in_bolt_project(project_ref)
+    def in_bolt_project(versioned_project)
       @pal_mutex.synchronize do
-        bolt_config = config_from_project(project_ref)
+        bolt_config = config_from_project(versioned_project)
         modulepath_object = Bolt::Config::Modulepath.new(
           bolt_config.modulepath,
           boltlib_path: [PE_BOLTLIB_PATH, Bolt::Config::Modulepath::BOLTLIB_PATH]
@@ -285,8 +288,6 @@ module BoltServer
           config: bolt_config
         }
         yield context
-      rescue Bolt::Error => e
-        [400, e.to_json]
       end
     end
 
@@ -513,14 +514,16 @@ module BoltServer
 
     # Fetches the metadata for a single plan
     #
-    # @param project_ref [String] the project to fetch the plan from
+    # @param versioned_project [String] the project to fetch the plan from
     get '/project_plans/:module_name/:plan_name' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      in_bolt_project(params['project_ref']) do |context|
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      in_bolt_project(params['versioned_project']) do |context|
         plan_info = pe_plan_info(context[:pal], params[:module_name], params[:plan_name])
         plan_info = allowed_helper(plan_info, context[:config].project.plans)
         [200, plan_info.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the metadata for a single task
@@ -538,17 +541,19 @@ module BoltServer
 
     # Fetches the metadata for a single task
     #
-    # @param bolt_project_ref [String] the reference to the bolt-project directory to load task metadata from
+    # @param bolt_versioned_project [String] the reference to the bolt-project directory to load task metadata from
     get '/project_tasks/:module_name/:task_name' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      in_bolt_project(params['project_ref']) do |context|
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      in_bolt_project(params['versioned_project']) do |context|
         ps_parameters = {
-          'project' => params['project_ref']
+          'versioned_project' => params['versioned_project']
         }
         task_info = pe_task_info(context[:pal], params[:module_name], params[:task_name], ps_parameters)
         task_info = allowed_helper(task_info, context[:config].project.tasks)
         [200, task_info.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the list of plans for an environment, optionally fetching all metadata for each plan
@@ -577,10 +582,10 @@ module BoltServer
 
     # Fetches the list of plans for a project
     #
-    # @param project_ref [String] the project to fetch the list of plans from
+    # @param versioned_project [String] the project to fetch the list of plans from
     get '/project_plans' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      in_bolt_project(params['project_ref']) do |context|
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      in_bolt_project(params['versioned_project']) do |context|
         plans_response = plan_list(context[:pal])
 
         # Dig in context for the allowlist of plans from project object
@@ -592,6 +597,8 @@ module BoltServer
         # to bolt-server smaller/simpler.
         [200, plans_response.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Fetches the list of tasks for an environment
@@ -611,10 +618,10 @@ module BoltServer
 
     # Fetches the list of tasks for a bolt-project
     #
-    # @param project_ref [String] the project to fetch the list of tasks from
+    # @param versioned_project [String] the project to fetch the list of tasks from
     get '/project_tasks' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      in_bolt_project(params['project_ref']) do |context|
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      in_bolt_project(params['versioned_project']) do |context|
         tasks_response = task_list(context[:pal])
 
         # Dig in context for the allowlist of tasks from project object
@@ -626,37 +633,58 @@ module BoltServer
         # to bolt-server smaller/simpler.
         [200, tasks_response.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     end
 
     # Implements puppetserver's file_metadatas endpoint for projects.
     #
-    # @param project_ref [String] the project_ref to fetch the file metadatas from
+    # @param versioned_project [String] the versioned_project to fetch the file metadatas from
     get '/project_file_metadatas/:module_name/*' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      in_bolt_project(params['project_ref']) do |context|
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      in_bolt_project(params['versioned_project']) do |context|
         file = params[:splat].first
         metadatas = file_metadatas(context[:pal], params[:module_name], file)
         [200, metadatas.to_json]
       end
+    rescue Bolt::Error => e
+      [400, e.to_json]
     rescue ArgumentError => e
       [400, e.message]
     end
 
     # Returns a list of targets parsed from a Project inventory
     #
-    # @param project_ref [String] the project_ref to compute the inventory from
-    get '/project_inventory_targets' do
-      return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
-      bolt_config = config_from_project(params['project_ref'])
-      if bolt_config.inventoryfile && bolt_config.project.inventory_file.to_s != bolt_config.inventoryfile
-        raise Bolt::ValidationError, "Project inventory must be defined in the " \
-          "inventory.yaml file at the root of the project directory"
-      end
-      plugins = Bolt::Plugin.setup(bolt_config, nil)
-      inventory = Bolt::Inventory.from_config(bolt_config, plugins)
-      target_list = inventory.get_targets('all').map { |targ| targ.to_h.merge({ 'transport' => targ.transport }) }
+    # @param versioned_project [String] the versioned_project to compute the inventory from
+    post '/project_inventory_targets' do
+      return MISSING_VERSIONED_PROJECT_RESPONSE if params['versioned_project'].nil?
+      content_type :json
+      body = JSON.parse(request.body.read)
+      error = validate_schema(@schemas["connect-data"], body)
+      return [400, error_result(error).to_json] unless error.nil?
+      in_bolt_project(params['versioned_project']) do |context|
+        if context[:config].inventoryfile &&
+           context[:config].project.inventory_file.to_s !=
+           context[:config].inventoryfile
+          raise Bolt::ValidationError, "Project inventory must be defined in the " \
+            "inventory.yaml file at the root of the project directory"
+        end
 
-      [200, target_list.to_json]
+        Bolt::Util.validate_file('inventory file', context[:config].project.inventory_file)
+
+        begin
+          connect_plugin = BoltServer::Plugin::PuppetConnectData.new(body['puppet_connect_data'])
+          plugins = Bolt::Plugin.setup(context[:config], context[:pal], load_plugins: false)
+          plugins.add_plugin(connect_plugin)
+          inventory = Bolt::Inventory.from_config(context[:config], plugins)
+          target_list = inventory.get_targets('all').map { |targ| targ.to_h.merge({ 'transport' => targ.transport }) }
+        rescue Bolt::Plugin::PluginError::LoadingDisabled => e
+          msg = "Cannot load plugin #{e.details['plugin_name']}: plugin not supported"
+          raise BoltServer::Plugin::PluginNotSupported.new(msg, e.details['plugin_name'])
+        end
+
+        [200, target_list.to_json]
+      end
     rescue Bolt::Error => e
       [500, e.to_json]
     end

data/libexec/apply_catalog.rb

@@ -74,7 +74,7 @@ begin
     Puppet::ResourceApi::Transport.inject_device(type, transport)
 
     Puppet[:facts_terminus] = :network_device
-    Puppet[:certname] = conn_info['uri']
+    Puppet[:certname] = conn_info['name']
   end
 
   # Ensure custom facts are available for provider suitability tests

data/libexec/custom_facts.rb

@@ -51,7 +51,7 @@ Dir.mktmpdir do |puppet_root|
     Puppet::ResourceApi::Transport.inject_device(type, transport)
 
     Puppet[:facts_terminus] = :network_device
-    Puppet[:certname] = conn_info['uri']
+    Puppet[:certname] = conn_info['name']
   end
 
   facts = Puppet::Node::Facts.indirection.find(SecureRandom.uuid, environment: env)

data/libexec/query_resources.rb

@@ -59,7 +59,7 @@ Dir.mktmpdir do |puppet_root|
     Puppet::ResourceApi::Transport.inject_device(type, transport)
 
     Puppet[:facts_terminus] = :network_device
-    Puppet[:certname] = conn_info['uri']
+    Puppet[:certname] = conn_info['name']
   end
 
   resources = args['resources'].flat_map do |resource_desc|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.40.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -185,9 +185,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.18.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.20'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -195,23 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.18.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6.20'
 - !ruby/object:Gem::Dependency
   name: puppetfile-resolver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: puppet-resource_api
   requirement: !ruby/object:Gem::Requirement
@@ -317,6 +311,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -324,6 +321,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.14'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -469,6 +469,7 @@ files:
 - lib/bolt/inventory.rb
 - lib/bolt/inventory/group.rb
 - lib/bolt/inventory/inventory.rb
+- lib/bolt/inventory/options.rb
 - lib/bolt/inventory/target.rb
 - lib/bolt/logger.rb
 - lib/bolt/module.rb
@@ -510,17 +511,18 @@ files:
 - lib/bolt/plan_creator.rb
 - lib/bolt/plan_result.rb
 - lib/bolt/plugin.rb
+- lib/bolt/plugin/cache.rb
 - lib/bolt/plugin/env_var.rb
 - lib/bolt/plugin/module.rb
 - lib/bolt/plugin/prompt.rb
 - lib/bolt/plugin/puppetdb.rb
 - lib/bolt/plugin/task.rb
 - lib/bolt/project.rb
-- lib/bolt/project_migrator.rb
-- lib/bolt/project_migrator/base.rb
-- lib/bolt/project_migrator/config.rb
-- lib/bolt/project_migrator/inventory.rb
-- lib/bolt/project_migrator/modules.rb
+- lib/bolt/project_manager.rb
+- lib/bolt/project_manager/config_migrator.rb
+- lib/bolt/project_manager/inventory_migrator.rb
+- lib/bolt/project_manager/migrator.rb
+- lib/bolt/project_manager/module_migrator.rb
 - lib/bolt/puppetdb.rb
 - lib/bolt/puppetdb/client.rb
 - lib/bolt/puppetdb/config.rb
@@ -555,17 +557,21 @@ files:
 - lib/bolt/transport/winrm/connection.rb
 - lib/bolt/util.rb
 - lib/bolt/util/puppet_log_level.rb
+- lib/bolt/validator.rb
 - lib/bolt/version.rb
 - lib/bolt/yarn.rb
 - lib/bolt_server/acl.rb
 - lib/bolt_server/base_config.rb
 - lib/bolt_server/config.rb
 - lib/bolt_server/file_cache.rb
+- lib/bolt_server/plugin.rb
+- lib/bolt_server/plugin/puppet_connect_data.rb
 - lib/bolt_server/schemas/action-check_node_connections.json
 - lib/bolt_server/schemas/action-run_command.json
 - lib/bolt_server/schemas/action-run_script.json
 - lib/bolt_server/schemas/action-run_task.json
 - lib/bolt_server/schemas/action-upload_file.json
+- lib/bolt_server/schemas/connect-data.json
 - lib/bolt_server/schemas/partials/target-any.json
 - lib/bolt_server/schemas/partials/target-ssh.json
 - lib/bolt_server/schemas/partials/target-winrm.json