openbolt 5.0.0.pre.rc2 → 5.1.0

data/lib/bolt/validator.rb

@@ -172,7 +172,7 @@ module Bolt
     private def plugin_reference?(value, plugin_supported)
       if value.is_a?(Hash) && value.key?('_plugin')
         unless plugin_supported
-          @errors << "Value at '#{path}' is a plugin reference, which is unsupported at "\
+          @errors << "Value at '#{path}' is a plugin reference, which is unsupported at " \
                       "this location"
         end
 

data/lib/bolt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bolt
-  VERSION = '5.0.0-rc2'
+  VERSION = '5.1.0'
 end

data/lib/bolt_spec/plans/action_stubs.rb

@@ -103,6 +103,7 @@ module BoltSpec
         unless result_set.is_a?(Bolt::ResultSet)
           raise "Return block for #{object} did not return a Bolt::ResultSet"
         end
+
         result_set
       end
 
@@ -110,6 +111,7 @@ module BoltSpec
         unless plan_result.is_a?(Bolt::PlanResult)
           raise "Return block for #{plan_clj.closure_name} did not return a Bolt::PlanResult"
         end
+
         plan_result
       end
 
@@ -144,6 +146,7 @@ module BoltSpec
 
       def return(&block)
         raise "Cannot set return values and return block." if @data_set
+
         @return_block = block
         self
       end
@@ -153,12 +156,14 @@ module BoltSpec
       def return_for_targets(data)
         data.each_with_object(@data) do |(target, result), hsh|
           raise "Mocked results must be hashes: #{target}: #{result}" unless result.is_a? Hash
+
           # set the inventory from the BoltSpec::Plans, otherwise if we try to convert
           # this target to a string, it will fail to string conversion because the
           # inventory is nil
           hsh[target] = result_for(Bolt::Target.new(target, @inventory), **Bolt::Util.walk_keys(result, &:to_sym))
         end
         raise "Cannot set return values and return block." if @return_block
+
         @data_set = true
         self
       end

data/lib/bolt_spec/plans/mock_executor.rb

@@ -251,11 +251,13 @@ module BoltSpec
 
       def queue_execute(targets)
         raise "Unexpected call to apply(#{targets})" unless @allow_apply
+
         targets
       end
 
       def await_results(promises)
         raise "Unexpected call to apply(#{targets})" unless @allow_apply
+
         Bolt::ResultSet.new(promises.map { |target| Bolt::ApplyResult.new(target) })
       end
       # End Apply mocking
@@ -329,8 +331,6 @@ module BoltSpec
 
       def batch_execute(_targets); end
 
-      def finish_plan(_plan_result); end
-
       def handle_event(_event); end
 
       def prompt(_prompt, _options); end
@@ -349,8 +349,6 @@ module BoltSpec
 
       def shutdown; end
 
-      def start_plan(_plan_context); end
-
       def subscribe(_subscriber, _types = nil); end
 
       def unsubscribe(_subscriber, _types = nil); end

data/libexec/apply_catalog.rb

@@ -57,6 +57,7 @@ begin
   # explicitly packaged plugins should take precedence
   args['bolt_builtin_content'].each do |builtin_dir|
     next unless Dir.exist?(builtin_dir)
+
     Dir.foreach(builtin_dir) do |dir|
       unless ['.', '..'].include? dir
         full_path = File.join(builtin_dir, dir, 'lib')
@@ -74,7 +75,7 @@ begin
     begin
       require 'puppet/resource_api/transport'
     rescue LoadError
-      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api " \
             "gem version 1.8.0 or greater is required on the proxy target"
       puts msg
       exit 1

data/libexec/custom_facts.rb

@@ -39,7 +39,7 @@ Dir.mktmpdir do |puppet_root|
     begin
       require 'puppet/resource_api/transport'
     rescue LoadError
-      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api " \
             "gem version 1.8.0 or greater is required on the proxy target"
       puts msg
       exit 1

data/libexec/query_resources.rb

@@ -46,7 +46,7 @@ Dir.mktmpdir do |puppet_root|
     begin
       require 'puppet/resource_api/transport'
     rescue LoadError
-      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api "\
+      msg = "Could not load 'puppet/resource_api/transport', puppet-resource_api " \
             "gem version 1.8.0 or greater is required on the proxy target"
       puts msg
       exit 1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openbolt
 version: !ruby/object:Gem::Version
-  version: 5.0.0.pre.rc2
+  version: 5.1.0
 platform: ruby
 authors:
 - OpenVox Project
@@ -147,26 +147,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: minitar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement
@@ -239,30 +219,22 @@ dependencies:
   name: openvox-strings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: orchestrator_client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: puppetfile-resolver
   requirement: !ruby/object:Gem::Requirement
@@ -306,7 +278,7 @@ dependencies:
         version: '3.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -316,27 +288,21 @@ dependencies:
         version: '3.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: ruby_smb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
@@ -459,14 +425,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Execute commands remotely over SSH and WinRM
 email:
 - openvox@voxpupuli.org
@@ -569,7 +555,6 @@ files:
 - lib/bolt/config/transport/local.rb
 - lib/bolt/config/transport/lxd.rb
 - lib/bolt/config/transport/options.rb
-- lib/bolt/config/transport/orch.rb
 - lib/bolt/config/transport/podman.rb
 - lib/bolt/config/transport/remote.rb
 - lib/bolt/config/transport/ssh.rb
@@ -669,8 +654,6 @@ files:
 - lib/bolt/transport/local/connection.rb
 - lib/bolt/transport/lxd.rb
 - lib/bolt/transport/lxd/connection.rb
-- lib/bolt/transport/orch.rb
-- lib/bolt/transport/orch/connection.rb
 - lib/bolt/transport/podman.rb
 - lib/bolt/transport/podman/connection.rb
 - lib/bolt/transport/remote.rb

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

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../../bolt/error'
-require_relative '../../../bolt/config/transport/base'
-
-module Bolt
-  class Config
-    module Transport
-      class Orch < Base
-        OPTIONS = %w[
-          cacert
-          host
-          job-poll-interval
-          job-poll-timeout
-          read-timeout
-          service-url
-          task-environment
-          token-file
-        ].freeze
-
-        DEFAULTS = {
-          "task-environment" => "production"
-        }.freeze
-
-        private def validate
-          super
-
-          if @config['cacert']
-            @config['cacert'] = File.expand_path(@config['cacert'], @project)
-            Bolt::Util.validate_file('cacert', @config['cacert'])
-          end
-
-          if @config['token-file']
-            @config['token-file'] = File.expand_path(@config['token-file'], @project)
-            Bolt::Util.validate_file('token-file', @config['token-file'])
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-module Bolt
-  module Transport
-    class Orch < Base
-      class Connection
-        attr_reader :logger, :key
-
-        CONTEXT_KEYS = Set.new(%i[plan_name description params sensitive]).freeze
-
-        def self.get_key(opts)
-          [
-            opts['service-url'],
-            opts['task-environment'],
-            opts['token-file']
-          ].join('-')
-        end
-
-        def initialize(opts, plan_context, logger)
-          require 'addressable/uri'
-
-          @logger = logger
-          @key = self.class.get_key(opts)
-          client_opts = opts.slice('token-file', 'cacert', 'job-poll-interval', 'job-poll-timeout', 'read-timeout')
-
-          if opts['service-url']
-            uri = Addressable::URI.parse(opts['service-url'])
-            uri&.port ||= 8143
-            client_opts['service-url'] = uri.to_s
-          end
-
-          client_opts['User-Agent'] = "Bolt/#{VERSION}"
-
-          %w[token-file cacert].each do |f|
-            client_opts[f] = File.expand_path(client_opts[f]) if client_opts[f]
-          end
-          logger.debug("Creating orchestrator client for #{client_opts}")
-          @client = OrchestratorClient.new(client_opts, true)
-          @plan_context = plan_context
-          @plan_job = start_plan(@plan_context)
-          logger.debug("Started plan #{@plan_job}")
-          @environment = opts["task-environment"]
-        end
-
-        def start_plan(plan_context)
-          if plan_context
-            begin
-              opts = plan_context.select { |k, _| CONTEXT_KEYS.include? k }
-              opts[:params] = opts[:params].reject { |k, _| plan_context[:sensitive].include?(k) }
-              @client.command.plan_start(opts)['name']
-            rescue OrchestratorClient::ApiError => e
-              if e.code == '404'
-                @logger.debug("Orchestrator #{key} does not support plans")
-              else
-                @logger.error("Failed to start a plan with orchestrator #{key}: #{e.message}")
-              end
-              nil
-            end
-          end
-        end
-
-        def finish_plan(plan_result)
-          if @plan_job
-            @client.command.plan_finish(
-              plan_job: @plan_job,
-              result: plan_result.value || '',
-              status: plan_result.status
-            )
-          end
-        end
-
-        def get_certnames(targets)
-          targets.map { |t| t.host || t.name }
-        end
-
-        def build_request(targets, task, arguments, description = nil)
-          body = { task: task.name,
-                   environment: @environment,
-                   noop: arguments['_noop'],
-                   params: arguments.reject { |k, _| k.start_with?('_') },
-                   scope: {
-                     nodes: get_certnames(targets)
-                   } }
-          body[:description] = description if description
-          body[:plan_job] = @plan_job if @plan_job
-          body
-        end
-
-        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)
-          @client.post('inventory', nodes: get_certnames(targets))
-        end
-      end
-    end
-  end
-end