foreman_remote_execution 1.6.7 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8984a2dd913e555a9c90380466a664e33a43b07281623ea730737919fe281419
-  data.tar.gz: 2db7e60c25e0cddcabb57f4541850be79fb2cceb65e3a721a81f5e46a06d0bda
+  metadata.gz: dce0a20932dcc7a0f7f85b475d25881bf007b06cfc27534eee15687b102baad4
+  data.tar.gz: 2af8d0ae7541d622fc61e505b5a74f20cf3317e4f5b7ad44338319b5649eb317
 SHA512:
-  metadata.gz: 0c63109a7327c158919bd835707556ca487c9840e901a1a2fa43bb2e9ea8d30c08f3c2d73b33c53f2d1f6dc1214b287fbbec35291e2bdc4573c8f744d29e2458
-  data.tar.gz: fc2ca8b0cd9bb7da6aa789dda541eaead960780e757d085b52fa393918bbfbf9bd4437df07e91c24af7f886178df66baad31afa31e621aa26881672c794b644f
+  metadata.gz: afaf649197e2ac98a5bf5df6c5e7e81a22b06f58d3326a737dcacd4f97a30286cfd787de3c61761f426544fdd7be2a8cd633d06e23cb71caa235e40c75186a77
+  data.tar.gz: 90c8a3b1dd576c05e0e3004023a2980a9d3352c055380b9e629b5495903d680d6912435ddf6039d0e38c532d8d0e28c027a0ae61174202b2ecb2124ec8c4cd0f

data/app/assets/stylesheets/foreman_remote_execution/template_invocation.css.scss

@@ -44,7 +44,7 @@ div.terminal {
   div.line div.content {
     position: relative;
     margin-left: 50px;
-    white-space: pre;
+    white-space: pre-wrap;
   }
 
   a {

data/app/lib/actions/remote_execution/run_host_job.rb

@@ -159,13 +159,12 @@ module Actions
           raise n_('The only applicable proxy %{proxy_names} is down',
                    'All %{count} applicable proxies are down. Tried %{proxy_names}',
                    offline_proxies.count) % settings
-        elsif proxy == :not_defined && !Setting['remote_execution_without_proxy']
+        elsif proxy == :not_defined
           settings = { :global_proxy => 'remote_execution_global_proxy',
-                       :fallback_proxy => 'remote_execution_fallback_proxy',
-                       :no_proxy => 'remote_execution_no_proxy' }
+                       :fallback_proxy => 'remote_execution_fallback_proxy' }
 
           raise _('Could not use any proxy. Consider configuring %{global_proxy}, ' +
-                  '%{fallback_proxy} or %{no_proxy} in settings') % settings
+                  '%{fallback_proxy} in settings') % settings
         end
         proxy
       end

data/app/models/input_template_renderer.rb

@@ -31,6 +31,7 @@ class InputTemplateRenderer
       host: host
     )
     @scope = Foreman::Renderer.get_scope(
+      source: source,
       host: host,
       klass: renderer_scope,
       template_input_values: @template_input_values,

data/app/models/job_invocation_composer.rb

@@ -345,6 +345,11 @@ class JobInvocationComposer
     job_invocation.key_passphrase = params[:key_passphrase]
     job_invocation.sudo_password = params[:sudo_password]
 
+    if @reruns && job_invocation.targeting.static?
+      job_invocation.targeting.host_ids = JobInvocation.find(@reruns).targeting.host_ids
+      job_invocation.targeting.mark_resolved!
+    end
+
     job_invocation.job_category = nil unless rerun_possible?
 
     self

data/app/models/remote_execution_provider.rb

@@ -62,22 +62,21 @@ class RemoteExecutionProvider
     end
 
     def find_ip_or_hostname(host)
-      interfaces = effective_interfaces(host)
+      interfaces = effective_interfaces host
+
+      find_ip(host, interfaces) || find_fqdn(interfaces) || raise(_('Could not find any suitable interface for execution'))
+    end
+
+    def find_ip(host, interfaces)
       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
+        interfaces.find { |i| i.ip.present? }.try(:ip)
       end
     end
 
+    def find_fqdn(interfaces)
+      interfaces.find { |i| i.fqdn.present? }.try(:fqdn)
+    end
+
     def host_setting(host, setting)
       host.host_param(setting.to_s) || Setting[setting]
     end

data/app/models/setting/remote_execution.rb

@@ -20,11 +20,6 @@ class Setting::RemoteExecution < Setting
                  'organization or location.'),
                  true,
                  N_('Enable Global Proxy')),
-        self.set('remote_execution_without_proxy',
-                 N_('When enabled, the remote execution will try to run the commands directly, when no
-                     proxy with remote execution feature is configured for the host.'),
-                 false,
-                 N_('Fallback Without Proxy')),
         self.set('remote_execution_ssh_user',
                  N_('Default user to use for SSH.  You may override per host by setting a parameter called remote_execution_ssh_user.'),
                  'root',

data/app/models/targeting.rb

@@ -36,7 +36,7 @@ class Targeting < ApplicationRecord
     raise ::Foreman::Exception, _('Cannot resolve hosts without a bookmark or search query') if bookmark.nil? && search_query.blank?
 
     self.search_query = bookmark.query if dynamic? && bookmark.present?
-    self.resolved_at = Time.zone.now
+    mark_resolved!
     self.validate!
     # avoid validation of hosts objects - they will be loaded for no reason.
     #   pluck(:id) returns duplicate results for HostCollections
@@ -64,6 +64,10 @@ class Targeting < ApplicationRecord
     self.resolved_at.present?
   end
 
+  def mark_resolved!
+    self.resolved_at = Time.zone.now
+  end
+
   private
 
   def bookmark_or_query_is_present

data/app/views/templates/ssh/puppet_agent_disable.erb

@@ -0,0 +1,16 @@
+<%#
+name: Puppet Agent Disable - SSH Default
+model: JobTemplate
+job_category: Puppet
+description_format: Disable Puppet agent
+snippet: false
+template_inputs:
+- name: comment
+  required: false
+  input_type: user
+  description: Reason for disabling the Puppet agent
+  advanced: false
+provider_type: SSH
+kind: job_template
+-%>
+puppet agent --disable "<%= input("comment").present? ? input("comment") : "Disabled using Foreman Remote Execution"  %> - <%= current_user %> - $(date "+%d/%m/%Y %H:%M")"

data/app/views/templates/ssh/puppet_agent_enable.erb

@@ -0,0 +1,10 @@
+<%#
+name: Puppet Agent Enable - SSH Default
+model: JobTemplate
+job_category: Puppet
+description_format: Enable Puppet agent
+snippet: false
+provider_type: SSH
+kind: job_template
+-%>
+puppet agent --enable

data/app/views/templates/ssh/puppet_install_modules_from_forge.erb

@@ -0,0 +1,36 @@
+<%#
+name: Puppet Module - Install from forge - SSH Default
+model: JobTemplate
+job_category: Puppet
+description_format: Install Puppet Module "%{puppet_module}" from forge
+snippet: false
+template_inputs:
+- name: puppet_module
+  required: true
+  input_type: user
+  description: Full name of the module, e.g. "puppetlabs-stdlib".
+  advanced: false
+- name: target_dir
+  required: false
+  input_type: user
+  description: The directory into which modules are installed, defaults to production environment.
+  advanced: false
+- name: version
+  required: false
+  input_type: user
+  description: Module version to install.
+  advanced: true
+- name: force
+  required: false
+  input_type: user
+  description: Force overwrite of existing module, if any. Type "true" to force.
+  advanced: true
+- name: ignore_dependencies
+  required: false
+  input_type: user
+  description: Do not attempt to install dependencies. Type "true" to ignore dependencies.
+  advanced: true
+provider_type: SSH
+kind: job_template
+-%>
+puppet module install <%= input('puppet_module') %> <%= "--target-dir #{input('target_dir')}" if input('target_dir').present? %> <%= "--version #{input('version')}" if input('version').present? %> <%= "--force" if input('force') == "true" %> <%= "--ignore-dependencies" if input('ignore_dependencies') == "true" %>

data/app/views/templates/ssh/puppet_install_modules_from_git.erb

@@ -0,0 +1,21 @@
+<%#
+name: Puppet Module - Install from git - SSH Default
+model: JobTemplate
+job_category: Puppet
+description_format: Install Puppet Module "%{puppet_module}" from git
+snippet: false
+template_inputs:
+- name: git_repository
+  required: true
+  input_type: user
+  description: "URL to the git repository containing the module, e.g:\r\nhttps://github.com/theforeman/puppet-puppet"
+  advanced: false
+- name: target_dir
+  required: true
+  input_type: user
+  description: For example, '/etc/puppetlabs/code/environments/production/modules/puppet'.
+  advanced: false
+provider_type: SSH
+kind: job_template
+-%>
+git clone <%= input('git_repository') %> <%= input('target_dir') %>

data/db/migrate/20190111153330_remove_remote_execution_without_proxy_setting.rb

@@ -0,0 +1,13 @@
+class RemoveRemoteExecutionWithoutProxySetting < ActiveRecord::Migration[5.2]
+  def up
+    Setting.where(name: 'remote_execution_without_proxy').delete_all
+  end
+
+  def down
+    Setting.create!(:name => 'remote_execution_without_proxy',
+                    :description => N_('When enabled, the remote execution will try to run '\
+                                       'the commands directly, when no proxy with remote execution '\
+                                       'feature is configured for the host.'),
+                    :default => false, :full_name => N_('Fallback Without Proxy'))
+  end
+end

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.6.7'.freeze
+  VERSION = '1.7.0'.freeze
 end

data/test/unit/job_invocation_composer_test.rb

@@ -796,4 +796,20 @@ class JobInvocationComposerTest < ActiveSupport::TestCase
       end
     end
   end
+
+  describe '#from_job_invocation' do
+    let(:job_invocation) do
+      as_admin { FactoryBot.create(:job_invocation, :with_template, :with_task) }
+    end
+
+    before do
+      job_invocation.targeting.host_ids = job_invocation.template_invocations_host_ids
+    end
+
+    it 'marks targeting as resolved if static' do
+      created = JobInvocationComposer.from_job_invocation(job_invocation).job_invocation
+      assert created.targeting.resolved?
+      assert_equal job_invocation.template_invocations_host_ids, created.targeting.host_ids
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.7.0
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -271,6 +271,10 @@ files:
 - app/views/templates/ssh/module_action.erb
 - app/views/templates/ssh/package_action.erb
 - app/views/templates/ssh/power_action.erb
+- app/views/templates/ssh/puppet_agent_disable.erb
+- app/views/templates/ssh/puppet_agent_enable.erb
+- app/views/templates/ssh/puppet_install_modules_from_forge.erb
+- app/views/templates/ssh/puppet_install_modules_from_git.erb
 - app/views/templates/ssh/puppet_run_once.erb
 - app/views/templates/ssh/run_command.erb
 - app/views/templates/ssh/service_action.erb
@@ -314,6 +318,7 @@ files:
 - db/migrate/20180202123215_add_feature_id_to_job_invocation.rb
 - db/migrate/20180226095631_change_task_id_to_uuid.rb
 - db/migrate/20180411160809_add_sudo_password_to_job_invocation.rb
+- db/migrate/20190111153330_remove_remote_execution_without_proxy_setting.rb
 - db/seeds.d/50-notification_blueprints.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
@@ -409,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A plugin bringing remote execution to the Foreman, completing the config