Fixes #38927 - Drop async-ssh

Author: adamruzicka

lib/smart_proxy_remote_execution_ssh.rb

@@ -27,20 +27,6 @@ def validate_mode!
         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!
@@ -97,11 +83,11 @@ def validate_ssh_log_level!
       end
 
       def requires_configured_ssh?
-        %i[ssh ssh-async].include?(Plugin.settings.mode) || Plugin.settings.cockpit_integration
+        Plugin.settings.mode == :ssh || Plugin.settings.cockpit_integration
       end
 
       def validate_socket_path!
-        return unless Plugin.settings.mode == :'ssh' || Plugin.settings.mode == :'ssh-async'
+        return unless Plugin.settings.mode == :'ssh'
 
         socket_path = File.expand_path(Plugin.settings.socket_working_dir)
         raise "Socket path #{socket_path} is too long" if socket_path.length > Plugin::SOCKET_PATH_MAX_LENGTH

lib/smart_proxy_remote_execution_ssh/actions/run_script.rb

@@ -7,7 +7,7 @@ class RunScript < ::Dynflow::Action
       def plan(*args)
         mode = Proxy::RemoteExecution::Ssh::Plugin.settings.mode
         case mode
-        when :ssh, :'ssh-async'
+        when :ssh
           plan_action(ScriptRunner, *args)
         when :pull, :'pull-mqtt'
           plan_action(PullScript, *args)

lib/smart_proxy_remote_execution_ssh/async_scripts/control.sh

@@ -1,7 +1,7 @@
 module Proxy::RemoteExecution::Ssh
   class Plugin < Proxy::Plugin
     SSH_LOG_LEVELS = %w[debug info error fatal].freeze
-    MODES = %i[ssh ssh-async pull pull-mqtt].freeze
+    MODES = %i[ssh pull pull-mqtt].freeze
     # Unix domain socket path length is limited to 104 (on some platforms) characters
     # Socket path is composed of custom path (max 49 characters) + job id (37 characters)
     # + offset(17 characters) + null terminator
@@ -61,8 +61,6 @@ def self.simulate?
     def self.runner_class
       @runner_class ||= if simulate?
                           Runners::FakeScriptRunner
-                        elsif settings.mode == :'ssh-async'
-                          Runners::PollingScriptRunner
                         else
                           Runners::ScriptRunner
                         end

lib/smart_proxy_remote_execution_ssh/async_scripts/retrieve.sh

@@ -1,7 +1,6 @@
 module Proxy::RemoteExecution::Ssh
   module Runners
     require 'smart_proxy_remote_execution_ssh/runners/script_runner'
-    require 'smart_proxy_remote_execution_ssh/runners/polling_script_runner'
     require 'smart_proxy_remote_execution_ssh/runners/fake_script_runner'
   end
 end