smart_proxy_remote_execution_ssh 0.4.0 → 0.5.2

data/lib/smart_proxy_remote_execution_ssh/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module RemoteExecution
     module Ssh
-      VERSION = '0.4.0'
+      VERSION = '0.5.2'
     end
   end
 end

data/lib/smart_proxy_remote_execution_ssh.rb

@@ -1,8 +1,7 @@
-require 'foreman_tasks_core'
-require 'smart_proxy_remote_execution_ssh/version'
 require 'smart_proxy_dynflow'
-require 'smart_proxy_remote_execution_ssh/webrick_ext'
+require 'smart_proxy_remote_execution_ssh/version'
 require 'smart_proxy_remote_execution_ssh/plugin'
+require 'smart_proxy_remote_execution_ssh/webrick_ext'
 
 module Proxy::RemoteExecution
   module Ssh
@@ -21,7 +20,9 @@ module Proxy::RemoteExecution
           raise "Ssh public key file #{public_key_file} doesn't exist"
         end
 
+        validate_mode!
         validate_ssh_log_level!
+        validate_mqtt_settings!
       end
 
       def private_key_file
@@ -32,6 +33,35 @@ module Proxy::RemoteExecution
         File.expand_path("#{private_key_file}.pub")
       end
 
+      def validate_mode!
+        Plugin.settings.mode = Plugin.settings.mode.to_sym
+
+        unless Plugin::MODES.include? Plugin.settings.mode
+          raise "Mode has to be one of #{Plugin::MODES.join(', ')}, given #{Plugin.settings.mode}"
+        end
+
+        if Plugin.settings.async_ssh
+          Plugin.logger.warn('Option async_ssh is deprecated, use ssh-async mode instead.')
+
+          case Plugin.settings.mode
+          when :ssh
+            Plugin.logger.warn('Deprecated option async_ssh used together with ssh mode, switching mode to ssh-async.')
+            Plugin.settings.mode = :'ssh-async'
+          when :'ssh-async'
+            # This is a noop
+          else
+            Plugin.logger.warn('Deprecated option async_ssh used together with incompatible mode, ignoring.')
+          end
+        end
+      end
+
+      def validate_mqtt_settings!
+        return unless Plugin.settings.mode == :'pull-mqtt'
+
+        raise 'mqtt_broker has to be set when pull-mqtt mode is used' if Plugin.settings.mqtt_broker.nil?
+        raise 'mqtt_port has to be set when pull-mqtt mode is used' if Plugin.settings.mqtt_port.nil?
+      end
+
       def validate_ssh_log_level!
         wanted_level = Plugin.settings.ssh_log_level.to_s
         levels = Plugin::SSH_LOG_LEVELS
@@ -52,9 +82,10 @@ module Proxy::RemoteExecution
 
         Plugin.settings.ssh_log_level = Plugin.settings.ssh_log_level.to_sym
       end
-    end
 
-    require 'smart_proxy_dynflow_core/task_launcher_registry'
-    SmartProxyDynflowCore::TaskLauncherRegistry.register('ssh', ForemanTasksCore::TaskLauncher::Batch)
+      def job_storage
+        @job_storage ||= Proxy::RemoteExecution::Ssh::JobStorage.new
+      end
+    end
   end
 end

data/settings.d/remote_execution_ssh.yml.example

@@ -4,17 +4,23 @@
 :local_working_dir: '/var/tmp'
 :remote_working_dir: '/var/tmp'
 # :kerberos_auth: false
-# :async_ssh: false
+
+# Mode of operation, one of ssh, ssh-async, pull, pull-mqtt
+:mode: ssh
 
 # Defines how often (in seconds) should the runner check
 # for new data leave empty to use the runner's default
 # (1 second for regular, 60 seconds with async_ssh enabled)
 # :runner_refresh_interval:
 
-# Defines the verbosity of logging coming from Net::SSH
-# one of :debug, :info, :warn, :error, :fatal
+# Defines the verbosity of logging coming from ssh command
+# one of :debug, :info, :error, :fatal
 # must be lower than general log level
-# :ssh_log_level: fatal
+# :ssh_log_level: error
 
 # Remove working directories on job completion
 # :cleanup_working_dirs: true
+
+# MQTT configuration, need to be set if mode is set to pull-mqtt
+# :mqtt_broker: localhost
+# :mqtt_port: 1883

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_remote_execution_ssh
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,35 +109,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.82.0
 - !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
+  name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: smart_proxy_dynflow
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: mqtt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -161,8 +161,10 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- bundler.plugins.d/remote_execution_ssh.rb
+- bundler.d/remote_execution_ssh.rb
 - lib/smart_proxy_remote_execution_ssh.rb
+- lib/smart_proxy_remote_execution_ssh/actions.rb
+- lib/smart_proxy_remote_execution_ssh/actions/pull_script.rb
 - lib/smart_proxy_remote_execution_ssh/actions/run_script.rb
 - lib/smart_proxy_remote_execution_ssh/api.rb
 - lib/smart_proxy_remote_execution_ssh/async_scripts/control.sh
@@ -170,12 +172,15 @@ files:
 - lib/smart_proxy_remote_execution_ssh/cockpit.rb
 - lib/smart_proxy_remote_execution_ssh/dispatcher.rb
 - lib/smart_proxy_remote_execution_ssh/http_config.ru
+- lib/smart_proxy_remote_execution_ssh/job_storage.rb
 - lib/smart_proxy_remote_execution_ssh/log_filter.rb
+- lib/smart_proxy_remote_execution_ssh/net_ssh_compat.rb
 - lib/smart_proxy_remote_execution_ssh/plugin.rb
 - lib/smart_proxy_remote_execution_ssh/runners.rb
 - lib/smart_proxy_remote_execution_ssh/runners/fake_script_runner.rb
 - lib/smart_proxy_remote_execution_ssh/runners/polling_script_runner.rb
 - lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb
+- lib/smart_proxy_remote_execution_ssh/utils.rb
 - lib/smart_proxy_remote_execution_ssh/version.rb
 - lib/smart_proxy_remote_execution_ssh/webrick_ext.rb
 - settings.d/remote_execution_ssh.yml.example