foreman_ansible 7.1.0 → 7.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc6d250a74d7e811600edfd0f78551286d8800644512d4346fd6d5794fe451f3
-  data.tar.gz: f7057a56a7e5fda90510ab9aa13b70b59efa90f07a8e7fb3460140102e36d390
+  metadata.gz: 2754fa1c5a9834d8b174906f4848ce5ba7e5699a9c757e6761b24c1ced021f52
+  data.tar.gz: b9c7d3e372fbde5eb5a6e5b94af335293ec660b81511c23f4cd519868632988a
 SHA512:
-  metadata.gz: 99dbfada521e9075ae164312cdf3eecb85e663beca47e558b5d3fd61cde68bb2a632e29f80ca9dcbf5519be3122a15b6c2777f4400b6bd685c84f2488a02baf4
-  data.tar.gz: b8a5fde3a9bb62aaf578b5d08ef24afe6bd9ddc2ac7af33b732a6c8eadfeb077dc92f0db86496975f44d3b9ad0c59acdb176f1722e964de5a4afb7a7c826182c
+  metadata.gz: 933f56fb3c7eb0389397067189f9b64f7fc2ec44fb631e26b0943748b80c80f51b23e2897f4175ff4e8f28b5dbd1232e51641a429b07de1fd2786ba7d44fc4bc
+  data.tar.gz: d9c4973117fa530f4dfbd93720692a9331c1172b120f66aa6df4cb59f9dfe3162b2004c5f7e2e9b1f3bf99283524154fb2e1fe4a8045839c97823895a446a8e6

data/app/graphql/presenters/ansible_role_presenter.rb

@@ -4,6 +4,10 @@ module Presenters
 
     delegate :id, :name, :association, :to => :ansible_role
 
+    def self.graphql_type
+      'Types::InheritedAnsibleRole'
+    end
+
     def initialize(ansible_role, inherited)
       @ansible_role = ansible_role
       @inherited = inherited

data/app/graphql/types/ansible_role.rb

@@ -6,5 +6,6 @@ module Types
 
     field :name, String, :null => false
     field :path, resolver: Resolvers::AnsibleRole::Path
+    has_many :ansible_variables, ::Types::AnsibleVariable
   end
 end

data/app/graphql/types/inherited_ansible_role.rb

@@ -2,6 +2,10 @@ module Types
   class InheritedAnsibleRole < ::Types::AnsibleRole
     field :inherited, Boolean, :null => false
 
+    def self.record_for(object)
+      object.ansible_role
+    end
+
     def object_class
       object.ansible_role.class
     end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 Foreman::Plugin.register :foreman_ansible do
-  requires_foreman '>= 3.0'
+  requires_foreman '>= 3.3'
 
   settings do
     category :ansible, N_('Ansible') do

data/lib/foreman_ansible/remote_execution.rb

@@ -48,12 +48,6 @@ module ForemanAnsible
         :description => N_('Upgrade Capsules on given Capsule server hosts'),
         :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
       )
-      RemoteExecutionFeature.register(
-        :ansible_configure_cloud_connector,
-        N_('Configure Cloud Connector on given hosts'),
-        :description => N_('Configure Cloud Connector on given hosts'),
-        :proxy_selector_override => ::RemoteExecutionProxySelector::INTERNAL_PROXY
-      )
     end
   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.0'
+  VERSION = '7.1.3'
 end

data/test/graphql/queries/host_ansible_roles_query_test.rb

@@ -0,0 +1,61 @@
+require 'test_plugin_helper'
+
+module Queries
+  class HostAnsibleRolesQueryTest < GraphQLQueryTestCase
+    let(:role1) { FactoryBot.create(:ansible_role) }
+    let(:role2) { FactoryBot.create(:ansible_role) }
+    let(:hostgroup) { FactoryBot.create(:hostgroup, ansible_roles: [role1]) }
+    let(:host) { FactoryBot.create(:host, hostgroup: hostgroup, ansible_roles: [role2]) }
+    let(:variables) { { id: Foreman::GlobalId.for(host) } }
+    let(:query) do
+      <<-GRAPHQL
+      query ($id: String!) {
+        host(id: $id) {
+          id
+          allAnsibleRoles {
+            totalCount
+            nodes {
+              id
+              name
+              inherited
+              ansibleVariables {
+                totalCount
+                nodes {
+                  key
+                  override
+                }
+              }
+            }
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    context 'with admin permissions' do
+      let(:context_user) { FactoryBot.create(:user, :admin) }
+      let(:data) { result['data']['host']['allAnsibleRoles'] }
+
+      it 'allows to fetch inherited roles' do
+        value(data['totalCount']).must_equal(2)
+        r1_data = data['nodes'].first
+        r2_data = data['nodes'].second
+        value(r1_data['name']).must_equal(role1.name)
+        value(r1_data['inherited']).must_equal(true)
+        value(r2_data['name']).must_equal(role2.name)
+        value(r2_data['inherited']).must_equal(false)
+      end
+
+      it 'allow fetching variables' do
+        var1 = FactoryBot.create(:ansible_variable, ansible_role: role1, override: true)
+        FactoryBot.create(:ansible_variable, ansible_role: role1)
+        FactoryBot.create(:ansible_variable, ansible_role: role2, override: true)
+        r1_vars = data['nodes'].first['ansibleVariables']
+        r2_vars = data['nodes'].second['ansibleVariables']
+        value(r1_vars['totalCount']).must_equal(2)
+        value(r2_vars['totalCount']).must_equal(1)
+        value(r1_vars['nodes'].first['key']).must_equal(var1.key)
+      end
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
-
+import { isEqual } from 'lodash';
 import { useMutation } from '@apollo/client';
 
 import { Button, Modal, Spinner } from '@patternfly/react-core';
@@ -21,17 +21,15 @@ const EditRolesForm = props => {
     actions,
   } = props;
 
-  const [formState, setFormState] = useState({
-    availableOptions: [],
-    chosenOptions: [],
-  });
+  const initAvailableOpt = availableRoles.map(item => item.name);
+  const initChosenOpt = assignedRoles.map(item => item.name);
+  const [availableOptions, setAvailableOptions] = useState(initAvailableOpt);
+  const [chosenOptions, setChosenOptions] = useState(initChosenOpt);
 
-  useEffect(() => {
-    setFormState({
-      availableOptions: availableRoles.map(item => item.name),
-      chosenOptions: assignedRoles.map(item => item.name) || [],
-    });
-  }, [availableRoles, assignedRoles]);
+  const onListChange = (nextAvailable, nextChosen) => {
+    setAvailableOptions(nextAvailable);
+    setChosenOptions(nextChosen);
+  };
 
   const [callMutation, { loading }] = useMutation(assignAnsibleRoles, {
     onCompleted: onCompleted(closeModal),
@@ -42,15 +40,19 @@ const EditRolesForm = props => {
 
   const variables = {
     id: encodeId('Host', hostId),
-    ansibleRoleIds: roleNamesToIds(allRoles, formState.chosenOptions),
+    ansibleRoleIds: roleNamesToIds(allRoles, chosenOptions),
   };
 
+  const didNotModifyOptions = () =>
+    isEqual(initAvailableOpt.sort(), availableOptions.sort()) &&
+    isEqual(initChosenOpt, chosenOptions); // The order of the chosen options is important.
+
   const formActions = [
     <Button
       key="confirm"
       variant="primary"
       onClick={() => callMutation({ variables })}
-      isDisabled={loading}
+      isDisabled={loading || didNotModifyOptions()}
       aria-label="submit ansible roles"
     >
       {__('Confirm')}
@@ -65,14 +67,9 @@ const EditRolesForm = props => {
   return (
     <Modal {...baseModalProps} actions={formActions}>
       <DualList
-        availableOptions={formState.availableOptions}
-        chosenOptions={formState.chosenOptions}
-        onListChange={(newAvailable, newChosen) =>
-          setFormState({
-            availableOptions: newAvailable,
-            chosenOptions: newChosen,
-          })
-        }
+        availableOptions={availableOptions}
+        chosenOptions={chosenOptions}
+        onListChange={onListChange}
       />
     </Modal>
   );
@@ -80,11 +77,16 @@ const EditRolesForm = props => {
 
 EditRolesForm.propTypes = {
   closeModal: PropTypes.func.isRequired,
-  assignedRoles: PropTypes.array.isRequired,
-  availableRoles: PropTypes.array.isRequired,
+  assignedRoles: PropTypes.array,
+  availableRoles: PropTypes.array,
   actions: PropTypes.array.isRequired,
   hostId: PropTypes.number.isRequired,
   baseModalProps: PropTypes.object.isRequired,
 };
 
+EditRolesForm.defaultProps = {
+  assignedRoles: [],
+  availableRoles: [],
+};
+
 export default withLoading(EditRolesForm);

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

@@ -20,7 +20,7 @@ const EditRolesModal = ({
   canEditHost,
 }) => {
   const baseModalProps = {
-    width: '70%',
+    width: '50%',
     isOpen,
     className: 'foreman-modal',
     showClose: false,
@@ -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/AnsibleRolesSwitcher/__tests__/AnsibleRolesSwitcher.test.js

@@ -2,8 +2,6 @@ import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AnsibleRolesSwitcher from '../AnsibleRolesSwitcher';
 
-jest.mock('foremanReact/components/Pagination/PaginationWrapper');
-
 const noop = () => {};
 
 const fixtures = {

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.0
+  version: 7.1.3
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -186,7 +186,6 @@ files:
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.erb
 - app/views/foreman_ansible/job_templates/ansible_windows_updates.erb
 - app/views/foreman_ansible/job_templates/capsule_upgrade_-_ansible_default.erb
-- app/views/foreman_ansible/job_templates/configure_cloud_connector_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/convert_to_rhel.erb
 - app/views/foreman_ansible/job_templates/maintenance_plan.erb
 - app/views/foreman_ansible/job_templates/module_action_-_ansible_default.erb
@@ -289,6 +288,7 @@ files:
 - 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/actions/run_ansible_job_test.rb
 - test/unit/actions/run_proxy_ansible_command_test.rb
@@ -458,54 +458,55 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.2.26
 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_roles.rb
+- test/factories/ansible_variables.rb
+- 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/foreman_ansible/helpers/ansible_roles_helper_test.rb
 - test/functional/ansible_roles_controller_test.rb
-- test/functional/api/v2/ansible_variables_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/ansible_playbooks_controller_test.rb
-- test/functional/api/v2/ansible_inventories_controller_test.rb
 - test/functional/api/v2/hosts_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/foreman_ansible/helpers/ansible_roles_helper_test.rb
+- test/graphql/queries/host_ansible_roles_query_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/ansible_report_importer_test.rb
-- test/unit/services/insights_plan_runner_test.rb
-- test/unit/services/override_resolver_test.rb
-- test/unit/services/roles_importer_test.rb
-- test/unit/services/inventory_creator_test.rb
-- test/unit/services/ansible_variables_importer_test.rb
-- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/ansible_provider_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/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/ansible_provider_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/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/fixtures/playbooks_example_output.json
-- test/fixtures/sample_playbooks.json
-- test/test_plugin_helper.rb
+- test/unit/lib/proxy_api/ansible_test.rb
+- test/unit/services/ansible_report_importer_test.rb
+- test/unit/services/ansible_variables_importer_test.rb
+- test/unit/services/api_roles_importer_test.rb
+- test/unit/services/insights_plan_runner_test.rb
+- test/unit/services/inventory_creator_test.rb
+- test/unit/services/override_resolver_test.rb
+- test/unit/services/roles_importer_test.rb
+- test/unit/services/ui_roles_importer_test.rb

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

@@ -1,37 +0,0 @@
-<%#
-name: Configure Cloud Connector
-snippet: false
-template_inputs:
-- name: satellite_user
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: false
-- name: satellite_password
-  required: true
-  input_type: user
-  advanced: false
-  value_type: plain
-  hidden_value: true
-- name: http_proxy
-  required: false
-  input_type: user
-  advanced: true
-  value_type: plain
-  hidden_value: false
-  description: You can specify a HTTP proxy address that should be used for Cloud Connector connection to the cloud.redhat.com. Note that it must be HTTP proxy, not HTTPS. The tunelling of SSL (secured web socket connection) in SSL (HTTPS proxy) is currently unsupported.
-model: JobTemplate
-job_category: Maintenance Operations
-description_format: "%{template_name}"
-provider_type: Ansible
-kind: job_template
-feature: ansible_configure_cloud_connector
-%>
-
----
-- hosts: all
-  vars:
-    satellite_url: "<%= foreman_server_url %>"
-  roles:
-    - project-receptor.satellite_receptor_installer