foreman_ansible 10.2.0 → 10.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6ba3f014f5ac02d3364334eb15efeeb9572b802765a9d8ffea9be3d3fd19c3d
-  data.tar.gz: cc56b4ff89156afee500563975542d1a98d82bc49929d6f2c056fbcc74149500
+  metadata.gz: 8c30c3eac6e4a49a8d43c6a654d84b672ef9fa58bbacb8fe2044cc74f33b5a28
+  data.tar.gz: 8084c75afc69d788093952a8988e3ff883f3726779a94f1de5016c1b857d7435
 SHA512:
-  metadata.gz: 91c980eef1c77f9d856dad9fff7acaca458bb17c5d8736cd50e11c87a2b01ccba5b87c07e025b57e1c4e493b91909607f4236107e99ab419faa66ac00b4b374c
-  data.tar.gz: 415fda190f9d33d7e31f34567aa4601724b789045e48813f0668a36e58bbf3a7ec414d99bdc8ca97ac9b564f55861b0ae678f1ef11cb197405572b51a52d083e
+  metadata.gz: e541db04ed8d5bb3ed65b8239a06366efbda044d57263e4e507534c61a89d566e1270b67593a5c33d423abf13bc7896f76208aa81efc36f58382bd972d40cd7f
+  data.tar.gz: 5df022f589352f580358303a3172f8062e476884607e1dafd21ee8f140646e106a93419c018b896df55b4bc4cac102374bb92bd3c46e8dc9e42998c52c2bb26e

data/app/graphql/types/overriden_ansible_variable.rb

@@ -8,12 +8,14 @@ module Types
       argument :match, String, required: false
     end
 
-    field :meta, ::Types::Meta, resolve: (proc do |object|
+    field :meta, ::Types::Meta
+
+    def meta
       {
         :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,13 +3,19 @@
 module ForemanAnsible
   module AnsibleHostgroupsHelper
     def ansible_hostgroups_actions(hostgroup)
+      actions = []
       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
 
-      [play_roles] if User.current.can?(:create_job_invocations)
+      assign_jobs = { action: { content: (link_to _('Configure Ansible Job'), "/ansible/hostgroups/#{hostgroup.id}", class: 'la') }, priority: 32 }
+
+      actions.push play_roles if User.current.can?(:create_job_invocations)
+      actions.push assign_jobs if User.current.can?(:view_job_invocations) && User.current.can?(:view_recurring_logics)
+
+      actions
     end
   end
 end

data/app/helpers/foreman_ansible/ansible_reports_helper.rb

@@ -27,25 +27,37 @@ module ForemanAnsible
 
     def ansible_module_message(log)
       msg_json = parsed_message_json(log)
-      module_action = msg_json['module']
+      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.')
       case module_action
       when 'package'
         msg_json['results'].empty? ? msg_json['msg'] : msg_json['results']
       when 'template'
-        module_args = msg_json['invocation']['module_args']
-        _("Rendered template #{module_args['_original_basename']} to #{msg_json['dest']}")
+        get_results(msg_json) do |module_args, result|
+          _("Rendered template #{module_args['_original_basename']} to #{result['dest']}")
+        end
       when 'service'
-        _("Service #{msg_json['name']} #{msg_json['state']} (enabled: #{msg_json['enabled']})")
+        get_results(msg_json) do |_, result|
+          _("Service #{result['name']} #{result['state']} (enabled: #{result['enabled']})")
+        end
       when 'group'
-        _("User group #{msg_json['name']} #{msg_json['state']}, gid: #{msg_json['gid']}")
+        get_results(msg_json) do |_, result|
+          _("User group #{result['name']} #{result['state']}, gid: #{result['gid']}")
+        end
       when 'user'
-        _("User #{msg_json['name']} #{msg_json['state']}, uid: #{msg_json['uid']}")
+        get_results(msg_json) do |_, result|
+          _("User #{result['name']} #{result['state']}, uid: #{result['uid']}")
+        end
       when 'cron'
-        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']})")
+        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
       when 'copy'
-        module_args = msg_json['invocation']['module_args']
-        _("Copy #{module_args['_original_basename']} to #{msg_json['dest']}")
+        get_results(msg_json) do |module_args, result|
+          _("Copy #{module_args['_original_basename']} to #{result['dest']}")
+        end
       when 'command', 'shell'
         msg_json['stdout_lines']
       else
@@ -69,6 +81,14 @@ module ForemanAnsible
 
     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
+      end
+    end
+
     def parsed_message_json(log)
       JSON.parse(log.message.value)
     rescue StandardError => e

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')
+    Setting.where(category: 'Setting::Ansible').update_all(category: 'Setting') if column_exists?(:settings, :category)
   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 = '10.4.0'
 end

data/test/fixtures/report.json

@@ -1,4 +1,4 @@
-{
+[{
   "reporter": "ansible",
   "reported_at":"2018-01-15 17:31:36 521275",
   "metrics": {
@@ -24,4 +24,108 @@
       }
     }
   ]
-}
+},
+{
+  "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/unit/concerns/config_reports_extensions_test.rb

@@ -4,13 +4,15 @@ require 'test_plugin_helper'
 
 # Tests for the behavior of Host with roles, checks inheritance, etc
 class ConfigReportExtensionsTest < ActiveSupport::TestCase
-  let(:example_report) do
+  let(:example_reports) 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_report)
+      report = ConfigReport.import(example_report1)
       assert_equal 'Ansible', report.origin
     end
 

data/test/unit/helpers/ansible_reports_helper_test.rb

@@ -19,4 +19,64 @@ ANSIBLELOG
       ansible_module_message(log).to_s
     )
   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
+    log_value = <<-ANSIBLELOG.strip_heredoc
+    {"changed": true, "failed": false, "module": "copy"}
+ANSIBLELOG
+    message = FactoryBot.build(:message, value: log_value)
+    log = FactoryBot.build(:log)
+    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/,
+      ansible_module_message(log).to_s
+    )
+  end
 end

data/webpack/graphql/queries/currentUserAttributes.gql

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

data/webpack/permissionsHelper.js

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

data/webpack/testHelper.js

@@ -71,6 +71,9 @@ export const userFactory = (login, permissions = []) => ({
   permissions: {
     nodes: permissions,
   },
+  usergroups: {
+    nodes: [],
+  },
 });
 
 export const admin = {
@@ -81,6 +84,9 @@ 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.2.0
+  version: 10.4.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -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,34 +477,35 @@ test_files:
 - test/factories/ansible_variables.rb
 - test/factories/host_ansible_enhancements.rb
 - test/fixtures/insights_playbook.yaml
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
 - test/fixtures/playbooks_example_output.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/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
 - test/test_plugin_helper.rb
 - test/unit/ansible_role_test.rb
 - test/unit/ansible_variable_test.rb
-- test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/concerns/host_managed_extensions_test.rb
 - test/unit/concerns/hostgroup_extensions_test.rb
+- test/unit/concerns/config_reports_extensions_test.rb
 - test/unit/helpers/ansible_reports_helper_test.rb
 - 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