foreman_ansible 6.2.0 → 6.3.0

data/webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.test.js

@@ -18,7 +18,10 @@ const fixtures = {
     itemCount: 2,
     onPaginationChange: noop,
     onRemoveRole: noop,
+    onMoveRole: noop,
     resourceName: 'host',
+    toDestroyRoles: [],
+    unassignedRoles: [],
   },
 };
 

data/webpack/components/AnsibleRolesSwitcher/components/OrderedRolesTooltip.js

@@ -0,0 +1,23 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Tooltip, Icon, OverlayTrigger } from 'patternfly-react';
+
+const OrderedRolesTooltip = props => {
+  const tooltip = (
+    <Tooltip id="assigned-ansible-roles-tooltip">
+      <span>
+        {__(
+          'Use drag and drop to change order of the roles. Ordering of roles is respected for Ansible runs, inherited roles are always before those assigned directly'
+        )}
+      </span>
+    </Tooltip>
+  );
+
+  return (
+    <OverlayTrigger overlay={tooltip} trigger={['hover', 'focus']}>
+      <Icon type="pf" name="info" style={{ 'margin-right': '10px' }} />
+    </OverlayTrigger>
+  );
+};
+
+export default OrderedRolesTooltip;

data/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AnsibleRoleInputs.test.js.snap

@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AnsibleRoleInputs should render role to add 1`] = `
+<Fragment>
+  <input
+    name="host[host_ansible_roles_attributes][14][id]"
+    type="hidden"
+    value={5}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][ansible_role_id]"
+    type="hidden"
+    value={2}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][position]"
+    type="hidden"
+    value={15}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][_destroy]"
+    type="hidden"
+    value={false}
+  />
+</Fragment>
+`;
+
+exports[`AnsibleRoleInputs should render role to remove 1`] = `
+<Fragment>
+  <input
+    name="host[host_ansible_roles_attributes][14][id]"
+    type="hidden"
+    value={5}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][ansible_role_id]"
+    type="hidden"
+    value={2}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][position]"
+    type="hidden"
+    value={15}
+  />
+  <input
+    name="host[host_ansible_roles_attributes][14][_destroy]"
+    type="hidden"
+    value={true}
+  />
+</Fragment>
+`;

data/webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AssignedRolesList.test.js.snap

@@ -1,29 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`AssignedRolesList should render 1`] = `
-<div>
+<DndProvider
+  backend={[Function]}
+>
   <ListView
     className=""
   >
-    <div
-      className="sticky-pagination sticky-pagination-grey"
-    >
-      <PaginationWrapper
-        dropdownButtonId="assigned-ansible-roles-pagination-row-dropdown"
-        itemCount={2}
-        onChange={[Function]}
-        pagination={
-          Object {
-            "page": 1,
-            "perPage": 25,
-          }
-        }
-        viewType="list"
-      />
-    </div>
-    <AnsibleRole
+    <Component
       icon="fa fa-minus-circle"
+      index={0}
       key="1"
+      moveValue={[Function]}
       onClick={[Function]}
       resourceName="host"
       role={
@@ -33,9 +21,11 @@ exports[`AssignedRolesList should render 1`] = `
         }
       }
     />
-    <AnsibleRole
+    <Component
       icon="fa fa-minus-circle"
+      index={1}
       key="2"
+      moveValue={[Function]}
       onClick={[Function]}
       resourceName="host"
       role={
@@ -47,18 +37,28 @@ exports[`AssignedRolesList should render 1`] = `
     />
   </ListView>
   <div>
-    <input
+    <AnsibleRoleInputs
+      idx={0}
       key="1"
-      name="host[ansible_role_ids][]"
-      type="hidden"
-      value={1}
+      resourceName="host"
+      role={
+        Object {
+          "id": 1,
+          "name": "fake.role",
+        }
+      }
     />
-    <input
+    <AnsibleRoleInputs
+      idx={1}
       key="2"
-      name="host[ansible_role_ids][]"
-      type="hidden"
-      value={2}
+      resourceName="host"
+      role={
+        Object {
+          "id": 2,
+          "name": "test.role",
+        }
+      }
     />
   </div>
-</div>
+</DndProvider>
 `;

data/webpack/components/AnsibleRolesSwitcher/index.js

@@ -7,15 +7,13 @@ import AnsiblePermissionDenied from './components/AnsiblePermissionDenied';
 import withProtectedView from './components/withProtectedView';
 import {
   selectUnassignedRoles,
-  selectAssignedRolesPage,
   selectAssignedRoles,
-  selectAssignedRolesCount,
   selectResults,
   selectPaginationMemoized,
   selectItemCount,
   selectLoading,
-  selectAssignedPagination,
   selectError,
+  selectToDestroyRoles,
 } from './AnsibleRolesSwitcherSelectors';
 
 const mapStateToProps = state => ({
@@ -24,11 +22,9 @@ const mapStateToProps = state => ({
   itemCount: selectItemCount(state),
   loading: selectLoading(state),
   error: selectError(state),
-  assignedPagination: selectAssignedPagination(state),
-  assignedRolesCount: selectAssignedRolesCount(state),
-  assignedRoles: selectAssignedRolesPage(state),
-  allAssignedRoles: selectAssignedRoles(state),
+  assignedRoles: selectAssignedRoles(state),
   unassignedRoles: selectUnassignedRoles(state),
+  toDestroyRoles: selectToDestroyRoles(state),
 });
 
 const mapDispatchToProps = dispatch =>

data/webpack/index.js

@@ -2,6 +2,7 @@ import componentRegistry from 'foremanReact/components/componentRegistry';
 import injectReducer from 'foremanReact/redux/reducers/registerReducer';
 import ReportJsonViewer from './components/ReportJsonViewer';
 import AnsibleRolesSwitcher from './components/AnsibleRolesSwitcher';
+import WrappedImportRolesAndVariables from './components/AnsibleRolesAndVariables';
 import reducer from './reducer';
 
 componentRegistry.register({
@@ -13,4 +14,9 @@ componentRegistry.register({
   type: AnsibleRolesSwitcher,
 });
 
+componentRegistry.register({
+  name: 'WrappedImportRolesAndVariables',
+  type: WrappedImportRolesAndVariables,
+});
+
 injectReducer('foremanAnsible', reducer);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_ansible
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Daniel Lobato Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman_ansible_core
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
@@ -104,8 +118,10 @@ files:
 - app/controllers/ui_ansible_roles_controller.rb
 - app/helpers/foreman_ansible/ansible_plugin_helper.rb
 - app/helpers/foreman_ansible/ansible_reports_helper.rb
+- app/helpers/foreman_ansible/ansible_roles_data_preparations.rb
 - app/helpers/foreman_ansible/ansible_roles_helper.rb
 - app/helpers/foreman_ansible/hosts_helper_extensions.rb
+- app/jobs/sync_roles_and_variables.rb
 - app/lib/actions/foreman_ansible/helpers/play_roles_description.rb
 - app/lib/proxy_api/ansible.rb
 - app/models/ansible_role.rb
@@ -128,6 +144,8 @@ files:
 - app/services/foreman_ansible/fact_importer.rb
 - app/services/foreman_ansible/fact_parser.rb
 - app/services/foreman_ansible/fact_sparser.rb
+- app/services/foreman_ansible/import_roles_and_variables_error_notification.rb
+- app/services/foreman_ansible/import_roles_and_variables_success_notification.rb
 - app/services/foreman_ansible/insights_notification_builder.rb
 - app/services/foreman_ansible/insights_plan_runner.rb
 - app/services/foreman_ansible/inventory_creator.rb
@@ -144,7 +162,6 @@ files:
 - app/views/ansible_roles/welcome.html.erb
 - app/views/ansible_variables/_fields.erb
 - app/views/ansible_variables/edit.html.erb
-- app/views/ansible_variables/import.html.erb
 - app/views/ansible_variables/index.html.erb
 - app/views/ansible_variables/new.html.erb
 - app/views/api/v2/ansible_override_values/show.json.rabl
@@ -152,6 +169,7 @@ files:
 - app/views/api/v2/ansible_roles/index.json.rabl
 - app/views/api/v2/ansible_roles/obsolete.json.rabl
 - app/views/api/v2/ansible_roles/show.json.rabl
+- app/views/api/v2/ansible_roles/sync.json.rabl
 - app/views/api/v2/ansible_variables/create.json.rabl
 - app/views/api/v2/ansible_variables/destroy.json.rabl
 - app/views/api/v2/ansible_variables/import.json.rabl
@@ -169,11 +187,13 @@ files:
 - app/views/foreman_ansible/api/v2/ansible_roles/show.json.rabl
 - app/views/foreman_ansible/config_reports/_ansible.html.erb
 - app/views/foreman_ansible/config_reports/_output.html.erb
+- app/views/foreman_ansible/job_templates/ansible_collections_-_install_from_galaxy.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_ansible_default.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_galaxy.erb
 - app/views/foreman_ansible/job_templates/ansible_roles_-_install_from_git.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
 - app/views/foreman_ansible/job_templates/package_action_-_ansible_default.erb
@@ -200,6 +220,8 @@ files:
 - db/migrate/20190328114657_remove_top_level_ansible_variables_setting.rb
 - db/migrate/20191010074208_remove_ansible_implementation_setting.rb
 - db/migrate/20200421201839_update_ansible_inv_template_name.rb
+- db/migrate/20210120150019_add_position_to_ansible_role.rb
+- db/seeds.d/100_common_parameters.rb
 - db/seeds.d/62_ansible_proxy_feature.rb
 - db/seeds.d/75_job_templates.rb
 - db/seeds.d/90_notification_blueprints.rb
@@ -252,9 +274,11 @@ files:
 - 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/report.json
 - test/fixtures/sample_facts.json
+- 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
@@ -276,6 +300,8 @@ files:
 - test/unit/helpers/ansible_reports_helper_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_roles_and_variables.rb
 - test/unit/lib/foreman_ansible_core/ansible_runner_test.rb
 - test/unit/lib/foreman_ansible_core/command_creator_test.rb
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
@@ -292,8 +318,20 @@ files:
 - test/unit/services/structured_fact_importer_test.rb
 - test/unit/services/ui_roles_importer_test.rb
 - webpack/__mocks__/foremanReact/common/I18n.js
+- webpack/__mocks__/foremanReact/common/helpers.js
 - webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js
 - webpack/__mocks__/foremanReact/components/common/EmptyState.js
+- webpack/__mocks__/foremanReact/components/common/forms/OrderableSelect/helpers.js
+- webpack/__mocks__/foremanReact/redux/API.js
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.js
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.scss
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesActions.js
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesConstants.js
+- webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesHelpers.js
+- webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesHelpers.test.js
+- webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesImport.test.js
+- webpack/components/AnsibleRolesAndVariables/__test__/__snapshots__/AnsibleRolesAndVariablesImport.test.js.snap
+- webpack/components/AnsibleRolesAndVariables/index.js
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.js
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcher.scss
 - webpack/components/AnsibleRolesSwitcher/AnsibleRolesSwitcherActions.js
@@ -314,13 +352,17 @@ files:
 - webpack/components/AnsibleRolesSwitcher/components/AnsibleRole.js
 - webpack/components/AnsibleRolesSwitcher/components/AnsibleRole.test.js
 - webpack/components/AnsibleRolesSwitcher/components/AnsibleRoleActionButton.js
+- webpack/components/AnsibleRolesSwitcher/components/AnsibleRoleInputs.js
+- webpack/components/AnsibleRolesSwitcher/components/AnsibleRoleInputs.test.js
 - webpack/components/AnsibleRolesSwitcher/components/AnsibleRolesSwitcherError.js
 - webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.js
 - webpack/components/AnsibleRolesSwitcher/components/AssignedRolesList.test.js
 - webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.js
 - webpack/components/AnsibleRolesSwitcher/components/AvailableRolesList.test.js
+- webpack/components/AnsibleRolesSwitcher/components/OrderedRolesTooltip.js
 - webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AnsiblePermissionDenied.test.js.snap
 - webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AnsibleRole.test.js.snap
+- webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AnsibleRoleInputs.test.js.snap
 - webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AssignedRolesList.test.js.snap
 - webpack/components/AnsibleRolesSwitcher/components/__snapshots__/AvailableRolesList.test.js.snap
 - webpack/components/AnsibleRolesSwitcher/components/withProtectedView.js
@@ -355,15 +397,16 @@ test_files:
 - 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_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/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
@@ -381,16 +424,19 @@ test_files:
 - test/unit/lib/foreman_ansible_core/playbook_runner_test.rb
 - test/unit/lib/proxy_api/ansible_test.rb
 - test/unit/services/ansible_report_importer_test.rb
-- test/unit/services/api_roles_importer_test.rb
 - test/unit/services/fact_importer_test.rb
-- test/unit/services/fact_parser_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/inventory_creator_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/host_ansible_role_test.rb
 - test/unit/hostgroup_ansible_role_test.rb
+- test/unit/import_roles_and_variables.rb
+- test/unit/ignore_roles_test.rb
+- test/foreman_ansible/helpers/ansible_roles_helper_test.rb

data/app/views/ansible_variables/import.html.erb

@@ -1,56 +0,0 @@
-<% title _("Changed Ansible variables") %>
-<%= form_tag confirm_import_ansible_variables_path do %>
-  <h4><%= _("Select the changes you want to realize in Foreman") %></h4>
-  <h6>
-  <%= _("Toggle") %>:
-  <%= link_to_function(icon_text("check", _("New")),
-                       "toggleCheckboxesBySelector('.variable_select_boxes_new')",
-                       :title => _("Check/Uncheck new")) %> |
-  <%= link_to_function(icon_text("check", _("Obsolete")),
-                       "toggleCheckboxesBySelector('.variable_select_boxes_obsolete')",
-                       :title => _("Check/Uncheck obsolete")) %>
-  <%= link_to_function(icon_text("check", _("Update")),
-                       "toggleCheckboxesBySelector('.variable_select_boxes_update')",
-                       :title => _("Check/Uncheck update")) %>
-  </h6>
-  <table class="<%= table_css_classes %>">
-    <thead>
-      <tr>
-        <th class="ca">
-          <%= link_to_function(icon_text("check"),
-                               "toggleCheckboxesBySelector('.variable_select_boxes')",
-                               :title => _("Check/Uncheck all")) %>
-        </th>
-        <th><%= _("Name") %></th>
-        <th><%= _("Ansible role") %></th>
-        <th class="col-md-2"><%= _("Hosts count") %></th>
-        <th class="col-md-2"><%= _("Hostgroups count") %></th>
-        <th><%= _("Operation") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% changed.each do |kind, variables| %>
-        <% variables.each do |variable| %>
-          <tr>
-            <td>
-              <%= check_box_tag "changed[#{kind}][#{variable.ansible_role}][#{variable}]", variable.to_json, false, :class => "variable_select_boxes variable_select_boxes_#{kind} variable_select_boxes_variable_#{variable}" %>
-            </td>
-            <td>
-              <%= link_to_function("#{variable}", "toggleCheckboxesBySelector('.variable_select_boxes_variable_#{variable}')", :title => _("Check/Uncheck all %s changes") % variable) %>
-            </td>
-            <td><%= variable.ansible_role %></td>
-            <td><%= variable.ansible_role.hosts.count %></td>
-            <td><%= variable.ansible_role.hostgroups.count %></td>
-            <td>
-              <%= { "new" => _("Add"), "obsolete" => _("Remove"), "update" => _("Update") }[kind] %>
-            </td>
-          </tr>
-        <% end %>
-      <% end %>
-    </tbody>
-  </table>
-  <div>
-    <%= link_to _("Cancel"), ansible_variables_path, :class => "btn btn-default" %>
-    <%= submit_tag _("Update"), :class => "btn btn-primary" %>
-  </div>
-<% end %>