foreman_ansible 10.3.0 → 10.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b1b699102370b4e5a97d04d193bd0fcea93579d921cc0e85765e026b367b573
-  data.tar.gz: 81815947622a3207f02566dd22a90fa812c3c13084344e039d5c398f8ed3d91b
+  metadata.gz: 6036f9a1d90705a4459c56093084b63c953a7c657a125f4f04ca878fb9bc7552
+  data.tar.gz: 5354e5227c4eccf6fcee0f721b3e03a10d0d119354d3dc3b2aa742ad44105023
 SHA512:
-  metadata.gz: 3231ccc8fd6ef3f4b7705ea63cacf42cecc35f86332a79dd0d44dafbe2a700e0eb6e81b97a8185c1c3cae7c27657cbe8ee5c998b1f6c008d0905ae4c76d53d01
-  data.tar.gz: 7ea76ec8df5ebabc52f32f6edcde10892f2578dc74bf452fcaa64e41a0688e1c9b5c4091cbc7cbb6275f10d2e3e4bbe4faf8118be47be6feb582e629e7a28ebf
+  metadata.gz: a29b28a5c665e8af6f52b9b5b2e7ff94f88f87912795ef54c5eedbb7347c666796a42c09456bcd6b50ed30e1d17a1e28f25ab23929fad6b34a4b51ceb87f5131
+  data.tar.gz: 482d9f6ee4f9c1367a45d87cd4158c29ef88ca2860b6183cdf159123a5a9cf88c7bcca18549b7d448cfff9a5094a3eda24f782f7cd1339e0d0d1fd9abfb1b28c

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,7 +27,10 @@ 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']

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.3.0'
+  VERSION = '10.4.1'
 end

data/package.json

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

data/test/unit/helpers/ansible_reports_helper_test.rb

@@ -40,4 +40,43 @@ ANSIBLELOG
     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/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTableHelper.js

@@ -86,12 +86,16 @@ const validateRegexp = (variable, value) => {
 };
 
 const validateList = (variable, value) => {
-  if (variable.validatorRule.split(',').find(item => item.trim() === value)) {
+  let { validatorRule } = variable;
+  if (typeof validatorRule !== 'string') {
+    validatorRule = validatorRule.toString();
+  }
+  if (validatorRule.split(',').find(item => item.trim() === value)) {
     return validationSuccess;
   }
   return {
     key: 'error',
-    msg: sprintf(__('Invalid, expected one of: %s'), variable.validatorRule),
+    msg: sprintf(__('Invalid, expected one of: %s'), validatorRule),
   };
 };
 

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.3.0
+  version: 10.4.1
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -42,36 +42,30 @@ 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: '8.2'
   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: '8.2'
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
 description: Ansible integration with Foreman
 email:
 - elobatocs@gmail.com
@@ -484,10 +478,10 @@ test_files:
 - 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
@@ -498,9 +492,9 @@ test_files:
 - 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