foreman_remote_execution 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 692272aa7e7c8d5bc38a8bcf9373d387dcdff4afa82709909bf77d389b29edee
-  data.tar.gz: 0c3e0531fb299378345f13bc4d7b4bc870cf7d659ba84e0363c283ca974b32b7
+SHA1:
+  metadata.gz: 25f04758b068647b6124cb3285bcb3f98ab130f5
+  data.tar.gz: 29f20e013ea7b9f19afe485faf1fafdb0f51fc56
 SHA512:
-  metadata.gz: 724ac1dd282ba907819d8adde27ad8ba8eab5aa1aceb5ecaaeaeba7fedf9c05087b4fa42522ec669db28e398f18d397d45c05c005f9c2a40bfe6a090d2ed790e
-  data.tar.gz: f3a9a2b127a21c8bebb0e3955d314ea57b829b4588347bbc93c3ffb51e90579eed00990143799243a9958c5339428f884f6258ed687e12bf5f12f6f70097698a
+  metadata.gz: ca420660d4db7e9af501f77b6ec8083b2b1014eaf0316bb887179cc491076b3eb6cbe13b255d4e868664e290c7cda18dda1d035d53d577c4f86c2ce4daf844cd
+  data.tar.gz: fa0e3c67c6a03f9afb9084b78c8c4c5666c9d217b1be33c6944fcde3eee2a86d278433c5c8f1d3d72563b389e651ecb60453facbcae4d7302ca5057a672fbce0

data/app/models/remote_execution_provider.rb

@@ -1,4 +1,7 @@
 class RemoteExecutionProvider
+
+  EFFECTIVE_USER_METHODS = %w[sudo su].freeze
+
   class << self
     def provider_for(type)
       providers[type.to_s] || providers[:SSH]
@@ -27,5 +30,47 @@ class RemoteExecutionProvider
     def supports_effective_user?
       false
     end
+
+    def effective_user(template_invocation)
+      template_invocation.effective_user
+    end
+
+    def effective_user_method(host)
+      method = host_setting(host, :remote_execution_effective_user_method)
+      unless EFFECTIVE_USER_METHODS.include?(method)
+        raise _('Effective user method "%{current_value}" is not one of %{valid_methods}') %
+                  { :current_value => method, :valid_methods => EFFECTIVE_USER_METHODS}
+      end
+      method
+    end
+
+    def effective_interfaces(host)
+      interfaces = []
+      %w(execution primary provision).map do |flag|
+        interfaces << host.send(flag + '_interface')
+      end
+      interfaces.compact.uniq
+    end
+
+    def find_ip_or_hostname(host)
+      interfaces = effective_interfaces(host)
+      if host_setting(host, :remote_execution_connect_by_ip)
+        ip_interface = interfaces.find { |i| i.ip.present? }
+      end
+      if ip_interface
+        ip_interface.ip
+      else
+        fqdn_interface = interfaces.find { |i| i.fqdn.present? }
+        if fqdn_interface
+          fqdn_interface.fqdn
+        else
+          raise _('Could not find any suitable interface for execution')
+        end
+      end
+    end
+
+    def host_setting(host, setting)
+      host.params[setting.to_s] || Setting[setting]
+    end
   end
 end

data/app/models/ssh_execution_provider.rb

@@ -1,7 +1,4 @@
 class SSHExecutionProvider < RemoteExecutionProvider
-
-  EFFECTIVE_USER_METHODS = %w[sudo su].freeze
-
   class << self
     def proxy_command_options(template_invocation, host)
       super.merge(:ssh_user => ssh_user(host),
@@ -18,23 +15,6 @@ class SSHExecutionProvider < RemoteExecutionProvider
       true
     end
 
-    def find_ip_or_hostname(host)
-      interfaces = effective_interfaces(host)
-      if host_setting(host, :remote_execution_connect_by_ip)
-        ip_interface = interfaces.find { |i| i.ip.present? }
-      end
-      if ip_interface
-        ip_interface.ip
-      else
-        fqdn_interface = interfaces.find { |i| i.fqdn.present? }
-        if fqdn_interface
-          fqdn_interface.fqdn
-        else
-          raise _('Could not find any suitable interface for execution')
-        end
-      end
-    end
-
     private
 
     def ssh_user(host)
@@ -44,30 +24,5 @@ class SSHExecutionProvider < RemoteExecutionProvider
     def ssh_port(host)
       Integer(host_setting(host, :remote_execution_ssh_port))
     end
-
-    def effective_user(template_invocation)
-      template_invocation.effective_user
-    end
-
-    def effective_user_method(host)
-      method = host_setting(host, :remote_execution_effective_user_method)
-      unless EFFECTIVE_USER_METHODS.include?(method)
-        raise _('Effective user method "%{current_value}" is not one of %{valid_methods}') %
-                  { :current_value => method, :valid_methods => EFFECTIVE_USER_METHODS}
-      end
-      method
-    end
-
-    def effective_interfaces(host)
-      interfaces = []
-      %w(execution primary provision).map do |flag|
-        interfaces << host.send(flag + '_interface')
-      end
-      interfaces.compact.uniq
-    end
-
-    def host_setting(host, setting)
-      host.params[setting.to_s] || Setting[setting]
-    end
   end
 end

data/db/migrate/20150903192731_add_execution_to_interface.rb

@@ -1,19 +1,9 @@
 class AddExecutionToInterface < ActiveRecord::Migration[4.2]
-  class FakeNic < ApplicationRecord
-    self.table_name = 'nics'
-
-    def type
-      Nic::Managed
-    end
-  end
-
   def up
     add_column :nics, :execution, :boolean, :default => false
 
-    FakeNic.reset_column_information
-    FakeNic.all.each do |nic|
-      nic.update_column(:execution, true) if nic.primary
-    end
+    Nic::Managed.reset_column_information
+    Nic::Managed.where(primary: true).update_all(execution: true)
   end
 
   def down

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2018-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -373,7 +373,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config