smart_proxy_remote_execution_ssh 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 750910e916f0d4ad411cf868636075e597573dd8cca720e414156bcee55331dc
-  data.tar.gz: 4003e71f358abc47847fb9a2e4cf3c211189bc915b6b4196dd02d6d21633d2b8
+  metadata.gz: f90b757baa9c530c89d5c6c960ebf69601b173886c2f74560513592ab78697e4
+  data.tar.gz: edf9bc88acd2f859f86dd15ddee26deb948f6b963ddcd6aee2c6d839e12198ed
 SHA512:
-  metadata.gz: efa2a87ce6a6125f7701979305a0c5fcc1fb3ad2703d5aef140505943789b45648311e46f892791a919a88d757f019485ff45209efc22423cc6543a298224a03
-  data.tar.gz: 4411e680ca841903d47b295090c4a194f92dfe91cc58796272d42b9c370ad6a3e6a8bc34973f0d7a85d93fe604788993428d944277b05426194893ecff0a9d51
+  metadata.gz: 56cb17a0d7ac5eb456533e72e83aaffb07892a725609685f84c95571afa4fb0868dbd4017c4cf5ceadafa35aaf01beca27bdadb424b5bf0c0a5280c704f21e2c
+  data.tar.gz: 04c1feec777172574e45369f48219a6d2ea80e7e704a695198ef56bb11b5d4c178c68650414a190f4e57751521a065ad5c0c649ad8842f99be03259f79f3c9f3

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
@@ -53,8 +52,5 @@ 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)
   end
 end

data/lib/smart_proxy_remote_execution_ssh/actions/run_script.rb

@@ -1,8 +1,9 @@
-require 'foreman_tasks_core/shareable_action'
+require 'smart_proxy_dynflow/action/shareable'
+require 'smart_proxy_dynflow/action/runner'
 
 module Proxy::RemoteExecution::Ssh
   module Actions
-    class RunScript < ForemanTasksCore::Runner::Action
+    class RunScript < Proxy::Dynflow::Action::Runner
       def initiate_runner
         additional_options = {
           :step_id => run_step_id,

data/lib/smart_proxy_remote_execution_ssh/cockpit.rb

@@ -257,7 +257,7 @@ module Proxy::RemoteExecution
         ret[:port] = params["ssh_port"] if params["ssh_port"]
         ret[:keys] = [key_file] if key_file
         ret[:password] = params["ssh_password"] if params["ssh_password"]
-        ret[:passphrase] = params[:ssh_key_passphrase] if params[:ssh_key_passphrase]
+        ret[:passphrase] = params["ssh_key_passphrase"] if params["ssh_key_passphrase"]
         ret[:keys_only] = true
         ret[:auth_methods] = auth_methods
         ret[:verify_host_key] = true

data/lib/smart_proxy_remote_execution_ssh/dispatcher.rb

@@ -1,7 +1,7 @@
-require 'foreman_tasks_core/runner/dispatcher'
+require 'smart_proxy_dynflow/runner/dispatcher'
 
 module Proxy::RemoteExecution::Ssh
-  class Dispatcher < ::ForemanTasksCore::Runner::Dispatcher
+  class Dispatcher < ::Proxy::Dynflow::Runner::Dispatcher
     def refresh_interval
       @refresh_interval ||= Plugin.settings[:runner_refresh_interval] ||
                             Plugin.runner_class::DEFAULT_REFRESH_INTERVAL

data/lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -27,9 +27,10 @@ module Proxy::RemoteExecution::Ssh
       require 'smart_proxy_remote_execution_ssh/dispatcher'
       require 'smart_proxy_remote_execution_ssh/log_filter'
       require 'smart_proxy_remote_execution_ssh/runners'
-      require 'smart_proxy_dynflow_core'
 
       Proxy::RemoteExecution::Ssh.validate!
+
+      Proxy::Dynflow::TaskLauncherRegistry.register('ssh', Proxy::Dynflow::TaskLauncher::Batch)
     end
 
     def self.simulate?

data/lib/smart_proxy_remote_execution_ssh/runners/fake_script_runner.rb

@@ -1,5 +1,5 @@
 module Proxy::RemoteExecution::Ssh::Runners
-  class FakeScriptRunner < ForemanTasksCore::Runner::Base
+  class FakeScriptRunner < ::Proxy::Dynflow::Runner::Base
     DEFAULT_REFRESH_INTERVAL = 1
 
     @data = []

data/lib/smart_proxy_remote_execution_ssh/runners/polling_script_runner.rb

@@ -24,7 +24,7 @@ module Proxy::RemoteExecution::Ssh::Runners
       @callback_host = options[:callback_host]
       @task_id = options[:uuid]
       @step_id = options[:step_id]
-      @otp = ForemanTasksCore::OtpManager.generate_otp(@task_id)
+      @otp = Proxy::Dynflow::OtpManager.generate_otp(@task_id)
     end
 
     def prepare_start
@@ -90,7 +90,7 @@ module Proxy::RemoteExecution::Ssh::Runners
 
     def close
       super
-      ForemanTasksCore::OtpManager.drop_otp(@task_id, @otp) if @otp
+      Proxy::Dynflow::OtpManager.drop_otp(@task_id, @otp) if @otp
     end
 
     def upload_control_scripts
@@ -116,7 +116,7 @@ module Proxy::RemoteExecution::Ssh::Runners
 
     # Generates updates based on the callback data from the manual mode
     def load_event_updates(event_data)
-      continuous_output = ForemanTasksCore::ContinuousOutput.new
+      continuous_output = Proxy::Dynflow::ContinuousOutput.new
       if event_data.key?('output')
         lines = Base64.decode64(event_data['output']).sub(/\A(RUNNING|DONE).*\n/, '')
         continuous_output.add_output(lines, 'stdout')

data/lib/smart_proxy_remote_execution_ssh/runners/script_runner.rb

@@ -96,7 +96,7 @@ module Proxy::RemoteExecution::Ssh::Runners
   end
 
   # rubocop:disable Metrics/ClassLength
-  class ScriptRunner < ForemanTasksCore::Runner::Base
+  class ScriptRunner < Proxy::Dynflow::Runner::Base
     attr_reader :execution_timeout_interval
 
     EXPECTED_POWER_ACTION_MESSAGES = ['restart host', 'shutdown host'].freeze
@@ -278,7 +278,7 @@ module Proxy::RemoteExecution::Ssh::Runners
       ssh_options[:user_known_hosts_file] = prepare_known_hosts if @host_public_key
       ssh_options[:number_of_password_prompts] = 1
       ssh_options[:verbose] = settings[:ssh_log_level]
-      ssh_options[:logger] = Proxy::RemoteExecution::Ssh::LogFilter.new(SmartProxyDynflowCore::Log.instance)
+      ssh_options[:logger] = Proxy::RemoteExecution::Ssh::LogFilter.new(Proxy::Dynflow::Log.instance)
       return ssh_options
     end
 

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.4.1'
     end
   end
 end

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.4.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2021-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,34 +108,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.82.0
-- !ruby/object:Gem::Dependency
-  name: foreman-tasks-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.1
 - !ruby/object:Gem::Dependency
   name: smart_proxy_dynflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +147,7 @@ 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/run_script.rb
 - lib/smart_proxy_remote_execution_ssh/api.rb