foreman_ansible 6.3.1 → 6.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3986780692ba4ebf7918705dc78a06b637e5032371de0b0ed29b74d312ce42ed
-  data.tar.gz: 852691a29487743f21a60c259e3dcbcfbea488df3bbe634b77712e3968090e67
+  metadata.gz: 49f289f46429611b1f8d183bab027589b46367fca60323c57e5370848ad12b7a
+  data.tar.gz: 887cf57c344a0f2a4baf1ee8fb6ae3be635ac9ab5e3073adf88e797a8eaca51f
 SHA512:
-  metadata.gz: b1987573ed7c1b76377ac756e2d4f01b65f84dd30f0e7d536e12c35f53724a94526701f9f6f179b5af765353ddd087579df62ebbe4b7dcc35f0436cc9834db2f
-  data.tar.gz: 6ad6a28153b718cdd9cbc251c53901072c4413df3fb82d25065c6014ba67124525c1151250954a5fe8c0dd4d081b7e3b1d515c9c38c4f7d57f5f0eeccaccd172
+  metadata.gz: 38061c87845fdd6d73817ba6b3e60a6470fb72302f731600fe06360dd7ce5593775dabb71c3d1414fe00ebd5711640250302bd3f5ef831699847d4d3b8987cf5
+  data.tar.gz: 9c79bd81e50619cbc49ad5b80a93a9702144b21eed1a39b3d0988e949f594a04e2e9bed73700eb090a4b17eb6580d6996f6b440f3e0a10286f3d7880c4b25617

data/app/helpers/foreman_ansible/ansible_roles_data_preparations.rb

@@ -2,22 +2,22 @@
 
 module ForemanAnsible
   module AnsibleRolesDataPreparations
-    VARIABLE_ACTION_NAMES = { 'new' => N_('Add'), 'obsolete' => N_('Remove'), 'update' => N_('Update') }.freeze
-    ROLE_ACTION_NAMES = { 'new' => N_('Import Role'), 'obsolete' => N_('Remove Role'), 'old' => N_('Update Role Variables') }.freeze
+    VARIABLE_ACTION_NAMES = { 'new' => _('Add'), 'obsolete' => _('Remove'), 'update' => _('Update') }.freeze
+    ROLE_ACTION_NAMES = { 'new' => _('Import Role'), 'obsolete' => _('Remove Role'), 'old' => _('Update Role Variables') }.freeze
 
-    def get_variable_action(kind)
-      _(VARIABLE_ACTION_NAMES[kind])
+    def variable_action_name(kind)
+      VARIABLE_ACTION_NAMES[kind]
     end
 
-    def get_role_action(kind)
-      _(ROLE_ACTION_NAMES[kind])
+    def role_action_name(kind)
+      ROLE_ACTION_NAMES[kind]
     end
 
     def get_old_roles_variables(imported_variables, role)
-      variables = { 'Add' => [], 'Remove' => [], 'Update' => [] }
+      variables = { 'new' => [], 'obsolete' => [], 'update' => [] }
       imported_variables.each do |kind, temp_variables|
         temp_variables.each do |temp_variable|
-          variables[get_variable_action(kind)].append(temp_variable.key) if temp_variable.ansible_role_id == role.id
+          variables[kind].append(temp_variable.key) if temp_variable.ansible_role_id == role.id
         end
       end
       variables
@@ -26,16 +26,16 @@ module ForemanAnsible
     def variables_to_s(variables)
       str = ''
       variables.each do |action, temp_variables|
-        str += "#{action}: #{temp_variables.size}, " unless temp_variables.empty?
+        str += "#{variable_action_name action}: #{temp_variables.size}, " unless temp_variables.empty?
       end
       str[0..-3]
     end
 
     def get_roles_variables(imported_variables, variables_importer, kind, role)
       if kind == 'new'
-        variables = { 'Add' => variables_importer.get_variables_names(role.name) }
+        variables = { 'new' => variables_importer.get_variables_names(role.name) }
       elsif kind == 'obsolete'
-        variables = { 'Remove' => role.ansible_variables.map(&:key) }
+        variables = { 'obsolete' => role.ansible_variables.map(&:key) }
       elsif kind == 'old'
         variables = get_old_roles_variables(imported_variables, role)
       end
@@ -51,24 +51,25 @@ module ForemanAnsible
       match.to_s.empty? ? nil : match
     end
 
-    def prepare_api_row(role, kind, variables, role_action)
+    def prepare_api_row(role, kind, variables)
       {
         name: role.name,
         id: role.id,
-        role_action: role_action,
+        role_action: role_action_name(kind),
         variables: variables,
-        hosts_count: role_action == 'Remove Role' ? role.hosts.count : '',
-        hostgroup_count: role_action == 'Remove Role' ? role.hostgroups.count : '',
+        hosts_count: kind == 'obsolete' ? role.hosts.count : '',
+        hostgroup_count: kind == 'obsolete' ? role.hostgroups.count : '',
         kind: kind
       }
     end
 
-    def prepare_ui_row(role, kind, variables, role_action)
+    def prepare_ui_row(role, kind, variables)
       { cells: [
         role.name,
-        role_action, variables,
-        role_action == 'Remove Role' ? role.hosts.count : '',
-        role_action == 'Remove Role' ? role.hostgroups.count : ''
+        role_action_name(kind),
+        variables,
+        kind == 'obsolete' ? role.hosts.count : '',
+        kind == 'obsolete' ? role.hostgroups.count : ''
       ],
         role: role, kind: kind, id: role.name }
     end
@@ -81,11 +82,10 @@ module ForemanAnsible
           next if role_match_excluded_roles(role.name)
           variables = get_roles_variables(imported_variables, variables_importer, kind, role)
           next if variables.empty? && kind['old']
-          role_action = get_role_action(kind)
           if is_ui
-            rows.append(prepare_ui_row(role, kind, variables, role_action))
+            rows.append(prepare_ui_row(role, kind, variables))
           else
-            rows.append(prepare_api_row(role, kind, variables, role_action))
+            rows.append(prepare_api_row(role, kind, variables))
           end
         end
       end

data/lib/foreman_ansible/register.rb

@@ -76,9 +76,10 @@ Foreman::Plugin.register :foreman_ansible do
 
   role 'Ansible Roles Manager',
        [:play_roles_on_host, :play_roles_on_hostgroup,
+        :create_job_invocations, :view_job_templates,      # to allow the play_roles
+        :create_template_invocations, :view_smart_proxies, # ...
         :view_ansible_roles, :destroy_ansible_roles,
-        :import_ansible_roles,
-        :view_ansible_variables,
+        :import_ansible_roles, :view_ansible_variables,
         :create_ansible_variables, :import_ansible_variables,
         :edit_ansible_variables, :destroy_ansible_variables]
 

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 = '6.3.1'
+  VERSION = '6.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -389,54 +389,54 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)
 test_files:
-- test/functional/ansible_variables_controller_test.rb
+- test/factories/ansible_proxy.rb
+- test/factories/ansible_variables.rb
+- test/factories/ansible_roles.rb
+- test/factories/host_ansible_enhancements.rb
+- test/fixtures/insights_playbook.yaml
+- test/fixtures/report.json
+- test/fixtures/sample_facts.json
 - test/functional/ansible_roles_controller_test.rb
+- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/ansible_variables_controller_test.rb
-- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/api/v2/hostgroups_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
+- test/functional/api/v2/ansible_roles_controller_test.rb
 - test/functional/ui_ansible_roles_controller_test.rb
+- test/functional/ansible_variables_controller_test.rb
 - test/functional/hosts_controller_test.rb
-- test/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/test_plugin_helper.rb
 - test/unit/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
-- test/unit/services/api_roles_importer_test.rb
-- test/unit/services/ui_roles_importer_test.rb
-- test/unit/services/structured_fact_importer_test.rb
-- test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_test.rb
-- test/unit/services/roles_importer_test.rb
-- test/unit/services/fact_sparser_test.rb
-- test/unit/services/inventory_creator_test.rb
-- test/unit/services/ansible_variables_importer_test.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/helpers/ansible_reports_helper_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
-- test/unit/ansible_role_test.rb
-- test/unit/hostgroup_ansible_role_test.rb
-- test/unit/ansible_variable_test.rb
-- test/unit/host_ansible_role_test.rb
-- test/unit/helpers/ansible_reports_helper_test.rb
+- test/unit/services/ansible_report_importer_test.rb
+- test/unit/services/fact_importer_test.rb
+- test/unit/services/fact_sparser_test.rb
+- test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/structured_fact_importer_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/fact_parser_test.rb
+- test/unit/services/inventory_creator_test.rb
 - test/unit/ansible_provider_test.rb
-- test/unit/ignore_roles_test.rb
+- test/unit/host_ansible_role_test.rb
 - test/unit/import_roles_and_variables.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/factories/ansible_proxy.rb
-- test/factories/host_ansible_enhancements.rb
-- test/factories/ansible_variables.rb
-- test/factories/ansible_roles.rb
-- test/fixtures/report.json
-- test/fixtures/sample_facts.json
-- test/fixtures/insights_playbook.yaml
-- test/test_plugin_helper.rb
+- test/unit/ignore_roles_test.rb
+- test/unit/hostgroup_ansible_role_test.rb
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb