Fixes #33682 - Slightly better handling of async_ssh setting

Author: adamruzicka

lib/smart_proxy_remote_execution_ssh.rb

@@ -40,6 +40,20 @@ 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 :'async-ssh'
+            # 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!

lib/smart_proxy_remote_execution_ssh/plugin.rb

@@ -35,11 +35,6 @@ class Plugin < Proxy::Plugin
 
       Proxy::RemoteExecution::Ssh.validate!
 
-      # TODO: Move into more native methods when available
-      if settings.async_ssh
-        logger.warn('Option async_ssh is deprecated, use ssh-async mode instead.')
-      end
-
       Proxy::Dynflow::TaskLauncherRegistry.register('ssh', Proxy::Dynflow::TaskLauncher::Batch)
     end