foreman_ansible 10.4.4 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fafa20eedfebfae90bd8eb981b1879ef7444f4f3a661d2ddb65231df477d6901
-  data.tar.gz: 60f8a8ad775ade5183c9fe3cf4374210e8e6dc93613970fe8c46a6de6ff58ad9
+  metadata.gz: 348701b380a514ccae60dda27305a137438dd4cd2812f9515e071a527a0b20c5
+  data.tar.gz: ab770d603437ed890a945381d28411e0caff547f6bef26b22c98191fe6317b98
 SHA512:
-  metadata.gz: 64e4ff37e73336ed4cf530d1050ae75f0c6c4a86736e8ed0ea1b89742727672b43a3b8165fd946f0aa0eb75d2b1a514f43ac77f38cc94c436bf27b86e427a671
-  data.tar.gz: cfb54327ff40818064d3225b77d2d8ce89f6f36880323e76df44cf366acd61b7b5fb03e584c1e3119b447a7d3a07690d2c3218d3945fc28e3e514bc23f6a8aed
+  metadata.gz: 0a780ccd49ae7534e43de5ea1f50aab631b3f59c30c5793455e242568b77d2572fe187f7f0c75667cb1c22ccfd03666dd2ce7df2541cb974df1693ff58079250
+  data.tar.gz: ab9bdea79a470967e8c6592d7166317668a5d9f892887b8d715fc1daaa9a8ce99959cb5c4da2496dabf4b9e4d2ada5909c2e78bfa250bcd13d2250d7d32a1473

data/app/graphql/types/overriden_ansible_variable.rb

@@ -8,14 +8,12 @@ module Types
       argument :match, String, required: false
     end
 
-    field :meta, ::Types::Meta
-
-    def meta
+    field :meta, ::Types::Meta, resolve: (proc do |object|
       {
         :can_edit => ::User.current.can?(object.ansible_variable.permission_name(:edit), object.ansible_variable),
         :can_destroy => ::User.current.can?(object.ansible_variable.permission_name(:destroy), object.ansible_variable)
       }
-    end
+    end)
 
     def lookup_values(match: nil)
       return CollectionLoader.for(object.ansible_variable.class, :lookup_values).load(object.ansible_variable) unless match

data/app/helpers/foreman_ansible/ansible_hostgroups_helper.rb

@@ -3,39 +3,13 @@
 module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
-      actions = []
-      is_hostgroup_empty = hostgroup.all_ansible_roles.empty? || hostgroup.hosts_count.zero?
+      play_roles = if hostgroup.all_ansible_roles.empty?
+                     { action: { content: (link_to _('Run all Ansible roles'), 'javascript:void(0);', disabled: true, title: 'No roles assigned', class: 'disabled'), options: { class: 'disabled' } }, priority: 31 }
+                   else
+                     { action: display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group')), priority: 31 }
+                   end
 
-      if User.current.can?(:create_job_invocations)
-        actions << {
-          action: if is_hostgroup_empty
-                    disabled_action_link(_('Run all Ansible roles'))
-                  else
-                    display_link_if_authorized(_('Run all Ansible roles'), hash_for_play_roles_hostgroup_path(id: hostgroup), 'data-no-turbolink': true, title: _('Run all Ansible roles on hosts belonging to this host group'))
-                  end,
-          priority: 31
-        }
-      end
-
-      if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
-        actions << {
-          action: if is_hostgroup_empty
-                    disabled_action_link(_('Configure Ansible Job'))
-                  else
-                    link_to(_('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la')
-                  end,
-          priority: 32
-        }
-      end
-
-      actions
-    end
-
-    def disabled_action_link(text)
-      {
-        content: link_to(text, 'javascript:void(0);', disabled: true, title: _('No roles/hosts assigned'), class: 'disabled'),
-        options: { class: 'disabled' }
-      }
+      [play_roles] if User.current.can?(:create_job_invocations)
     end
   end
 end

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -28,36 +28,26 @@ module ForemanAnsible
     def ansible_module_message(log)
       msg_json = parsed_message_json(log)
       return _("Execution error: #{msg_json['msg']}") if msg_json['failed'].present?
-      return msg_json['censored'] if msg_json['censored'].present?
 
-      module_action = msg_json.fetch('module', '').delete_prefix('ansible.builtin.').delete_prefix('ansible.legacy.')
+      module_action = msg_json['module']
       case module_action
       when 'package'
         msg_json['results'].empty? ? msg_json['msg'] : msg_json['results']
       when 'template'
-        get_results(msg_json) do |module_args, result|
-          _("Rendered template #{module_args['_original_basename']} to #{result['dest']}")
-        end
+        module_args = msg_json['invocation']['module_args']
+        _("Rendered template #{module_args['_original_basename']} to #{msg_json['dest']}")
       when 'service'
-        get_results(msg_json) do |_, result|
-          _("Service #{result['name']} #{result['state']} (enabled: #{result['enabled']})")
-        end
+        _("Service #{msg_json['name']} #{msg_json['state']} (enabled: #{msg_json['enabled']})")
       when 'group'
-        get_results(msg_json) do |_, result|
-          _("User group #{result['name']} #{result['state']}, gid: #{result['gid']}")
-        end
+        _("User group #{msg_json['name']} #{msg_json['state']}, gid: #{msg_json['gid']}")
       when 'user'
-        get_results(msg_json) do |_, result|
-          _("User #{result['name']} #{result['state']}, uid: #{result['uid']}")
-        end
+        _("User #{msg_json['name']} #{msg_json['state']}, uid: #{msg_json['uid']}")
       when 'cron'
-        get_results(msg_json) do |module_args, _|
-          _("Cron job: #{module_args['minute']} #{module_args['hour']} #{module_args['day']} #{module_args['month']} #{module_args['weekday']} #{module_args['job']} (disabled: #{module_args['disabled']})")
-        end
+        module_args = msg_json['invocation']['module_args']
+        _("Cron job: #{module_args['minute']} #{module_args['hour']} #{module_args['day']} #{module_args['month']} #{module_args['weekday']} #{module_args['job']} (disabled: #{module_args['disabled']})")
       when 'copy'
-        get_results(msg_json) do |module_args, result|
-          _("Copy #{module_args['_original_basename']} to #{result['dest']}")
-        end
+        module_args = msg_json['invocation']['module_args']
+        _("Copy #{module_args['_original_basename']} to #{msg_json['dest']}")
       when 'command', 'shell'
         msg_json['stdout_lines']
       else
@@ -79,16 +69,19 @@ module ForemanAnsible
       false
     end
 
-    private
-
-    def get_results(msg_json)
-      results = msg_json.key?('results') ? msg_json['results'] : [msg_json]
-      results.map do |result|
-        module_args = result.fetch('invocation', {}).fetch('module_args', {})
-        yield module_args, result
+    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)
       JSON.parse(log.message.value)
     rescue StandardError => e

data/app/helpers/foreman_ansible/smart_proxies_helper.rb

@@ -27,13 +27,7 @@ module ForemanAnsible
     end
 
     def proxy_update_button(proxy)
-      name = if Foreman::Plugin.find('foreman_theme_satellite').present?
-               :ansible_run_capsule_upgrade
-             else
-               :ansible_run_smart_proxy_upgrade
-             end
-
-      feature = RemoteExecutionFeature.feature(name)
+      feature = RemoteExecutionFeature.feature(:ansible_run_capsule_upgrade)
       return if feature.nil?
 
       path = new_job_invocation_path(:host_ids => proxy.infrastructure_host_facets.pluck(:host_id),

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/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb

@@ -1,5 +1,5 @@
 <%#
-name: Capsule Upgrade Playbook
+name: Smart Proxy Upgrade Playbook
 snippet: false
 template_inputs:
 - name: target_version
@@ -26,8 +26,8 @@ feature: ansible_run_capsule_upgrade
 - hosts: all
   vars:
     target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
-  tasks:
 <% if plugin_present?('foreman_theme_satellite') -%>
+  tasks:
     - name: Gather the rpm package facts
       package_facts:
         manager: auto
@@ -75,7 +75,35 @@ feature: ansible_run_capsule_upgrade
           fail:
             msg: "Failed! Capsule server upgrade failed. See /var/log/foreman-installer/capsule.log in the Capsule server for more information"
 <% else -%>
-    - name: Fail if foreman_theme_satellite is missing
+  tasks:
+    - name: Gather the rpm package facts
+      package_facts:
+        manager: auto
+
+    - name: Fail if the target server is a Foreman server
       fail:
-        msg: "Failed! The plugin foreman_theme_satellite is not present. This playbook is only for use with Satellite."
+        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
+      when: "'foreman' in ansible_facts.packages"
+
+    - name: Install foreman release gpg key
+      rpm_key:
+        state: present
+        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
+      when: target_version != "nightly"
+
+    - name: Update foreman repositories
+      package:
+        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
+        state: installed
+
+    - name: Clean yum metadata
+      command: yum clean all
+
+    - name: Update all packages
+      package:
+        name: '*'
+        state: latest
+
+    - name: Run the installer
+      shell: foreman-installer
 <% end -%>

data/db/migrate/20210818083407_fix_ansible_setting_category_to_dsl.rb

@@ -1,5 +1,5 @@
 class FixAnsibleSettingCategoryToDsl < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::Ansible').update_all(category: 'Setting') if column_exists?(:settings, :category)
+    Setting.where(category: 'Setting::Ansible').update_all(category: 'Setting')
   end
 end

data/db/migrate/20221003153000_add_ansible_callback_enabled_to_templates.rb

@@ -4,7 +4,7 @@ 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.where(id: rex_feature.job_template_id).update_all(ansible_callback_enabled: true)
+      Template.find(rex_feature.job_template_id).update(ansible_callback_enabled: true)
     end
   end
 end

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

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.4.4'
+  VERSION = '11.0.0'
 end

data/package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "peerDependencies": {
-    "@theforeman/vendor": "^10.0"
+    "@theforeman/vendor": ">= 8.16.0"
   },
   "dependencies": {
     "react-json-tree": "^0.11.0"

data/test/fixtures/report.json

@@ -1,4 +1,4 @@
-[{
+{
   "reporter": "ansible",
   "reported_at":"2018-01-15 17:31:36 521275",
   "metrics": {
@@ -24,108 +24,4 @@
       }
     }
   ]
-},
-{
-  "reporter": "ansible",
-  "reported_at":"2022-12-22 10:52:48 521275",
-  "metrics": {
-    "time":
-      { "total":133 }
-  },
-  "host": "io.local",
-  "status": {
-    "applied": 8,
-    "failed": 0,
-    "skipped": 0
-  },
-  "logs": [
-    {
-      "log": {
-        "sources": {
-          "source": "Schedule multiple cronjobs"
-        },
-        "messages": {
-          "message": "{\"changed\": true, \"failed\": false, \"module\": \"cron\", \"msg\": \"All items completed\", \"results\": [{\"_ansible_item_label\": \"date\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"envs\": [], \"failed\": false, \"invocation\": {\"module_args\": {\"backup\": false, \"cron_file\": null, \"day\": \"*\", \"disabled\": false, \"env\": null, \"hour\": \"5,2\", \"insertafter\": null, \"insertbefore\": null, \"job\": \"date > /dev/null\", \"minute\": \"0\", \"month\": \"*\", \"name\": \"Cron date\", \"reboot\": false, \"special_time\": null, \"state\": \"present\", \"user\": null, \"weekday\": \"*\"}}, \"item\": \"date\", \"jobs\": [\"Cron date\"]}, {\"_ansible_item_label\": \"df\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"envs\": [], \"failed\": false, \"invocation\": {\"module_args\": {\"backup\": false, \"cron_file\": null, \"day\": \"*\", \"disabled\": false, \"env\": null, \"hour\": \"5,2\", \"insertafter\": null, \"insertbefore\": null, \"job\": \"df > /dev/null\", \"minute\": \"0\", \"month\": \"*\", \"name\": \"Cron df\", \"reboot\": false, \"special_time\": null, \"state\": \"present\", \"user\": null, \"weekday\": \"*\"}}, \"item\": \"df\", \"jobs\": [\"Cron date\", \"Cron df\"]}]}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Schedule one cronjob"
-        },
-        "messages": {
-          "message": "{\"_ansible_no_log\": false, \"changed\": true, \"envs\": [], \"failed\": false, \"invocation\": {\"module_args\": {\"backup\": false, \"cron_file\": null, \"day\": \"*\", \"disabled\": false, \"env\": null, \"hour\": \"5,2\", \"insertafter\": null, \"insertbefore\": null, \"job\": \"hostname > /dev/null\", \"minute\": \"0\", \"month\": \"*\", \"name\": \"Schedule hostname\", \"reboot\": false, \"special_time\": null, \"state\": \"present\", \"user\": null, \"weekday\": \"*\"}}, \"jobs\": [\"Cron date\", \"Cron df\", \"Schedule hostname\"], \"module\": \"cron\"}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Render multiple templates"
-        },
-        "messages": {
-          "message": "{\"changed\": true, \"failed\": false, \"module\": \"template\", \"msg\": \"All items completed\", \"results\": [{\"_ansible_item_label\": \"test1.txt\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"checksum\": \"dba7673010f19a94af4345453005933fd511bea9\", \"dest\": \"/tmp/test1.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test1.txt.j2\", \"attributes\": null, \"backup\": false, \"checksum\": \"dba7673010f19a94af4345453005933fd511bea9\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test1.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": null, \"local_follow\": null, \"mode\": null, \"owner\": null, \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670606.02-7241-175625077259447/source\", \"unsafe_writes\": false, \"validate\": null}}, \"item\": \"test1.txt\", \"md5sum\": null, \"mode\": \"0644\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670606.02-7241-175625077259447/source\", \"state\": \"file\", \"uid\": 0}, {\"_ansible_item_label\": \"test2.txt\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"checksum\": \"9054fbe0b622c638224d50d20824d2ff6782e308\", \"dest\": \"/tmp/test2.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test2.txt.j2\", \"attributes\": null, \"backup\": false, \"checksum\": \"9054fbe0b622c638224d50d20824d2ff6782e308\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test2.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": null, \"local_follow\": null, \"mode\": null, \"owner\": null, \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670620.49-7241-225254470383476/source\", \"unsafe_writes\": false, \"validate\": null}}, \"item\": \"test2.txt\", \"md5sum\": null, \"mode\": \"0644\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670620.49-7241-225254470383476/source\", \"state\": \"file\", \"uid\": 0}]}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Render one template"
-        },
-        "messages": {
-          "message": "{\"_ansible_no_log\": false, \"changed\": true, \"checksum\": \"41c5985fc771b6ecfe8feaa99f8fa9b77ac7d6ce\", \"dest\": \"/tmp/test3.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test3.txt.j2\", \"attributes\": null, \"backup\": false, \"checksum\": \"41c5985fc771b6ecfe8feaa99f8fa9b77ac7d6ce\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test3.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": null, \"local_follow\": null, \"mode\": null, \"owner\": null, \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670634.79-7306-243717749452063/source\", \"unsafe_writes\": false, \"validate\": null}}, \"md5sum\": null, \"mode\": \"0644\", \"module\": \"template\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670634.79-7306-243717749452063/source\", \"state\": \"file\", \"uid\": 0}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Copy multiple local files"
-        },
-        "messages": {
-          "message": "{\"changed\": true, \"failed\": false, \"module\": \"copy\", \"msg\": \"All items completed\", \"results\": [{\"_ansible_item_label\": \"test4.txt\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"checksum\": \"ab2649b7e58f7e32b0c75be95d11e2979399d392\", \"dest\": \"/tmp/test4.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test4.txt\", \"attributes\": null, \"backup\": false, \"checksum\": \"ab2649b7e58f7e32b0c75be95d11e2979399d392\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test4.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": \"root\", \"local_follow\": null, \"mode\": 256, \"owner\": \"root\", \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670648.88-7343-91799014257533/source\", \"unsafe_writes\": false, \"validate\": null}}, \"item\": \"test4.txt\", \"md5sum\": null, \"mode\": \"0400\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670648.88-7343-91799014257533/source\", \"state\": \"file\", \"uid\": 0}, {\"_ansible_item_label\": \"test5.txt\", \"_ansible_no_log\": false, \"ansible_loop_var\": \"item\", \"changed\": true, \"checksum\": \"4ea77484f3a1c7dde4c0cca2f5c40953388f19f5\", \"dest\": \"/tmp/test5.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test5.txt\", \"attributes\": null, \"backup\": false, \"checksum\": \"4ea77484f3a1c7dde4c0cca2f5c40953388f19f5\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test5.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": \"root\", \"local_follow\": null, \"mode\": 256, \"owner\": \"root\", \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670662.97-7343-50902792283881/source\", \"unsafe_writes\": false, \"validate\": null}}, \"item\": \"test5.txt\", \"md5sum\": null, \"mode\": \"0400\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670662.97-7343-50902792283881/source\", \"state\": \"file\", \"uid\": 0}]}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Copy one local files"
-        },
-        "messages": {
-          "message": "{\"_ansible_no_log\": false, \"changed\": true, \"checksum\": \"ec4cddb45c3ce640bed61b3d8ab6c18e715dac78\", \"dest\": \"/tmp/test6.txt\", \"diff\": [], \"failed\": false, \"gid\": 0, \"group\": \"root\", \"invocation\": {\"module_args\": {\"_original_basename\": \"test6.txt\", \"attributes\": null, \"backup\": false, \"checksum\": \"ec4cddb45c3ce640bed61b3d8ab6c18e715dac78\", \"content\": null, \"delimiter\": null, \"dest\": \"/tmp/test6.txt\", \"directory_mode\": null, \"follow\": false, \"force\": true, \"group\": \"root\", \"local_follow\": null, \"mode\": 256, \"owner\": \"root\", \"regexp\": null, \"remote_src\": null, \"selevel\": null, \"serole\": null, \"setype\": null, \"seuser\": null, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670677.05-7408-75605497546833/source\", \"unsafe_writes\": false, \"validate\": null}}, \"md5sum\": null, \"mode\": \"0400\", \"module\": \"copy\", \"owner\": \"root\", \"secontext\": \"unconfined_u:object_r:admin_home_t:s0\", \"size\": 6, \"src\": \"/root/.ansible/tmp/ansible-tmp-1671670677.05-7408-75605497546833/source\", \"state\": \"file\", \"uid\": 0}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Restart multiple services"
-        },
-        "messages": {
-          "message": "{\"changed\":true,\"failed\":false,\"module\":\"service\",\"msg\":\"All items completed\",\"results\":[{\"_ansible_item_label\":\"chronyd\",\"_ansible_no_log\":false,\"ansible_loop_var\":\"item\",\"changed\":true,\"failed\":false,\"invocation\":{\"module_args\":{\"daemon_reexec\":false,\"daemon_reload\":false,\"enabled\":null,\"force\":null,\"masked\":null,\"name\":\"chronyd\",\"no_block\":false,\"scope\":null,\"state\":\"restarted\",\"user\":null}},\"item\":\"chronyd\",\"name\":\"chronyd\",\"state\":\"started\"},{\"_ansible_item_label\":\"firewalld\",\"_ansible_no_log\":false,\"ansible_loop_var\":\"item\",\"changed\":true,\"failed\":false,\"invocation\":{\"module_args\":{\"daemon_reexec\":false,\"daemon_reload\":false,\"enabled\":null,\"force\":null,\"masked\":null,\"name\":\"firewalld\",\"no_block\":false,\"scope\":null,\"state\":\"restarted\",\"user\":null}},\"item\":\"firewalld\",\"name\":\"firewalld\",\"state\":\"started\"}]}"
-        },
-        "level": "notice"
-      }
-    },
-    {
-      "log": {
-        "sources": {
-          "source": "Restart one service"
-        },
-        "messages": {
-          "message": "{\"_ansible_no_log\":false,\"changed\":true,\"failed\":false,\"invocation\":{\"module_args\":{\"daemon_reexec\":false,\"daemon_reload\":false,\"enabled\":null,\"force\":null,\"masked\":null,\"name\":\"chronyd\",\"no_block\":false,\"scope\":null,\"state\":\"restarted\",\"user\":null}},\"module\":\"service\",\"name\":\"chronyd\",\"state\":\"started\"}"
-        },
-        "level": "notice"
-      }
-    }
-  ]
-}]
+}

data/test/integration/hostgroup_js_test.rb

@@ -10,23 +10,21 @@ class HostgroupJsTest < IntegrationTestWithJavascript
     FactoryBot.create(:host, :hostgroup_id => hostgroup_with_roles.id)
   end
 
-  test 'hostgroup without roles should have disabled links' do
+  test 'hostgroup without roles should have disabled link' do
     visit hostgroups_path(search: hostgroup.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_includes first(:link, 'Run all Ansible roles')[:class], 'disabled'
-    assert_includes first(:link, 'Configure Ansible Job')[:class], 'disabled'
   end
 
-  test 'hostgroup with roles should have clickable links' do
+  test 'hostgroup with roles should have clickable link' do
     visit hostgroups_path(search: hostgroup_with_roles.name)
 
     first_row = page.find('table > tbody > tr:nth-child(1)')
     first_row.find('td:nth-child(4) > div > a').click
 
     assert_not first(:link, 'Run all Ansible roles')[:class].include?('disabled')
-    assert_not first(:link, 'Configure Ansible Job')[:class].include?('disabled')
   end
 end

data/test/unit/concerns/config_reports_extensions_test.rb

@@ -4,15 +4,13 @@ require 'test_plugin_helper'
 
 # Tests for the behavior of Host with roles, checks inheritance, etc
 class ConfigReportExtensionsTest < ActiveSupport::TestCase
-  let(:example_reports) do
+  let(:example_report) do
     JSON.parse(File.read(ansible_fixture_file('report.json')))
   end
 
-  let(:example_report1) { example_reports.first }
-
   describe '.import' do
     it 'sets an origin for Ansible reports' do
-      report = ConfigReport.import(example_report1)
+      report = ConfigReport.import(example_report)
       assert_equal 'Ansible', report.origin
     end
 

data/test/unit/helpers/ansible_reports_helper_test.rb

@@ -20,62 +20,16 @@ ANSIBLELOG
     )
   end
 
-  test 'module message extraction with action' do
-    example_report = JSON.parse(File.read(ansible_fixture_file('report.json'))).second
-    report = ConfigReport.import(example_report)
-    expected_outputs = [
-      'No additional data',
-      ['Cron job: 0 5,2 * * * date > /dev/null (disabled: false)', 'Cron job: 0 5,2 * * * df > /dev/null (disabled: false)'],
-      ['Cron job: 0 5,2 * * * hostname > /dev/null (disabled: false)'],
-      ['Rendered template test1.txt.j2 to /tmp/test1.txt', 'Rendered template test2.txt.j2 to /tmp/test2.txt'],
-      ['Rendered template test3.txt.j2 to /tmp/test3.txt'],
-      ['Copy test4.txt to /tmp/test4.txt', 'Copy test5.txt to /tmp/test5.txt'],
-      ['Copy test6.txt to /tmp/test6.txt'],
-      ['Service chronyd started (enabled: )', 'Service firewalld started (enabled: )'],
-      ['Service chronyd started (enabled: )']
-    ]
-    actual_outputs = []
-    report.logs.each do |log|
-      actual_outputs << ansible_module_message(log)
-    end
-    assert_equal expected_outputs, actual_outputs
-  end
-
-  test 'accepting an almost empty message' do
+  test 'module message extraction with error' do
     log_value = <<-ANSIBLELOG.strip_heredoc
-    {"changed": true, "failed": false, "module": "copy"}
+    {"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)
+    log = FactoryBot.build(:log, message: message)
     log.message = message
-    assert_match(
-      /Copy/,
-      ansible_module_message(log).to_s
-    )
-  end
 
-  test 'FQCN module message extraction' do
-    log_value = <<-ANSIBLELOG.strip_heredoc
-    {"msg": "Nothing to do", "changed": false, "results": [], "rc": 0, "invocation": {"module_args": {"name": ["openssh"], "state": "present", "allow_downgrade": false, "autoremove": false, "bugfix": false, "disable_gpg_check": false, "disable_plugin": [], "disablerepo": [], "download_only": false, "enable_plugin": [], "enablerepo": [], "exclude": [], "installroot": "/", "install_repoquery": true, "install_weak_deps": true, "security": false, "skip_broken": false, "update_cache": false, "update_only": false, "validate_certs": true, "lock_timeout": 30, "conf_file": null, "disable_excludes": null, "download_dir": null, "list": null, "releasever": null}}, "_ansible_no_log": false, "failed": false, "module": "ansible.builtin.package"}
-ANSIBLELOG
-    message = FactoryBot.build(:message, value: log_value)
-    log = FactoryBot.build(:log)
-    log.message = message
-    assert_match(
-      /Nothing to do/,
-      ansible_module_message(log).to_s
-    )
-  end
-
-  test 'accepting a censored message' do
-    log_value = <<-ANSIBLELOG.strip_heredoc
-    {"censored": "the output has been hidden due to the fact that 'no_log: true' was specified for this result", "changed": true, "failed": false, "module": "copy"}
-ANSIBLELOG
-    message = FactoryBot.build(:message, value: log_value)
-    log = FactoryBot.build(:log)
-    log.message = message
     assert_match(
-      /output has been hidden/,
+      'Execution error: AnsibleUndefinedVariable',
       ansible_module_message(log).to_s
     )
   end

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -4,13 +4,8 @@ import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
 import { showToast } from '../../../../toastHelper';
 
-function formatSourceLink(currentValue) {
-  const element =
-    typeof currentValue.element !== 'string'
-      ? currentValue.element.toString()
-      : currentValue.element;
-  return `${__(element)}: ${currentValue.elementName}`;
-}
+const formatSourceLink = currentValue =>
+  `${__(currentValue.element)}: ${currentValue.elementName}`;
 
 export const formatSourceAttr = variable =>
   variable.currentValue
@@ -91,16 +86,12 @@ const validateRegexp = (variable, value) => {
 };
 
 const validateList = (variable, value) => {
-  let { validatorRule } = variable;
-  if (typeof validatorRule !== 'string') {
-    validatorRule = validatorRule.toString();
-  }
-  if (validatorRule.split(',').find(item => item.trim() === value)) {
+  if (variable.validatorRule.split(',').find(item => item.trim() === value)) {
     return validationSuccess;
   }
   return {
     key: 'error',
-    msg: sprintf(__('Invalid, expected one of: %s'), validatorRule),
+    msg: sprintf(__('Invalid, expected one of: %s'), variable.validatorRule),
   };
 };
 

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverrides.test.js

@@ -19,7 +19,7 @@ import {
 const TestComponent = withRedux(withMockedProvider(AnsibleVariableOverrides));
 
 describe('AnsibleVariableOverrides', () => {
-  it('should show skeleton when page is loading', async () => {
+  it('should show skeleton when page is loading', () => {
     const { container } = render(
       <TestComponent
         hostId={hostId}
@@ -31,8 +31,6 @@ describe('AnsibleVariableOverrides', () => {
     expect(
       container.getElementsByClassName('react-loading-skeleton')
     ).toHaveLength(5);
-
-    await waitFor(tick);
   });
   it('should load', async () => {
     render(

data/webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js

@@ -26,6 +26,7 @@ class AnsibleRolesSwitcher extends React.Component {
       inheritedRoleIds,
       resourceId,
       resourceName,
+      { page: 1, perPage: 10 },
       excludeAssignedRolesSearch(initialAssignedRoles)
     );
   }

data/webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js

@@ -19,9 +19,7 @@ const AvailableRolesList = ({
       <Pagination
         viewType="list"
         itemCount={itemCount}
-        updateParamsByUrl={false}
-        page={pagination.page}
-        perPage={pagination.perPage}
+        pagination={pagination}
         onChange={onListingChange}
         dropdownButtonId="available-ansible-roles-pagination-row-dropdown"
       />

data/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap

@@ -16,8 +16,14 @@ exports[`AvailableRolesList should render 1`] = `
       onPerPageSelect={null}
       onSetPage={null}
       page={1}
-      perPage={25}
-      updateParamsByUrl={false}
+      pagination={
+        Object {
+          "page": 1,
+          "perPage": 25,
+        }
+      }
+      perPage={null}
+      updateParamsByUrl={true}
       variant="bottom"
       viewType="list"
     />

data/webpack/graphql/queries/currentUserAttributes.gql

@@ -8,9 +8,4 @@ fragment CurrentUserAttributes on User {
       name
     }
   }
-  usergroups {
-    nodes {
-      admin
-    }
-  }
 }

data/webpack/permissionsHelper.js

@@ -11,10 +11,7 @@ export const permissionCheck = (user, permissionsRequired) => {
     );
   }
 
-  if (
-    user.admin ||
-    user.usergroups.nodes.find(usergroup => usergroup.admin === true)
-  ) {
+  if (user.admin) {
     return { allowed: true };
   }
 

data/webpack/testHelper.js

@@ -71,9 +71,6 @@ export const userFactory = (login, permissions = []) => ({
   permissions: {
     nodes: permissions,
   },
-  usergroups: {
-    nodes: [],
-  },
 });
 
 export const admin = {
@@ -84,9 +81,6 @@ export const admin = {
   permissions: {
     nodes: [],
   },
-  usergroups: {
-    nodes: [],
-  },
 };
 
 export const intruder = userFactory('intruder', [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 10.4.4
+  version: 11.0.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2023-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '8.2'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.0'
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -201,7 +201,6 @@ 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/foreman_ansible/job_templates/smart_proxy_upgrade_-_ansible_default.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
@@ -479,16 +478,16 @@ test_files:
 - 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/sample_playbooks.json
-- test/fixtures/report.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/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/hosts_controller_test.rb

data/app/views/foreman_ansible/job_templates/smart_proxy_upgrade_-_ansible_default.erb

@@ -1,59 +0,0 @@
-<%#
-name: Smart Proxy Upgrade Playbook
-snippet: false
-template_inputs:
-- name: target_version
-  required: false
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: false
-- name: whitelist_options
-  required: false
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: false
-model: JobTemplate
-job_category: Maintenance Operations
-description_format: "%{template_name}"
-provider_type: Ansible
-kind: job_template
-feature: ansible_run_smart_proxy_upgrade
-%>
-
----
-- hosts: all
-  vars:
-    target_version: "<%= input('target_version').present? ? input('target_version') : product_short_version %>"
-  tasks:
-    - name: Gather the rpm package facts
-      package_facts:
-        manager: auto
-
-    - name: Fail if the target server is a Foreman server
-      fail:
-        msg: "This playbook cannot be executed on a Foreman server. Use only on a Smart Proxy server."
-      when: "'foreman' in ansible_facts.packages"
-
-    - name: Install foreman release gpg key
-      rpm_key:
-        state: present
-        key: http://yum.theforeman.org/releases/{{ target_version }}/RPM-GPG-KEY-foreman
-      when: target_version != "nightly"
-
-    - name: Update foreman repositories
-      package:
-        name: https://yum.theforeman.org/releases/{{ target_version }}/el{{ ansible_distribution_major_version }}/{{ ansible_architecture }}/foreman-release.rpm
-        state: installed
-
-    - name: Clean yum metadata
-      command: yum clean all
-
-    - name: Update all packages
-      package:
-        name: '*'
-        state: latest
-
-    - name: Run the installer
-      shell: foreman-installer