bolt 3.15.0 → 3.16.0

data/lib/bolt/project.rb

@@ -209,12 +209,5 @@ module Bolt
         Bolt::Logger.warn("missing_project_name", message)
       end
     end
-
-    def check_deprecated_file
-      if (@path + 'project.yaml').file?
-        msg = "Project configuration file 'project.yaml' is deprecated; use 'bolt-project.yaml' instead."
-        Bolt::Logger.warn("project_yaml", msg)
-      end
-    end
   end
 end

data/lib/bolt/result_set.rb

@@ -2,7 +2,8 @@
 
 module Bolt
   class ResultSet
-    attr_reader :results
+    attr_accessor :elapsed_time
+    attr_reader   :results
 
     include Enumerable
 

data/lib/bolt/transport/local/connection.rb

@@ -10,6 +10,8 @@ module Bolt
   module Transport
     class Local < Simple
       class Connection
+        RUBY_ENV_VARS = %w[GEM_PATH GEM_HOME RUBYLIB RUBYLIB_PREFIX RUBYOPT RUBYPATH RUBYSHELL].freeze
+
         attr_accessor :user, :logger, :target
 
         def initialize(target)
@@ -68,7 +70,21 @@ module Bolt
             end
           end
 
-          Open3.popen3(*command)
+          # Only do this if bundled-ruby is set to false, not nil
+          ruby_env_vars = if target.transport_config['bundled-ruby'] == false
+                            RUBY_ENV_VARS.each_with_object({}) do |e, acc|
+                              acc[e] = ENV["BOLT_ORIG_#{e}"] if ENV["BOLT_ORIG_#{e}"]
+                            end
+                          end
+
+          if target.transport_config['bundled-ruby'] == false &&
+             Gem.loaded_specs.keys.include?('bundler')
+            Bundler.with_unbundled_env do
+              Open3.popen3(ruby_env_vars || {}, *command)
+            end
+          else
+            Open3.popen3(ruby_env_vars || {}, *command)
+          end
         end
 
         # This is used by the Bash shell to decide whether to `cd` before

data/lib/bolt/transport/orch/connection.rb

@@ -36,7 +36,8 @@ module Bolt
           end
           logger.debug("Creating orchestrator client for #{client_opts}")
           @client = OrchestratorClient.new(client_opts, true)
-          @plan_job = start_plan(plan_context)
+          @plan_context = plan_context
+          @plan_job = start_plan(@plan_context)
           logger.debug("Started plan #{@plan_job}")
           @environment = opts["task-environment"]
         end
@@ -87,6 +88,17 @@ module Bolt
         def run_task(targets, task, arguments, options)
           body = build_request(targets, task, arguments, options[:description])
           @client.run_task(body)
+        rescue OrchestratorClient::ApiError => e
+          if e.data['kind'] == 'puppetlabs.orchestrator/plan-already-finished'
+            @logger.debug("Retrying the task")
+            # Instead of recursing, just retry once
+            @plan_job = start_plan(@plan_context)
+            # Rebuild the request with the new plan job ID
+            body = build_request(targets, task, arguments, options[:description])
+            @client.run_task(body)
+          else
+            raise e
+          end
         end
 
         def query_inventory(targets)

data/lib/bolt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bolt
 version: !ruby/object:Gem::Version
-  version: 3.15.0
+  version: 3.16.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-02 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -477,6 +477,7 @@ files:
 - guides/transports.yaml
 - lib/bolt.rb
 - lib/bolt/analytics.rb
+- lib/bolt/application.rb
 - lib/bolt/applicator.rb
 - lib/bolt/apply_inventory.rb
 - lib/bolt/apply_result.rb
@@ -570,7 +571,6 @@ files:
 - lib/bolt/resource_instance.rb
 - lib/bolt/result.rb
 - lib/bolt/result_set.rb
-- lib/bolt/secret.rb
 - lib/bolt/shell.rb
 - lib/bolt/shell/bash.rb
 - lib/bolt/shell/bash/tmpdir.rb

data/lib/bolt/secret.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'bolt/plugin'
-
-module Bolt
-  class Secret
-    KNOWN_KEYS = {
-      'createkeys' => %w[keysize private_key public_key],
-      'encrypt'    => %w[public_key],
-      'decrypt'    => %w[private_key public_key]
-    }.freeze
-
-    def self.execute(plugins, outputter, options)
-      name   = options[:plugin] || 'pkcs7'
-      plugin = plugins.by_name(name)
-
-      unless plugin
-        raise Bolt::Plugin::PluginError::Unknown, name
-      end
-
-      case options[:action]
-      when 'createkeys'
-        opts = { 'force' => options[:force] }.compact
-        result = plugins.get_hook(name, :secret_createkeys).call(opts)
-        outputter.print_message(result)
-      when 'encrypt'
-        encrypted = plugins.get_hook(name, :secret_encrypt).call('plaintext_value' => options[:object])
-        outputter.print_message(encrypted)
-      when 'decrypt'
-        decrypted = plugins.get_hook(name, :secret_decrypt).call('encrypted_value' => options[:object])
-        outputter.print_message(decrypted)
-      end
-
-      0
-    end
-  end
-end