foreman_ansible 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99abca0391222ea405dd6639b8556b21df4a139d159d3e949933c2bf59e13eaa
-  data.tar.gz: 5cbd6af1574f4f9479f8900ff5077badd0d542d37008206e3512b0636f748f75
+  metadata.gz: ded4963f8ef2ac710b82d4ae1a6a20dceed5fbb577059981fab73fd07b61ad6a
+  data.tar.gz: fd300c47edc4ce921b1a8500c183b3757fd3cf4acf8fb7d9377eafda98bd17b4
 SHA512:
-  metadata.gz: 163fac3b03b865a0a0b77cb0d67c585fe95f653ad645e27aa4567f35aebae47717edcce32b6deef3bdb238691f02b85f91a7c3dc65229223127de72f3946a8a8
-  data.tar.gz: 8a60d45f87f059e75b27b3c2d5f9a2fad077269b8521c1b0e740bd42c81eb2a174e6a8b146beb1c2319f0fd0a846fd74f5a245e7a269f320a45e2b360e250492
+  metadata.gz: b0717c5963bcabf982fdc647570e1a603dfb7794af517293bdd3f41d72e7158ad1ab8ad05930aa749f3ea8f79ab7f9ab20d3bd4de5568d12e79d25f8fdd83b0e
+  data.tar.gz: 9edde27d8e6503d55def1157329c5dd63195c0ca6d339694b5144c3578e435dbe0cb946f08efa13bd95e6ae24006b45abec0cd5099c56bf751d5c067b8cb9085

data/app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb

@@ -23,6 +23,9 @@ model: JobTemplate
 ---
 - hosts: all
   tasks:
-    - command: git clone <%= input('git_repository') %> <%= input('location') %>
+    - git:
+        repo: "<%= input('git_repository') %>"
+        dest: "<%= input('location') %>"
       register: out
+
     - debug: var=out

data/lib/foreman_ansible/register.rb.orig

@@ -0,0 +1,257 @@
+# frozen_string_literal: true
+
+Foreman::Plugin.register :foreman_ansible do
+  requires_foreman '>= 3.3'
+
+  settings do
+    category :ansible, N_('Ansible') do
+      setting 'ansible_ssh_private_key_file',
+              type: :string,
+              description: N_('Use this to supply a path to an SSH Private Key '\
+                               'that Ansible will use in lieu of a password '\
+                               'Override with "ansible_ssh_private_key_file" '\
+                               'host parameter'),
+              default: '',
+              full_name: N_('Private Key Path')
+      setting 'ansible_connection',
+              type: :string,
+              description: N_('Use this connection type by default when running '\
+                               'Ansible playbooks. You can override this on hosts by '\
+                               'adding a parameter "ansible_connection"'),
+              default: 'ssh',
+              full_name: N_('Connection type')
+      setting 'ansible_winrm_server_cert_validation',
+              type: :string,
+              description: N_('Enable/disable WinRM server certificate '\
+                               'validation when running Ansible playbooks. You can override '\
+                               'this on hosts by adding a parameter '\
+                               '"ansible_winrm_server_cert_validation"'),
+              default: 'validate',
+              full_name: N_('WinRM cert Validation')
+      setting 'ansible_verbosity',
+              type: :integer,
+              description: N_('Foreman will add this level of verbosity for '\
+                               'additional debugging output when running Ansible playbooks.'),
+              default: '0',
+              full_name: N_('Default verbosity level'),
+              value: nil,
+              collection: proc {
+                { '0' => N_('Disabled'),
+                  '1' => N_('Level 1 (-v)'),
+                  '2' => N_('Level 2 (-vv)'),
+                  '3' => N_('Level 3 (-vvv)'),
+                  '4' => N_('Level 4 (-vvvv)') }
+              }
+      setting 'ansible_post_provision_timeout',
+              type: :integer,
+              description: N_('Timeout (in seconds) to set when Foreman will trigger a '\
+                               'play Ansible roles task after a host is fully provisioned. '\
+                               'Set this to the maximum time you expect a host to take '\
+                               'until it is ready after a reboot.'),
+              default: '360',
+              full_name: N_('Post-provision timeout')
+      setting 'ansible_interval',
+              type: :integer,
+              description: N_('Timeout (in minutes) when hosts should have reported.'),
+              default: '30',
+              full_name: N_('Ansible report timeout')
+      setting 'ansible_out_of_sync_disabled',
+              type: :boolean,
+              description: format(N_('Disable host configuration status turning to out of'\
+                               ' sync for %{cfgmgmt} after report does not arrive within'\
+                               ' configured interval'), :cfgmgmt => 'Ansible'),
+              default: false,
+              full_name: format(N_('%{cfgmgmt} out of sync disabled'), :cfgmgmt => 'Ansible')
+      setting  'ansible_inventory_template',
+               type: :string,
+               description: N_('Foreman will use this template to schedule the report '\
+                                 'with Ansible inventory'),
+               default: 'Ansible - Ansible Inventory',
+               full_name: N_('Default Ansible inventory report template')
+      setting 'ansible_roles_to_ignore',
+              type: :array,
+              description: N_('Those roles will be excluded when importing roles from smart proxy, '\
+                'The expected input is comma separated values and you can use * wildcard metacharacters'\
+                'For example: foo*, *b*,*bar'),
+              default: [],
+              full_name: N_('Ansible roles to ignore')
+      setting 'foreman_ansible_proxy_batch_size',
+              type: :integer,
+              description: N_('Number of tasks which should be sent to the smart proxy in one request, '\
+                              'if foreman_tasks_proxy_batch_trigger is enabled. '\
+                              'If set, overrides foreman_tasks_proxy_batch_size setting for Ansible jobs.'),
+              default: nil,
+              full_name: N_('Proxy tasks batch size for Ansible')
+    end
+  end
+
+  security_block :foreman_ansible do
+    permission :play_roles_on_host,
+               { :hosts => [:play_roles, :multiple_play_roles],
+                 :'api/v2/hosts' => [:play_roles,
+                                     :multiple_play_roles] },
+               :resource_type => 'Host'
+    permission :play_roles_on_hostgroup,
+               { :hostgroups => [:play_roles],
+                 :'api/v2/hostgroups' => [:play_roles,
+                                          :multiple_play_roles] },
+               :resource_type => 'Hostgroup'
+    permission :view_ansible_roles,
+               { :ansible_roles => [:index, :auto_complete_search],
+                 :'api/v2/ansible_roles' => [:index, :show, :fetch],
+                 :ui_ansible_roles => [:index] },
+               :resource_type => 'AnsibleRole'
+    permission :destroy_ansible_roles,
+               { :ansible_roles => [:destroy],
+                 :'api/v2/ansible_roles' => [:destroy, :obsolete] },
+               :resource_type => 'AnsibleRole'
+    permission :import_ansible_roles,
+               { :ansible_roles => [:import, :confirm_import],
+                 :'api/v2/ansible_roles' => [:import, :sync] },
+               :resource_type => 'AnsibleRole'
+    permission :view_ansible_variables,
+               {
+                 :lookup_values => [:index],
+                 :ansible_variables => [:index, :auto_complete_search],
+                 :'api/v2/ansible_variables' => [:index, :show]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :edit_ansible_variables,
+               { :lookup_values => [:update],
+                 :ansible_variables => [:edit, :update],
+                 :'api/v2/ansible_variables' => [:update],
+                 :'api/v2/ansible_override_values' => [:create, :destroy] },
+               :resource_type => 'AnsibleVariable'
+    permission :destroy_ansible_variables,
+               {
+                 :lookup_values => [:destroy],
+                 :ansible_variables => [:destroy],
+                 :'api/v2/ansible_variables' => [:destroy, :obsolete]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :create_ansible_variables,
+               {
+                 :lookup_values => [:create],
+                 :ansible_variables => [:new, :create],
+                 :'api/v2/ansible_variables' => [:create]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :import_ansible_variables,
+               {
+                 :ansible_variables => [:import, :confirm_import],
+                 :'api/v2/ansible_variables' => [:import]
+               },
+               :resource_type => 'AnsibleVariable'
+    permission :view_hosts,
+               { :'api/v2/hosts' => [:ansible_roles],
+                 :'api/v2/ansible_inventories' => [:hosts] },
+               :resource_type => 'Host'
+    permission :view_hostgroups,
+               { :'api/v2/hostgroups' => [:ansible_roles],
+                 :'api/v2/ansible_inventories' => [:hostgroups] },
+               :resource_type => 'Hostgroup'
+    permission :edit_hosts,
+               { :'api/v2/hosts' => [:assign_ansible_roles] },
+               :resource_type => 'Host'
+    permission :edit_hostgroups,
+               { :'api/v2/hostgroups' => [:assign_ansible_roles] },
+               :resource_type => 'Hostgroup'
+    permission :generate_ansible_inventory,
+               { :'api/v2/ansible_inventories' => [:schedule] }
+    permission :import_ansible_playbooks,
+               { :'api/v2/ansible_playbooks' => [:sync, :fetch] }
+  end
+
+  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,
+        :create_ansible_variables, :import_ansible_variables,
+        :edit_ansible_variables, :destroy_ansible_variables, :import_ansible_playbooks]
+
+  role 'Ansible Tower Inventory Reader',
+       [:view_hosts, :view_hostgroups, :view_facts, :generate_report_templates, :generate_ansible_inventory,
+        :view_report_templates],
+       'Permissions required for the user which is used by Ansible Tower Dynamic Inventory Item'
+
+  add_all_permissions_to_default_roles
+  extend_template_helpers ForemanAnsible::RendererMethods
+  allowed_template_helpers :insights_remediation
+
+  base_role_assignment_params = { :ansible_role_ids => [],
+                                  :ansible_roles => [] }
+  parameter_filter Host::Managed, base_role_assignment_params.merge(:host_ansible_roles_attributes => {})
+  parameter_filter Hostgroup, base_role_assignment_params.merge(:hostgroup_ansible_roles_attributes => {})
+
+  register_global_js_file 'global'
+
+  extend_graphql_type :type => '::Types::Host' do
+    field :all_ansible_roles, ::Types::InheritedAnsibleRole.connection_type, :null => true, :method => :present_all_ansible_roles
+    field :own_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
+    field :available_ansible_roles, ::Types::AnsibleRole.connection_type, :null => true
+    field :ansible_variables_with_overrides, Types::OverridenAnsibleVariable.connection_type, :null => false
+
+    def present_all_ansible_roles
+      inherited_ansible_roles = object.inherited_ansible_roles.map { |role| ::Presenters::AnsibleRolePresenter.new(role, true) }
+      ansible_roles = object.ansible_roles.map { |role| ::Presenters::AnsibleRolePresenter.new(role, false) }
+      (inherited_ansible_roles + ansible_roles).uniq
+    end
+
+    def ansible_variables_with_overrides
+      resolver = ::ForemanAnsible::OverrideResolver.new(object)
+      AnsibleVariable.where(:ansible_role_id => object.all_ansible_roles.pluck(:id), :override => true).map { |variable| ::Presenters::OverridenAnsibleVariablePresenter.new variable, resolver }
+    end
+  end
+
+  register_graphql_query_field :ansible_roles, '::Types::AnsibleRole', :collection_field
+  register_graphql_mutation_field :assign_ansible_roles, '::Mutations::Hosts::AssignAnsibleRoles'
+  register_graphql_mutation_field :delete_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Delete
+  register_graphql_mutation_field :update_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Update
+  register_graphql_mutation_field :create_ansible_variable_override, ::Mutations::AnsibleVariableOverrides::Create
+
+  divider :top_menu, :caption => N_('Ansible'), :parent => :configure_menu
+  menu :top_menu, :ansible_roles,
+       :caption => N_('Roles'),
+       :url_hash => { :controller => :ansible_roles, :action => :index },
+       :parent => :configure_menu
+  menu :top_menu, :ansible_variables,
+       :caption => N_('Variables'),
+       :url_hash => { :controller => :ansible_variables, :action => :index },
+       :parent => :configure_menu
+
+  apipie_documented_controllers [
+    "#{ForemanAnsible::Engine.root}/app/controllers/api/v2/*.rb"
+  ]
+  ApipieDSL.configuration.dsl_classes_matchers += [
+    "#{ForemanAnsible::Engine.root}/app/models/*.rb",
+    "#{ForemanAnsible::Engine.root}/app/services/foreman_ansible/*.rb"
+  ]
+
+  register_info_provider ForemanAnsible::AnsibleInfo
+
+  # For backwards compatiblity with 1.17
+  if respond_to?(:register_report_scanner)
+    register_report_scanner ForemanAnsible::AnsibleReportScanner
+    register_report_origin 'Ansible', 'ConfigReport'
+  end
+
+<<<<<<< HEAD
+  describe_host do
+    multiple_actions_provider :ansible_hosts_multiple_actions
+=======
+  extend_page('smart_proxies/show') do |context|
+    context.add_pagelet :smart_proxy_title_actions,
+                        :name => _('Update Smart Proxy'),
+                        :partial => 'foreman/smart_proxies/update_smart_proxy',
+                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
+  end
+  extend_page('smart_proxies/index') do |context|
+    context.add_pagelet :smart_proxy_title_actions,
+                        :name => _('Update Smart Proxy'),
+                        :partial => 'foreman/smart_proxies/update_smart_proxy',
+                        :onlyif => ->(proxy, view) { view.can_update_proxy?(proxy) }
+>>>>>>> a707dab (Fixes #35143 - Add a smart proxy update button)
+  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 = '7.1.1'
+  VERSION = '7.1.2'
 end

data/webpack/components/AnsibleHostDetail/components/RolesTab/EditRolesModal/index.js

@@ -54,6 +54,7 @@ const EditRolesModal = ({
 
   const renameData = data => ({
     availableRoles: data.host.availableAnsibleRoles.nodes,
+    assignedRoles,
   });
 
   return (
@@ -64,7 +65,7 @@ const EditRolesModal = ({
       baseModalProps={baseModalProps}
       fetchFn={useFetchFn}
       renameData={renameData}
-      renamedDataPath="availableRoles"
+      renamedDataPath="availableRoles.assignedRoles"
       assignedRoles={assignedRoles}
       closeModal={closeModal}
       hostId={hostId}

data/webpack/components/withLoading.js

@@ -13,14 +13,12 @@ import {
 } from '../permissionsHelper';
 import ErrorState from './ErrorState';
 
-const pluckData = (data, path) => {
+const getResultsLength = (data, path) => {
   const split = path.split('.');
-  return split.reduce((memo, item) => {
-    if (item) {
-      return memo[item];
-    }
-    throw new Error('Unexpected empty segment in response data path');
-  }, data);
+  return split.reduce(
+    (prevValue, currentValue) => prevValue + data[currentValue]?.length || 0,
+    0
+  );
 };
 
 const withLoading = Component => {
@@ -79,12 +77,9 @@ const withLoading = Component => {
     }
 
     const renamedData = renameData(data);
-    const result = pluckData(renamedData, renamedDataPath);
+    const resultLength = getResultsLength(renamedData, renamedDataPath);
 
-    if (
-      showEmptyState &&
-      ((Array.isArray(result) && result.length === 0) || !result)
-    ) {
+    if (showEmptyState && !resultLength) {
       return emptyWrapper(
         <EmptyState
           {...{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -224,6 +224,7 @@ files:
 - lib/foreman_ansible.rb
 - lib/foreman_ansible/engine.rb
 - lib/foreman_ansible/register.rb
+- lib/foreman_ansible/register.rb.orig
 - lib/foreman_ansible/remote_execution.rb
 - lib/foreman_ansible/version.rb
 - locale/Makefile