smart_proxy_openbolt 0.1.1 → 1.2.0

data/lib/smart_proxy_openbolt/task_job.rb

@@ -1,7 +1,6 @@
 require 'json'
 require 'smart_proxy_openbolt/error'
 require 'smart_proxy_openbolt/job'
-require 'smart_proxy_openbolt/main'
 require 'smart_proxy_openbolt/result'
 
 module Proxy::OpenBolt
@@ -16,58 +15,54 @@ module Proxy::OpenBolt
     end
 
     def execute
-      command = get_cmd
-      stdout, stderr, status = Proxy::OpenBolt.openbolt(command)
-      Proxy::OpenBolt::Result.new(
-        Proxy::OpenBolt.scrub(@options, command),
+      command = ['bolt', 'task', 'run', @name,
+                 '--targets', @targets.join(','),
+                 '--no-save-rerun',
+                 "--concurrency=#{Plugin.settings.concurrency}",
+                 "--connect-timeout=#{Plugin.settings.connect_timeout}",
+                 '--project', Plugin.settings.environment_path,
+                 '--format', 'json',
+                 '--no-color']
+      command.concat(parse_options)
+      command.concat(parse_parameters)
+      stdout, stderr, exitcode = Proxy::OpenBolt.openbolt(command)
+      Result.new(
+        Proxy::OpenBolt.scrub(@options, command.join(' ')),
         Proxy::OpenBolt.scrub(@options, stdout),
         Proxy::OpenBolt.scrub(@options, stderr),
-        status.exitstatus
+        exitcode
       )
     end
 
-    def get_cmd
-      # Service config settings (not per-task)
-      concurrency = "--concurrency=#{Proxy::OpenBolt::Plugin.settings.concurrency}"
-      connect_timeout = "--connect-timeout=#{Proxy::OpenBolt::Plugin.settings.connect_timeout}"
-      "bolt task run #{@name} --targets #{@targets.join(',')} --no-save-rerun #{concurrency} #{connect_timeout} --project #{Proxy::OpenBolt::Plugin.settings.environment_path} --format json --no-color #{parse_options} #{parse_parameters}"
-    end
-
     def parse_parameters
-      params = []
-      @parameters.each do |key, value|
-        if value.is_a?(Array)
-          params << "#{key}='#{value}'"
-        elsif value.is_a?(Hash)
-          params << "#{key}='#{value.to_json}'"
-        else
-          params << "#{key}=#{value}"
-        end
+      @parameters.map do |key, value|
+        formatted = value.is_a?(Array) || value.is_a?(Hash) ? value.to_json : value
+        "#{key}=#{formatted}"
       end
-      params.join(' ')
     end
 
     def parse_options
-      opt_str = ''
-      if @options
-        @options.each do |key, value|
-          # --noop doesn't have a --[no-] prefix
-          next if key == 'noop' && value.is_a?(FalseClass)
-          # For some mindboggling reason, there are both '--log-level trace'
-          # and '--trace' options. We only expose log level, so just
-          # tack on --trace if that's what we find.
-          if key == 'log-level' && value == 'trace'
-            opt_str += "--log-level=trace --trace "
-          elsif value.is_a?(TrueClass)
-            opt_str += "--#{key} "
-          elsif value.is_a?(FalseClass)
-            opt_str += "--no-#{key} "
-          else
-            opt_str += "--#{key}=#{value} "
-          end
+      opts = []
+      return opts unless @options
+
+      @options.each do |key, value|
+        # --noop doesn't have a --[no-] prefix
+        next if key == 'noop' && value.is_a?(FalseClass)
+        # For some mindboggling reason, there are both '--log-level trace'
+        # and '--trace' options. We only expose log level, so just
+        # tack on --trace if that's what we find.
+        if key == 'log-level' && value == 'trace'
+          opts << '--log-level=trace'
+          opts << '--trace'
+        elsif value.is_a?(TrueClass)
+          opts << "--#{key}"
+        elsif value.is_a?(FalseClass)
+          opts << "--no-#{key}"
+        else
+          opts << "--#{key}=#{value}"
         end
       end
-      opt_str
+      opts
     end
   end
 end

data/lib/smart_proxy_openbolt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module OpenBolt
-    VERSION = '0.1.1'
+    VERSION = '1.2.0'.freeze
   end
 end

data/settings.d/openbolt.yml

@@ -1,3 +1,4 @@
+# OpenBolt Smart Proxy
 ---
 :enabled: https
 :environment_path: /etc/puppetlabs/code/environments/production

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_openbolt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Overlook InfraTech
@@ -42,10 +42,12 @@ files:
 - bundler.d/openbolt.rb
 - lib/smart_proxy_openbolt.rb
 - lib/smart_proxy_openbolt/api.rb
+- lib/smart_proxy_openbolt/config/choria-client.conf
 - lib/smart_proxy_openbolt/error.rb
 - lib/smart_proxy_openbolt/executor.rb
 - lib/smart_proxy_openbolt/http_config.ru
 - lib/smart_proxy_openbolt/job.rb
+- lib/smart_proxy_openbolt/lru_cache.rb
 - lib/smart_proxy_openbolt/main.rb
 - lib/smart_proxy_openbolt/plugin.rb
 - lib/smart_proxy_openbolt/result.rb
@@ -55,7 +57,8 @@ files:
 homepage: http://github.com/overlookinfra/smart_proxy_openbolt
 licenses:
 - GPL-3.0-only
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -70,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Smart Proxy plugin for OpenBolt integration
 test_files: []