foreman_ansible 10.2.0 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ba3f014f5ac02d3364334eb15efeeb9572b802765a9d8ffea9be3d3fd19c3d
-  data.tar.gz: cc56b4ff89156afee500563975542d1a98d82bc49929d6f2c056fbcc74149500
+  metadata.gz: 348701b380a514ccae60dda27305a137438dd4cd2812f9515e071a527a0b20c5
+  data.tar.gz: ab770d603437ed890a945381d28411e0caff547f6bef26b22c98191fe6317b98
 SHA512:
-  metadata.gz: 91c980eef1c77f9d856dad9fff7acaca458bb17c5d8736cd50e11c87a2b01ccba5b87c07e025b57e1c4e493b91909607f4236107e99ab419faa66ac00b4b374c
-  data.tar.gz: 415fda190f9d33d7e31f34567aa4601724b789045e48813f0668a36e58bbf3a7ec414d99bdc8ca97ac9b564f55861b0ae678f1ef11cb197405572b51a52d083e
+  metadata.gz: 0a780ccd49ae7534e43de5ea1f50aab631b3f59c30c5793455e242568b77d2572fe187f7f0c75667cb1c22ccfd03666dd2ce7df2541cb974df1693ff58079250
+  data.tar.gz: ab9bdea79a470967e8c6592d7166317668a5d9f892887b8d715fc1daaa9a8ce99959cb5c4da2496dabf4b9e4d2ada5909c2e78bfa250bcd13d2250d7d32a1473

data/app/controllers/concerns/foreman/controller/parameters/job_template_extensions.rb

@@ -0,0 +1,17 @@
+module Foreman
+  module Controller
+    module Parameters
+      module JobTemplateExtensions
+        extend ActiveSupport::Concern
+
+        class_methods do
+          def job_template_params_filter
+            super.tap do |filter|
+              filter.permit :ansible_callback_enabled
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/foreman_ansible/api/v2/job_templates_controller_extensions.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module ForemanAnsible
+  module Api
+    module V2
+      # Extends the job_templates api controller to support creating/updating with ansible callback plugin
+      module JobTemplatesControllerExtensions
+        extend Apipie::DSL::Concern
+
+        update_api(:create, :update) do
+          param :job_template, Hash do
+            param :ansible_callback_enabled, :bool, :desc => N_('Enable the callback plugin for this template')
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -27,6 +27,8 @@ module ForemanAnsible
 
     def ansible_module_message(log)
       msg_json = parsed_message_json(log)
+      return _("Execution error: #{msg_json['msg']}") if msg_json['failed'].present?
+
       module_action = msg_json['module']
       case module_action
       when 'package'
@@ -67,6 +69,17 @@ module ForemanAnsible
       false
     end
 
+    def show_full_error_message_value(message_value)
+      tag.div class: 'replace-hidden-value' do
+        link_to_function(icon_text('plus', '', class: 'small'), 'replace_value_control(this, "div")',
+                         title: _('Show full value'),
+                         class: 'replace-hidden-value pull-right') +
+          (tag.span class: 'full-value' do
+            message_value
+          end)
+      end
+    end
+
     private
 
     def parsed_message_json(log)

data/app/models/foreman_ansible/ansible_provider.rb

@@ -123,7 +123,7 @@ if defined? ForemanRemoteExecution
 
         def ansible_command?(template)
           template.remote_execution_features.
-            where(:label => 'ansible_run_host').empty?
+            where(:label => 'ansible_run_host').empty? && !template.ansible_callback_enabled
         end
       end
     end

data/app/views/api/v2/job_templates/job_templates.json.rabl

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+attributes :ansible_callback_enabled

data/app/views/foreman_ansible/config_reports/_ansible.html.erb

@@ -29,8 +29,12 @@
                 <% end %>
               </ul>
             <% else %>
-              <%= log_message %>
-          <% end %>
+              <% allowed_length = 150 %>
+              <div class='pull-left'>
+                <%= truncate(log_message, length: allowed_length) %>
+              </div>
+              <%= show_full_error_message_value(log_message) if log_message.length > allowed_length %>
+            <% end %>
           </td>
         </tr>
       <% end %>

data/app/views/job_templates/_job_template_callback_tab_content.html.erb

@@ -0,0 +1,3 @@
+<div class="tab-pane" id="ansible_callback_enabled">
+  <%= checkbox_f f, :ansible_callback_enabled, :label => _('Enable Ansible Callback'), :disabled => @template.locked? %>
+</div>

data/app/views/job_templates/_job_template_callback_tab_headers.html.erb

@@ -0,0 +1,13 @@
+<li><a id="ansible_tab_header" href="#ansible_callback_enabled" data-toggle="tab"><%= _("Ansible") %></a></li>
+<script type="text/javascript">
+    $(document).ready(function () {
+        var provider_type = $('#job_template_provider_type');
+        provider_type.change(setAnsibleTabVisibilityByProvider);
+        provider_type.change();
+
+        function setAnsibleTabVisibilityByProvider() {
+            var tab_header = $("#ansible_tab_header");
+            this.value === 'Ansible' ? tab_header.show() : tab_header.hide();
+        }
+    });
+</script>

data/db/migrate/20221003153000_add_ansible_callback_enabled_to_templates.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddAnsibleCallbackEnabledToTemplates < ActiveRecord::Migration[6.0]
+  def change
+    add_column :templates, :ansible_callback_enabled, :boolean, default: false
+    RemoteExecutionFeature.where(label: 'ansible_run_host').each do |rex_feature|
+      Template.find(rex_feature.job_template_id).update(ansible_callback_enabled: true)
+    end
+  end
+end

data/lib/foreman_ansible/engine.rb

@@ -74,6 +74,9 @@ module ForemanAnsible
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
       ::ConfigReportImporter.include ForemanAnsible::AnsibleReportImporter
+      ::Api::V2::JobTemplatesController.include ForemanAnsible::Api::V2::JobTemplatesControllerExtensions
+      ::Api::V2::JobTemplatesController.include Foreman::Controller::Parameters::JobTemplateExtensions
+      ::JobTemplatesController.include Foreman::Controller::Parameters::JobTemplateExtensions
       ReportImporter.register_smart_proxy_feature('Ansible')
     rescue StandardError => e
       Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"

data/lib/foreman_ansible/register.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.5'
+  requires_foreman '>= 3.6'
 
   settings do
     category :ansible, N_('Ansible') do
@@ -237,6 +237,8 @@ Foreman::Plugin.register :foreman_ansible do
     register_report_origin 'Ansible', 'ConfigReport'
   end
 
+  extend_rabl_template 'api/v2/job_templates/show', 'api/v2/job_templates/job_templates'
+
   describe_host do
     multiple_actions_provider :ansible_hosts_multiple_actions
   end
@@ -257,4 +259,16 @@ Foreman::Plugin.register :foreman_ansible do
                         :partial => 'foreman/smart_proxies/update_smart_proxy',
                         :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
   end
+  extend_page('templates/_form') do |context|
+    context.add_pagelet :tab_headers,
+                        :name => _('Ansible'),
+                        :partial => 'job_templates/job_template_callback_tab_headers',
+                        :onlyif => ->(subject, _view) { subject.is_a? JobTemplate }
+  end
+  extend_page('templates/_form') do |context|
+    context.add_pagelet :tab_content,
+                        :name => _('Ansible'),
+                        :partial => 'job_templates/job_template_callback_tab_content',
+                        :onlyif => ->(subject, _view) { subject.is_a? JobTemplate }
+  end
 end

data/lib/foreman_ansible/version.rb

@@ -4,5 +4,5 @@
 # This way other parts of Foreman can just call ForemanAnsible::VERSION
 # and detect what version the plugin is running.
 module ForemanAnsible
-  VERSION = '10.2.0'
+  VERSION = '11.0.0'
 end

data/test/unit/ansible_provider_test.rb

@@ -12,16 +12,15 @@ class AnsibleProviderTest < ActiveSupport::TestCase
       assert command_options['ansible_inventory']
     end
 
-    context 'when it is not using the ansible_run_host feature' do
+    context 'when ansible_callback_enabled is set to false' do
       it 'sets enables :remote_execution_command to true' do
         assert command_options[:remote_execution_command]
       end
     end
 
-    context 'when it is using the ansible_run_host feature' do
+    context 'when ansible_callback_enabled is set to true' do
       it 'has remote_execution_command false' do
-        rex_feature = RemoteExecutionFeature.where(:label => 'ansible_run_host', :name => 'Run Ansible roles').first_or_create
-        template_invocation.template.remote_execution_features << rex_feature
+        template_invocation.template.ansible_callback_enabled = true
         assert_not command_options[:remote_execution_command]
       end
     end

data/test/unit/helpers/ansible_reports_helper_test.rb

@@ -19,4 +19,18 @@ ANSIBLELOG
       ansible_module_message(log).to_s
     )
   end
+
+  test 'module message extraction with error' do
+    log_value = <<-ANSIBLELOG.strip_heredoc
+    {"msg": "AnsibleUndefinedVariable", "changed": false, "_ansible_no_log": false, "failed": true, "module": "template", "exception": "raise AnsibleUndefinedVariable"}
+ANSIBLELOG
+    message = FactoryBot.build(:message, value: log_value)
+    log = FactoryBot.build(:log, message: message)
+    log.message = message
+
+    assert_match(
+      'Execution error: AnsibleUndefinedVariable',
+      ansible_module_message(log).to_s
+    )
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 11.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,22 +42,16 @@ dependencies:
   name: foreman_remote_execution
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '8.0'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
@@ -92,10 +86,12 @@ files:
 - app/controllers/api/v2/ansible_variables_controller.rb
 - app/controllers/concerns/foreman/controller/parameters/ansible_override_value.rb
 - app/controllers/concerns/foreman/controller/parameters/ansible_variable.rb
+- app/controllers/concerns/foreman/controller/parameters/job_template_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_controller_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hostgroups_param_group_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hosts_controller_extensions.rb
 - app/controllers/foreman_ansible/api/v2/hosts_param_group_extensions.rb
+- app/controllers/foreman_ansible/api/v2/job_templates_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/api_common.rb
 - app/controllers/foreman_ansible/concerns/hostgroups_controller_extensions.rb
 - app/controllers/foreman_ansible/concerns/hosts_controller_extensions.rb
@@ -178,6 +174,7 @@ files:
 - app/views/api/v2/ansible_variables/show.json.rabl
 - app/views/api/v2/hostgroups/ansible_roles.json.rabl
 - app/views/api/v2/hosts/ansible_roles.json.rabl
+- app/views/api/v2/job_templates/job_templates.json.rabl
 - app/views/foreman/smart_proxies/_update_smart_proxy.html.erb
 - app/views/foreman_ansible/ansible_roles/_select_tab_content.html.erb
 - app/views/foreman_ansible/ansible_roles/_select_tab_title.html.erb
@@ -204,6 +201,8 @@ files:
 - app/views/foreman_ansible/job_templates/run_playbook-ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/service_action_-_enable_web_console.erb
+- app/views/job_templates/_job_template_callback_tab_content.html.erb
+- app/views/job_templates/_job_template_callback_tab_headers.html.erb
 - app/views/ui_ansible_roles/index.json.rabl
 - app/views/ui_ansible_roles/main.json.rabl
 - app/views/ui_ansible_roles/show.json.rabl
@@ -223,6 +222,7 @@ files:
 - db/migrate/20200421201839_update_ansible_inv_template_name.rb
 - db/migrate/20210120150019_add_position_to_ansible_role.rb
 - db/migrate/20210818083407_fix_ansible_setting_category_to_dsl.rb
+- db/migrate/20221003153000_add_ansible_callback_enabled_to_templates.rb
 - db/migrate/20221031114720_rename_capsule_upgrade_playbook.rb
 - db/seeds.d/100_common_parameters.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
@@ -467,7 +467,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
@@ -477,21 +477,21 @@ test_files:
 - test/factories/ansible_variables.rb
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
+- test/fixtures/playbooks_example_output.json
 - test/fixtures/report.json
 - test/fixtures/sample_facts.json
-- test/fixtures/playbooks_example_output.json
 - test/fixtures/sample_playbooks.json
 - test/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/functional/ansible_roles_controller_test.rb
 - test/functional/ansible_variables_controller_test.rb
 - test/functional/api/v2/ansible_inventories_controller_test.rb
+- test/functional/api/v2/ansible_playbooks_controller_test.rb
 - test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
-- test/functional/api/v2/ansible_playbooks_controller_test.rb
-- test/functional/ui_ansible_roles_controller_test.rb
 - test/functional/hosts_controller_test.rb
+- test/functional/ui_ansible_roles_controller_test.rb
 - test/graphql/mutations/hosts/assign_ansible_roles_mutation_test.rb
 - test/graphql/queries/ansible_roles_query_test.rb
 - test/graphql/queries/host_ansible_roles_query_test.rb
@@ -505,6 +505,7 @@ test_files:
 - test/unit/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
 - test/unit/ignore_roles_test.rb
+- test/unit/import_playbooks_test.rb
 - test/unit/import_roles_and_variables.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
@@ -515,6 +516,5 @@ test_files:
 - test/unit/services/override_resolver_test.rb
 - test/unit/services/roles_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
-- test/unit/import_playbooks_test.rb
 - test/unit/ansible_provider_test.rb
 - test/integration/hostgroup_js_test.rb