bolt 2.35.0 → 2.36.0

data/lib/bolt/{project_migrator/base.rb → project_manager/migrator.rb}

@@ -4,8 +4,8 @@ require 'fileutils'
 require 'bolt/error'
 
 module Bolt
-  class ProjectMigrator
-    class Base
+  class ProjectManager
+    class Migrator
       def initialize(outputter)
         @outputter = outputter
       end

data/lib/bolt/{project_migrator/modules.rb → project_manager/module_migrator.rb}

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'bolt/project_migrator/base'
+require 'bolt/project_manager/migrator'
 
 module Bolt
-  class ProjectMigrator
-    class Modules < Base
+  class ProjectManager
+    class ModuleMigrator < Migrator
       def migrate(project, configured_modulepath)
         return true unless project.modules.nil?
 

data/lib/bolt/puppetdb/config.rb

@@ -18,8 +18,7 @@ module Bolt
       end
 
       def self.default_windows_config
-        require 'win32/dir'
-        File.expand_path(File.join(Dir::COMMON_APPDATA, 'PuppetLabs/client-tools/puppetdb.conf'))
+        File.expand_path(File.join(ENV['ALLUSERSPROFILE'], 'PuppetLabs/client-tools/puppetdb.conf'))
       end
 
       def self.load_config(options, project_path = nil)

data/lib/bolt/shell/bash.rb

@@ -199,7 +199,7 @@ module Bolt
         lines = buffer.split(/(?<=\n)/)
         # handle_sudo will return the line if it is not a sudo prompt or error
         lines.map! { |line| handle_sudo(inp, line, stdin) }
-        lines.join("")
+        lines.join
       # If stream has reached EOF, no password prompt is expected
       # return an empty string
       rescue EOFError

data/lib/bolt/task/run.rb

@@ -42,7 +42,7 @@ module Bolt
         if targets.empty?
           Bolt::ResultSet.new([])
         else
-          result = executor.run_task_with_minimal_logging(targets, task, params, options)
+          result = executor.run_task(targets, task, params, options, [], :trace)
 
           if !result.ok && !options[:catch_errors]
             raise Bolt::RunFailure.new(result, 'run_task', task.name)

data/lib/bolt/transport/ssh/exec_connection.rb

@@ -12,8 +12,12 @@ module Bolt
           raise Bolt::ValidationError, "Target #{target.safe_name} does not have a host" unless target.host
 
           @target = target
-          ssh_config = Net::SSH::Config.for(target.host)
-          @user = @target.user || ssh_config[:user] || Etc.getlogin
+          begin
+            ssh_config = Net::SSH::Config.for(target.host)
+            @user = @target.user || ssh_config[:user] || Etc.getlogin
+          rescue StandardError
+            @user = @target.user || Etc.getlogin
+          end
           @logger = Bolt::Logger.logger(self)
         end
 

data/lib/bolt/util.rb

@@ -29,19 +29,26 @@ module Bolt
         path = File.expand_path(path)
         content = File.open(path, "r:UTF-8") { |f| YAML.safe_load(f.read) } || {}
         unless content.is_a?(Hash)
-          msg = "Invalid content for #{file_name} file: #{path} should be a Hash or empty, not #{content.class}"
-          raise Bolt::FileError.new(msg, path)
+          raise Bolt::FileError.new(
+            "Invalid content for #{file_name} file at #{path}\nContent should be a Hash or empty, "\
+            "not #{content.class}",
+            path
+          )
         end
         logger.trace("Loaded #{file_name} from #{path}")
         content
       rescue Errno::ENOENT
-        raise Bolt::FileError.new("Could not read #{file_name} file: #{path}", path)
+        raise Bolt::FileError.new("Could not read #{file_name} file at #{path}", path)
+      rescue Psych::SyntaxError => e
+        raise Bolt::FileError.new("Could not parse #{file_name} file at #{path}, line #{e.line}, "\
+                                  "column #{e.column}\n#{e.problem}",
+                                  path)
       rescue Psych::Exception => e
-        raise Bolt::FileError.new("Could not parse #{file_name} file: #{path}\n"\
-                                  "Error at line #{e.line} column #{e.column}", path)
+        raise Bolt::FileError.new("Could not parse #{file_name} file at #{path}\n#{e.message}",
+                                  path)
       rescue IOError, SystemCallError => e
-        raise Bolt::FileError.new("Could not read #{file_name} file: #{path}\n"\
-                                  "error: #{e}", path)
+        raise Bolt::FileError.new("Could not read #{file_name} file at #{path}\n#{e.message}",
+                                  path)
       end
 
       def read_optional_yaml_hash(path, file_name)

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '2.35.0'
+  VERSION = '2.36.0'
 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/schemas/partials/task.json

@@ -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

@@ -235,9 +235,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)
@@ -543,7 +543,7 @@ module BoltServer
       return MISSING_PROJECT_REF_RESPONSE if params['project_ref'].nil?
       in_bolt_project(params['project_ref']) do |context|
         ps_parameters = {
-          'project' => params['project_ref']
+          'versioned_project' => params['project_ref']
         }
         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)
@@ -645,7 +645,7 @@ module BoltServer
     # 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
+    post '/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

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.36.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-16 00:00:00.000000000 Z
+date: 2020-11-30 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,9 +192,6 @@ 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
@@ -464,6 +458,7 @@ files:
 - lib/bolt/config/transport/remote.rb
 - lib/bolt/config/transport/ssh.rb
 - lib/bolt/config/transport/winrm.rb
+- lib/bolt/config/validator.rb
 - lib/bolt/error.rb
 - lib/bolt/executor.rb
 - lib/bolt/inventory.rb
@@ -516,11 +511,11 @@ files:
 - 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

data/lib/bolt/project_migrator.rb

@@ -1,80 +0,0 @@
-# frozen_string_literal: true
-
-require 'bolt/project_migrator/config'
-require 'bolt/project_migrator/inventory'
-require 'bolt/project_migrator/modules'
-
-module Bolt
-  class ProjectMigrator
-    def initialize(config, outputter)
-      @config    = config
-      @outputter = outputter
-    end
-
-    def migrate
-      unless $stdin.tty?
-        raise Bolt::Error.new(
-          "stdin is not a tty, unable to migrate project",
-          'bolt/stdin-not-a-tty-error'
-        )
-      end
-
-      @outputter.print_message("Migrating project #{@config.project.path}\n\n")
-
-      @outputter.print_action_step(
-        "Migrating a Bolt project may make irreversible changes to the project's "\
-        "configuration and inventory files. Before continuing, make sure the "\
-        "project has a backup or uses a version control system."
-      )
-
-      return 0 unless Bolt::Util.prompt_yes_no("Continue with project migration?", @outputter)
-
-      @outputter.print_message('')
-
-      ok = migrate_inventory && migrate_config && migrate_modules
-
-      if ok
-        @outputter.print_message("Project successfully migrated")
-      else
-        @outputter.print_error("Project could not be migrated completely")
-      end
-
-      ok ? 0 : 1
-    end
-
-    # Migrates the project-level configuration file to the latest version.
-    #
-    private def migrate_config
-      migrator = Bolt::ProjectMigrator::Config.new(@outputter)
-
-      migrator.migrate(
-        @config.project.config_file,
-        @config.project.project_file,
-        @config.inventoryfile || @config.project.inventory_file,
-        @config.project.backup_dir
-      )
-    end
-
-    # Migrates the inventory file to the latest version.
-    #
-    private def migrate_inventory
-      migrator = Bolt::ProjectMigrator::Inventory.new(@outputter)
-
-      migrator.migrate(
-        @config.inventoryfile || @config.project.inventory_file,
-        @config.project.backup_dir
-      )
-    end
-
-    # Migrates the project's modules to use current best practices.
-    #
-    private def migrate_modules
-      migrator = Bolt::ProjectMigrator::Modules.new(@outputter)
-
-      migrator.migrate(
-        @config.project,
-        @config.modulepath
-      )
-    end
-  end
-end