foreman_remote_execution 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910d4fd508188efbad4cfb121085171d077d65881e7ef8b5c9f1dea4092aa182
-  data.tar.gz: af7a5ca195d2b0d6ba269962bb3d726cd19dd6cc23358e6e6dc21cc77b36b3b2
+  metadata.gz: 71b09dd41d7ce39e709e4a45c2c78926d53151ed3625fcf2f4e0d739853cae8e
+  data.tar.gz: d01463507ceb52b52f661fa9a55ce413e2f824d74dfe50958063359f5a6fa8e9
 SHA512:
-  metadata.gz: 030ed44dd17a6da7b334f3c3621d34cec9d4afc6323f2cbacd1054716520dc4f955f5da4d0aa5bfb93b0f83699c6dd15a3d75a9ff770fa1b9c5d6df2afbba440
-  data.tar.gz: 80d41c53f5e1620919069e08a97b23d22d884406275ad426b49ee08c97dc92c958762fe79ff5bb703b63859f1551fb3cfad838f1b63e75cbc143983dc864e7fd
+  metadata.gz: 2840a0f11ef02ba63f3a981075eae66e50e5fa0f7738518c3bf3a74f0bf5b7cf6be3273c2ebb999d00174244fb73295b3d0f8c74b663ef9839a91a16ad9c9878
+  data.tar.gz: 79a0dad8442b9135995a8bcbf62dfde4e112cd765950b61f45db0c490eac0d21e3cf843aea946c2450f69ab8f4d098fe26927b4eafe4cd0b7d6a1097ba04ceb9

data/app/models/concerns/foreman_remote_execution/host_extensions.rb

@@ -102,7 +102,7 @@ module ForemanRemoteExecution
     end
 
     def remote_execution_ssh_keys
-      remote_execution_proxies('SSH', false).values.flatten.uniq.map { |proxy| proxy.pubkey }.compact.uniq
+      remote_execution_proxies(%w(SSH Script), false).values.flatten.uniq.map { |proxy| proxy.pubkey }.compact.uniq
     end
 
     def drop_execution_interface_cache

data/app/models/concerns/foreman_remote_execution/smart_proxy_extensions.rb

@@ -11,7 +11,7 @@ module ForemanRemoteExecution
     end
 
     def update_pubkey
-      return unless has_feature?('SSH')
+      return unless has_feature?(%w(SSH Script))
 
       key = ::ProxyAPI::RemoteExecutionSSH.new(:url => url).pubkey
       self.update_attribute(:pubkey, key) if key

data/app/models/job_invocation_composer.rb

@@ -217,7 +217,7 @@ class JobInvocationComposer
     def format_datetime(datetime)
       return datetime if datetime.blank?
 
-      Time.parse(datetime).utc.strftime('%Y-%m-%d %H:%M')
+      Time.parse(datetime).in_time_zone.strftime('%Y-%m-%d %H:%M')
     end
   end
 

data/app/models/ssh_execution_provider.rb

@@ -37,8 +37,7 @@ class ScriptExecutionProvider < RemoteExecutionProvider
     end
 
     def ssh_params(host)
-      proxy_selector = ::RemoteExecutionProxySelector.new
-      proxy = proxy_selector.determine_proxy(host, 'SSH')
+      proxy = proxy_for_cockpit(host)
       {
         :hostname => find_ip_or_hostname(host),
         :proxy => proxy.class == Symbol ? proxy : proxy.url,
@@ -54,7 +53,7 @@ class ScriptExecutionProvider < RemoteExecutionProvider
     end
 
     def proxy_feature
-      'SSH'
+      %w(SSH Script)
     end
 
     private
@@ -66,6 +65,14 @@ class ScriptExecutionProvider < RemoteExecutionProvider
     def ssh_port(host)
       Integer(host_setting(host, :remote_execution_ssh_port))
     end
+
+    def proxy_for_cockpit(host)
+      proxy_selector = ::RemoteExecutionProxySelector.new
+      proxy = proxy_selector.determine_proxy(host, 'Script', capability: 'cockpit')
+      return proxy unless [:not_defined, :not_available, nil].include?(proxy)
+
+      proxy_selector.determine_proxy(host, 'SSH')
+    end
   end
 end
 

data/app/services/default_proxy_proxy_selector.rb

@@ -7,7 +7,7 @@ class DefaultProxyProxySelector < ::RemoteExecutionProxySelector
     super
   end
 
-  def available_proxies(host, provider)
+  def available_proxies(host, provider, capability: nil)
     # TODO: Once we have a internal proxy marker/feature on the proxy, we can
     # swap the implementation
     raise _('default_capsule method missing from SmartProxy') unless ::SmartProxy.respond_to?(:default_capsule)

data/app/services/remote_execution_proxy_selector.rb

@@ -2,7 +2,12 @@ class RemoteExecutionProxySelector < ::ForemanTasks::ProxySelector
 
   INTERNAL_PROXY = 'internal'.freeze
 
-  def available_proxies(host, provider)
-    host.remote_execution_proxies(provider)
+  def available_proxies(host, provider, capability: nil)
+    proxies = host.remote_execution_proxies(provider)
+    return proxies if capability.nil?
+
+    proxies.reduce({}) do |acc, (strategy, possible_proxies)|
+      acc.merge(strategy => possible_proxies.select { |proxy| proxy.has_capability?(capability) })
+    end
   end
 end

data/db/seeds.d/60-ssh_proxy_feature.rb

@@ -1,2 +1,5 @@
 f = Feature.where(:name => 'SSH').first_or_create
 raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+
+f = Feature.where(:name => 'Script').first_or_create
+raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '6.1.0'.freeze
+  VERSION = '6.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-31 00:00:00.000000000 Z
+date: 2022-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -545,7 +545,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config