Merge pull request #45 from OpenVoxProject/remove-orchestrator_client

Remove orchestrator_client / pcp transport

Author: smortex

.github/workflows/orch_transport.yaml

@@ -110,7 +110,6 @@
     <topichead navtitle="Using Bolt with Puppet">
         <topicref href="applying_manifest_blocks.md" format="markdown"/>
         <topicref href="hiera.md" format="markdown"/>
-        <topicref href="bolt_configure_orchestrator.md" format="markdown"/>
         <topicref href="bolt_connect_puppetdb.md" format="markdown"/>
     </topichead>
     <topicref href="bolt_examples.md" format="markdown">

documentation/bolt.ditamap

@@ -281,7 +281,5 @@ disable-warnings:
 - [bolt-project.yaml options](bolt_project_reference.md)
 - [inventory.yaml fields](bolt_inventory_reference.md)
 - [Transport configuration options](bolt_transports_reference.md)
-- For information on configuring Bolt for Puppet Enterprise, see [Using
-  Bolt with Puppet Enterprise](bolt_configure_orchestrator.md)
 - For information on connecting Bolt to PuppetDB, see [Connecting Bolt to
   PuppetDB](bolt_connect_puppetdb.md)

documentation/bolt_configure_orchestrator.md

@@ -375,15 +375,7 @@ def run_plan(plan, targets, params: {})
         end
       end
 
-      sensitive_params = params.keys.select { |param| plan_params.dig(param, 'sensitive') }
-
-      plan_context = { plan_name: plan, params: params, sensitive: sensitive_params }
-
-      executor.start_plan(plan_context)
-      result = pal.run_plan(plan, params, executor, inventory, plugins.puppetdb_client)
-      executor.finish_plan(result)
-
-      result
+      pal.run_plan(plan, params, executor, inventory, plugins.puppetdb_client)
     rescue Bolt::Error => e
       Bolt::PlanResult.new(e, 'failure')
     end

documentation/configuring_bolt.md

@@ -4,7 +4,6 @@
 require_relative '../../bolt/config/transport/jail'
 require_relative '../../bolt/config/transport/local'
 require_relative '../../bolt/config/transport/lxd'
-require_relative '../../bolt/config/transport/orch'
 require_relative '../../bolt/config/transport/podman'
 require_relative '../../bolt/config/transport/remote'
 require_relative '../../bolt/config/transport/ssh'
@@ -20,7 +19,6 @@ module Options
         'jail'   => Bolt::Config::Transport::Jail,
         'local'  => Bolt::Config::Transport::Local,
         'lxd'    => Bolt::Config::Transport::LXD,
-        'pcp'    => Bolt::Config::Transport::Orch,
         'podman' => Bolt::Config::Transport::Podman,
         'remote' => Bolt::Config::Transport::Remote,
         'ssh'    => Bolt::Config::Transport::SSH,
@@ -572,12 +570,6 @@ module Options
           _plugin: true,
           _example: { cleanup: false }
         },
-        "pcp" => {
-          description: "A map of configuration options for the pcp transport.",
-          type: Hash,
-          _plugin: true,
-          _example: { "job-poll-interval" => 15, "job-poll-timeout" => 30 }
-        },
         "podman" => {
           description: "A map of configuration options for the podman transport.",
           type: Hash,

lib/bolt/application.rb

@@ -17,7 +17,6 @@
 require_relative '../bolt/transport/jail'
 require_relative '../bolt/transport/local'
 require_relative '../bolt/transport/lxd'
-require_relative '../bolt/transport/orch'
 require_relative '../bolt/transport/podman'
 require_relative '../bolt/transport/remote'
 require_relative '../bolt/transport/ssh'
@@ -29,7 +28,6 @@ module Bolt
     jail: Bolt::Transport::Jail,
     local: Bolt::Transport::Local,
     lxd: Bolt::Transport::LXD,
-    pcp: Bolt::Transport::Orch,
     podman: Bolt::Transport::Podman,
     remote: Bolt::Transport::Remote,
     ssh: Bolt::Transport::SSH,
@@ -511,24 +509,6 @@ def prompt(prompt, options)
       value
     end
 
-    # Plan context doesn't make sense for most transports but it is tightly
-    # coupled with the orchestrator transport since the transport behaves
-    # differently when a plan is running. In order to limit how much this
-    # pollutes the transport API we only handle the orchestrator transport here.
-    # Since we call this function without resolving targets this will result
-    # in the orchestrator transport always being initialized during plan runs.
-    # For now that's ok.
-    #
-    # In the future if other transports need this or if we want a plan stack
-    # we'll need to refactor.
-    def start_plan(plan_context)
-      transport('pcp').plan_context = plan_context
-    end
-
-    def finish_plan(plan_result)
-      transport('pcp').finish_plan(plan_result)
-    end
-
     def without_default_logging
       publish_event(type: :disable_default_output)
       yield