foreman_ansible 7.0.1 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f339d8ddcc4cb0ae8402d9df48653f437cdfa509784a8fa5774a9ff8b9d6645
-  data.tar.gz: ed2f5f5a56da334a955280c523cccf5488df9c37c61e267047b0653e5521031f
+  metadata.gz: 299049c29764a0920259664c06288f37ea56d4b920e049243baeab9ad7f2e608
+  data.tar.gz: 779264101df1f9fa6e0188c8673a435b98eb4dbd9fd814e754f991247b5bb250
 SHA512:
-  metadata.gz: 19ac46f57b3606646821aafa291523a0b5973f4cb2012011b30a84ff4696ea57a0cdf81fb84d0db435d6e1c1c43ec77f1b9e5b17b40318a626ccf5f7c30e6add
-  data.tar.gz: 43c1ebc458690ac43ba94ceb7cac037d41517e9d2236ea7e7e64d220a51dc166c44448492eca45174bb16371170e2d2b5093c40eb5200431cb381c7f9f8882af
+  metadata.gz: '08a1b935eb0c033ff08674e4922ee597d39ed602ef351b82d9ac763af9d850e5a32ff9ea482af7f74a641552ebaf62094b6fa59170cba317b5bba67949d31a8d'
+  data.tar.gz: 3f814381b2167e370757f761a0b5d3e1217e3c3ba4293d7f1ecf1e77599c232ef8c62beae293c8593d81ab4e305ae1cced983527bc6d29e248bbda3a3f4e731e

data/app/graphql/resolvers/ansible_role/path.rb

@@ -0,0 +1,11 @@
+module Resolvers
+  module AnsibleRole
+    class Path < Resolvers::BaseResolver
+      type String, null: false
+
+      def resolve
+        Rails.application.routes.url_helpers.ansible_roles_path(search: "name = #{object.name}")
+      end
+    end
+  end
+end

data/app/graphql/resolvers/ansible_variable/path.rb

@@ -0,0 +1,11 @@
+module Resolvers
+  module AnsibleVariable
+    class Path < Resolvers::BaseResolver
+      type String, null: false
+
+      def resolve
+        Rails.application.routes.url_helpers.edit_ansible_variable_path(object.ansible_variable)
+      end
+    end
+  end
+end

data/app/graphql/types/ansible_role.rb

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

data/app/graphql/types/ansible_variable.rb

@@ -5,6 +5,7 @@ module Types
     global_id_field :id
 
     field :key, String
+    field :path, resolver: Resolvers::AnsibleVariable::Path
     field :override, Boolean
     field :description, String
     field :hidden_value, Boolean

data/app/models/foreman_ansible/ansible_provider.rb

@@ -88,7 +88,7 @@ if defined? ForemanRemoteExecution
             :children => [
               {
                 :name => :tags,
-                :type => Array,
+                :type => String,
                 :opts => { :required => false, :desc => N_('A comma separated list of tags to use for Ansible run') }
               },
               {

data/app/services/foreman_ansible/ansible_report_importer.rb

@@ -18,10 +18,6 @@ module ForemanAnsible
         partial_hostname_match(hostname)
       end
 
-      def self.authorized_smart_proxy_features
-        super + ['Ansible']
-      end
-
       def partial_hostname_match(hostname)
         return @host unless @host.new_record?
         hosts = Host.where(Host.arel_table[:name].matches("#{hostname}.%"))

data/lib/foreman_ansible/engine.rb

@@ -75,6 +75,7 @@ module ForemanAnsible
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::HostgroupsController.include ForemanAnsible::Api::V2::HostgroupsParamGroupExtensions
       ::ConfigReportImporter.include ForemanAnsible::AnsibleReportImporter
+      ReportImporter.register_smart_proxy_feature('Ansible')
     rescue StandardError => e
       Rails.logger.warn "Foreman Ansible: skipping engine hook (#{e})"
     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.0.1'
+  VERSION = '7.0.2'
 end

data/webpack/components/AnsibleHostDetail/AnsibleHostDetail.js

@@ -21,6 +21,7 @@ const AnsibleHostDetail = ({
       {response?.id && (
         <>
           <Tabs
+            className="ansible-host-details-tabs"
             onSelect={(evt, subTab) => hashHistory.push(subTab)}
             activeKey={pathname?.split('/')[2]}
             isSecondary

data/webpack/components/AnsibleHostDetail/AnsibleHostDetail.scss

@@ -4,3 +4,7 @@
   background-color: $pf-color-white;
   padding: 1.8rem;
 }
+
+.ansible-host-details-tabs {
+  margin: 0 24px;
+}

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/AnsibleVariableOverridesTable.js

@@ -63,7 +63,7 @@ const AnsibleVariableOverridesTable = ({
 }) => {
   const columns = [
     __('Name'),
-    __('Ansible Role'),
+    __('Ansible role'),
     __('Type'),
     __('Value'),
     __('Source attribute'),
@@ -131,7 +131,7 @@ const AnsibleVariableOverridesTable = ({
     onClick: () => {
       dispatch(
         openConfirmModal({
-          title: __('Delete Ansible Variable Override'),
+          title: __('Delete Ansible variable override'),
           message:
             variable &&
             sprintf(
@@ -187,7 +187,9 @@ const AnsibleVariableOverridesTable = ({
         <Tbody>
           {variables.map((variable, idx) => (
             <Tr key={idx}>
-              <Td>{variable.key}</Td>
+              <Td>
+                <a href={variable.path}>{variable.key}</a>
+              </Td>
               <Td>{variable.ansibleRoleName}</Td>
               <Td>{variable.parameterType}</Td>
               <Td>

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverrides.fixtures.js

@@ -29,6 +29,7 @@ const withFqdnOverride = canEdit => ({
   },
   id: ansibleVariableId,
   key: 'rectangle',
+  path: '/ansible/ansible_variables/1/edit',
   defaultValue: 17,
   parameterType: 'integer',
   ansibleRoleName: 'test.role',
@@ -62,6 +63,7 @@ const withDomainOverride = canEdit => ({
   },
   id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc4',
   key: 'circle',
+  path: '/ansible/ansible_variables/2/edit',
   defaultValue: 'd',
   parameterType: 'string',
   ansibleRoleName: 'test.role',
@@ -133,6 +135,7 @@ export const mocks = [
                 },
                 id: barVariableGlobalId,
                 key: 'bar',
+                path: '/ansible/ansible_variables/11/edit',
                 defaultValue: 'a',
                 parameterType: 'string',
                 ansibleRoleName: 'test.role',
@@ -160,6 +163,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY1',
                 key: 'square',
+                path: '/ansible/ansible_variables/12/edit',
                 defaultValue: true,
                 parameterType: 'boolean',
                 ansibleRoleName: 'test.role',
@@ -179,6 +183,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc4',
                 key: 'circle',
+                path: '/ansible/ansible_variables/13/edit',
                 defaultValue: 'd',
                 parameterType: 'string',
                 ansibleRoleName: 'test.role',
@@ -203,6 +208,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTc5',
                 key: 'ellipse',
+                path: '/ansible/ansible_variables/14/edit',
                 defaultValue: ['seven', 'eight'],
                 parameterType: 'array',
                 ansibleRoleName: 'test.role',
@@ -227,6 +233,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY2Ng==',
                 key: 'spiral',
+                path: '/ansible/ansible_variables/15/edit',
                 defaultValue: { one: 'one', two: 'two' },
                 parameterType: 'hash',
                 ansibleRoleName: 'test.role',
@@ -246,6 +253,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY3Mg==',
                 key: 'sun',
+                path: '/ansible/ansible_variables/16/edit',
                 defaultValue: "{ one: 'one', two: 'two' }",
                 parameterType: 'json',
                 ansibleRoleName: 'test.role',
@@ -265,6 +273,7 @@ export const mocks = [
                 },
                 id: 'MDE6QW5zaWJsZVZhcmlhYmxlLTY3Mw==',
                 key: 'moon',
+                path: '/ansible/ansible_variables/17/edit',
                 defaultValue: [
                   { hosts: 'all', become: 'true', roles: ['foo'] },
                 ],

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/__test__/AnsibleVariableOverridesDelete.test.js

@@ -37,12 +37,12 @@ describe('AnsibleVariableOverrides', () => {
     userEvent.click(screen.getByText('Delete'));
     await waitFor(tick);
     expect(
-      screen.getByText('Delete Ansible Variable Override')
+      screen.getByText('Delete Ansible variable override')
     ).toBeInTheDocument();
     userEvent.click(screen.getByText('Cancel'));
     await waitFor(tick);
     expect(
-      screen.queryByText('Delete Ansible Variable Override')
+      screen.queryByText('Delete Ansible variable override')
     ).not.toBeInTheDocument();
   });
   it('should delete override', async () => {

data/webpack/components/AnsibleHostDetail/components/AnsibleVariableOverrides/index.js

@@ -41,7 +41,10 @@ const AnsibleVariableOverrides = ({ hostId, hostAttrs, history }) => {
       renameData={renameData}
       fetchFn={useFetchFn}
       renamedDataPath="variables"
-      emptyStateTitle={__('No Ansible Variables found for Host')}
+      emptyStateProps={{
+        header: __('No Ansible variables found for Host'),
+        description: __('Only variables marked to Override are shown here.'),
+      }}
       permissions={['view_ansible_variables']}
       pagination={pagination}
       history={history}

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

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
 import { translate as __ } from 'foremanReact/common/I18n';
 
-import { Modal, Button, ModalVariant } from '@patternfly/react-core';
+import { Modal, ModalVariant } from '@patternfly/react-core';
 
 import allAnsibleRolesQuery from '../../../../../graphql/queries/allAnsibleRoles.gql';
 import AllRolesTable from './AllRolesTable';
@@ -17,25 +17,19 @@ const AllRolesModal = ({ hostGlobalId, onClose, history }) => {
   const baseModalProps = {
     variant: ModalVariant.large,
     isOpen: true,
+    onClose,
     className: 'foreman-modal',
-    showClose: false,
-    title: __('All Ansible Roles'),
+    showClose: true,
+    title: __('All assigned Ansible roles'),
     disableFocusTrap: true,
+    description: __(
+      'This list consists of host assigned roles and group assigned roles. Group assigned roles will always be executed prior to host assigned roles'
+    ),
   };
 
   const paginationKeys = { page: 'allPage', perPage: 'allPerPage' };
 
-  const actions = [
-    <Button variant="link" onClick={onClose} key="close">
-      {__('Close')}
-    </Button>,
-  ];
-
-  const wrapper = child => (
-    <Modal {...baseModalProps} actions={actions}>
-      {child}
-    </Modal>
-  );
+  const wrapper = child => <Modal {...baseModalProps}>{child}</Modal>;
 
   const loadingWrapper = child => <Modal {...baseModalProps}>{child}</Modal>;
 

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 import PropTypes from 'prop-types';
 
-import { Modal, Button, ModalVariant } from '@patternfly/react-core';
+import { Modal, Button } from '@patternfly/react-core';
 import { useQuery } from '@apollo/client';
 
 import EditRolesForm from './EditRolesForm';
@@ -20,12 +20,15 @@ const EditRolesModal = ({
   canEditHost,
 }) => {
   const baseModalProps = {
-    variant: ModalVariant.large,
+    width: '70%',
     isOpen,
     className: 'foreman-modal',
     showClose: false,
     title: __('Edit Ansible Roles'),
     disableFocusTrap: true,
+    description: __(
+      'Add, remove or reorder host assigned Ansible roles. This host has also group assigned roles that are not displayed here and will always be executed prior to host assigned roles'
+    ),
   };
 
   const actions = [

data/webpack/components/AnsibleHostDetail/components/RolesTab/RolesTable.js

@@ -48,7 +48,7 @@ const RolesTable = ({
     <FlexItem>
       <Link to="/Ansible/roles/edit">
         <Button aria-label="edit ansible roles">
-          {__('Edit Ansible Roles')}
+          {__('Edit Ansible roles')}
         </Button>
       </Link>
     </FlexItem>
@@ -90,7 +90,9 @@ const RolesTable = ({
         <Tbody>
           {ansibleRoles.map(role => (
             <Tr key={role.id}>
-              <Td>{role.name}</Td>
+              <Td>
+                <a href={role.path}>{role.name}</a>
+              </Td>
             </Tr>
           ))}
         </Tbody>

data/webpack/components/AnsibleHostDetail/components/RolesTab/__test__/EditRoles.test.js

@@ -39,7 +39,7 @@ describe('assigning Ansible roles', () => {
     userEvent.click(screen.getByRole('button', { name: 'edit ansible roles' }));
     await waitFor(tick);
     await waitFor(tick);
-    expect(screen.getByText('Available options')).toBeInTheDocument();
+    expect(screen.getByText('Available Ansible roles')).toBeInTheDocument();
     userEvent.click(screen.getAllByText('another.role')[1]);
     userEvent.click(screen.getByRole('button', { name: 'Remove selected' }));
     userEvent.click(screen.getByText('geerlingguy.ceylon'));
@@ -67,7 +67,7 @@ describe('assigning Ansible roles', () => {
     await waitFor(tick);
     userEvent.click(screen.getByRole('button', { name: 'edit ansible roles' }));
     await waitFor(tick);
-    expect(screen.getByText('Available options')).toBeInTheDocument();
+    expect(screen.getByText('Available Ansible roles')).toBeInTheDocument();
     userEvent.click(screen.getAllByText('another.role')[1]);
     userEvent.click(screen.getByRole('button', { name: 'Remove selected' }));
     userEvent.click(screen.getByText('geerlingguy.ceylon'));

data/webpack/components/AnsibleHostDetail/components/RolesTab/__test__/RolesTab.fixtures.js

@@ -34,24 +34,28 @@ const role1 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMw==',
   name: 'aardvaark.cube',
+  path: '/ansible/ansible_roles/search="name = aardvaark.cube"',
 };
 
 const role2 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtNQ==',
   name: 'aardvaark.sphere',
+  path: '/ansible/ansible_roles/search="name = aardvaark.sphere"',
 };
 
 const role3 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMzA=',
   name: 'another.role',
+  path: '/ansible/ansible_roles/search="name = another.role"',
 };
 
 const role4 = {
   __typename: 'AnsibleRole',
   id: 'MDE6QW5zaWJsZVJvbGUtMzk=',
   name: 'geerlingguy.ceylon',
+  path: '/ansible/ansible_roles/search="name = geerlingguy.ceylon"',
 };
 
 const ansibleRolesMock = {
@@ -71,26 +75,32 @@ const availableRoles = {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMQ==',
       name: 'theforeman.foreman_scap_client',
+      path:
+        '/ansible/ansible_roles/search="name = theforeman.foreman_scap_client"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMg==',
       name: 'adriagalin.motd',
+      path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtMjI=',
       name: 'geerlingguy.php',
+      path: '/ansible/ansible_roles/search="name = geerlingguy.php"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTc=',
       name: 'robertdebock.epel',
+      path: '/ansible/ansible_roles/search="name = robertdebock.epel"',
     },
     {
       __typename: 'AnsibleRole',
       id: 'MDE6QW5zaWJsZVJvbGUtNTg=',
       name: 'geerlingguy.nfs',
+      path: '/ansible/ansible_roles/search="name = geerlingguy.nfs"',
     },
   ],
 };
@@ -106,6 +116,7 @@ export const allRolesMocks = allAnsibleRolesMockFactory(
         {
           id: 'MDE6QW5zaWJsZVJvbGUtMg==',
           name: 'adriagalin.motd',
+          path: '/ansible/ansible_roles/search="name = adriagalin.motd"',
           inherited: true,
         },
         { ...role1, inherited: false },

data/webpack/components/AnsibleHostDetail/components/RolesTab/__test__/RolesTab.test.js

@@ -38,14 +38,18 @@ describe('RolesTab', () => {
     );
     await waitFor(tick);
     expect(screen.getByText('view all assigned roles')).toBeInTheDocument();
-    expect(screen.queryByText('All Ansible Roles')).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('All assigned Ansible roles')
+    ).not.toBeInTheDocument();
     userEvent.click(screen.getByText('view all assigned roles'));
     await waitFor(tick);
-    expect(screen.getByText('All Ansible Roles')).toBeInTheDocument();
+    expect(screen.getByText('All assigned Ansible roles')).toBeInTheDocument();
     expect(screen.getByText('Inherited from Hostgroup')).toBeInTheDocument();
     userEvent.click(screen.getByRole('button', { name: 'Close' }));
     await waitFor(tick);
-    expect(screen.queryByText('All Ansible Roles')).not.toBeInTheDocument();
+    expect(
+      screen.queryByText('All assigned Ansible roles')
+    ).not.toBeInTheDocument();
   });
   it('should load Ansible Roles as viewer', async () => {
     render(

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

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useQuery } from '@apollo/client';
+import { Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import ansibleRolesQuery from '../../../../graphql/queries/hostAnsibleRoles.gql';
@@ -10,11 +11,12 @@ import {
   useParamsToVars,
   useCurrentPagination,
 } from '../../../../helpers/pageParamsHelper';
+import EditRolesModal from './EditRolesModal';
 
 const RolesTab = ({ hostId, history, canEditHost }) => {
   const hostGlobalId = encodeId('Host', hostId);
   const pagination = useCurrentPagination(history);
-
+  const [assignModal, setAssignModal] = useState(false);
   const renameData = data => ({
     ansibleRoles: data.host.ownAnsibleRoles.nodes,
     totalCount: data.host.ownAnsibleRoles.totalCount,
@@ -26,19 +28,41 @@ const RolesTab = ({ hostId, history, canEditHost }) => {
       fetchPolicy: 'network-only',
     });
 
+  const editBtn = canEditHost ? (
+    <Button
+      onClick={() => setAssignModal(true)}
+      aria-label="edit ansible roles"
+    >
+      {__('Assign Ansible roles')}
+    </Button>
+  ) : null;
   return (
-    <RolesTable
-      fetchFn={useFetchFn}
-      renamedDataPath="ansibleRoles"
-      renameData={renameData}
-      permissions={['view_ansible_roles']}
-      history={history}
-      hostGlobalId={hostGlobalId}
-      emptyStateProps={{ title: __('No Ansible roles assigned') }}
-      pagination={pagination}
-      canEditHost={canEditHost}
-      hostId={hostId}
-    />
+    <>
+      <RolesTable
+        fetchFn={useFetchFn}
+        renamedDataPath="ansibleRoles"
+        renameData={renameData}
+        permissions={['view_ansible_roles']}
+        history={history}
+        hostGlobalId={hostGlobalId}
+        emptyStateProps={{
+          header: __('No Ansible roles assigned'),
+          action: editBtn,
+        }}
+        pagination={pagination}
+        canEditHost={canEditHost}
+        hostId={hostId}
+      />
+      {assignModal && (
+        <EditRolesModal
+          closeModal={() => setAssignModal(false)}
+          isOpen={assignModal}
+          assignedRoles={[]}
+          hostId={hostId}
+          canEditHost={canEditHost}
+        />
+      )}
+    </>
   );
 };
 

data/webpack/components/DualList/index.js

@@ -63,7 +63,7 @@ const DualList = props => {
   return (
     <div className="pf-c-dual-list-selector">
       <ListPane
-        title={__('Available options')}
+        title={__('Available Ansible roles')}
         items={props.availableOptions}
         paneClass="pf-m-available"
         onItemClick={onItemClick('availableSelected')}
@@ -81,7 +81,7 @@ const DualList = props => {
         removeSelectedDisabled={selectState.chosenSelected.length === 0}
       />
       <ListPane
-        title={__('Chosen options')}
+        title={__('Host assigned Ansible roles')}
         items={props.chosenOptions}
         paneClass="pf-m-chosen"
         draggable

data/webpack/graphql/queries/hostAnsibleRoles.gql

@@ -8,6 +8,7 @@ query($id: String!, $first: Int, $last: Int) {
       nodes {
         id
         name
+        path
       }
     }
   }

data/webpack/graphql/queries/hostVariableOverrides.gql

@@ -8,6 +8,7 @@ query($id: String!, $match: String, $first: Int, $last: Int) {
       nodes {
         id
         key
+        path
         meta {
           canEdit
         }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 7.0.1
+  version: 7.0.2
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -101,6 +101,8 @@ files:
 - app/graphql/mutations/hosts/assign_ansible_roles.rb
 - app/graphql/presenters/ansible_role_presenter.rb
 - app/graphql/presenters/overriden_ansible_variable_presenter.rb
+- app/graphql/resolvers/ansible_role/path.rb
+- app/graphql/resolvers/ansible_variable/path.rb
 - app/graphql/types/ansible_role.rb
 - app/graphql/types/ansible_variable.rb
 - app/graphql/types/ansible_variable_override.rb
@@ -445,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.4
 signing_key:
 specification_version: 4
 summary: Ansible integration with Foreman (theforeman.org)