manually back ported some enhacements from infra.aap_configuration_ex…

…tended (#15) * manually back ported some enhacenments from infra.aap_configuration_extended * manually back ported some enhacenments from infra.aap_configuration_extended * manually back ported some enhacenments from infra.aap_configuration_extended * manually back ported some enhacenments from infra.aap_configuration_extended. lintering fixes * manually back ported some enhacenments from infra.aap_configuration_extended. lintering fixes * manually back ported some enhacenments from infra.aap_configuration_extended. lintering fixes
redhat-cop · Dec 18, 2024 · 870f24b · 870f24b
1 parent 59aa6f2
commit 870f24b
Show file tree

Hide file tree

Showing 151 changed files with 1,063 additions and 376 deletions.
diff --git a/.github/controller_install_inventories/openshift_awx b/.github/controller_install_inventories/openshift_awx
@@ -15,7 +15,6 @@ pg_password=awxpass
 pg_database=awx
 pg_port=5432
 
-
 admin_user=admin
 admin_password=password
 

diff --git a/.github/files/galaxy.yml.j2 b/.github/files/galaxy.yml.j2
@@ -11,7 +11,10 @@ authors:
     - Tom Page @Tompage1994
     - Sean Sullivan @sean-m-sullivan
     - David Danielsson @djdanielsson
-repository: {{ collection_repo }}
+    - Ivan Aragonés
+    - Silvio Perez
+    - Adonis García
+repository: {{ collection_repo }}/
 issues: {{ collection_repo }}/issues
 build_ignore:
     - galaxy.yml.j2

diff --git a/.github/workflows/ci_standalone_versioned.yml b/.github/workflows/ci_standalone_versioned.yml
@@ -80,7 +80,7 @@ jobs:
           collection_namespace: infra
           collection_name: controller_configuration
           collection_version: 2.0.0
-          collection_repo: https://github.com/redhat-cop/controller_configuration/
+          collection_repo: https://github.com/redhat-cop/infra.controller_configuration/
 
       - name: "Install Galaxy dependencies"
         run: ansible-galaxy collection install -r .github/collections/requirements.yml

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -3,17 +3,16 @@
 # See .pre-commit-config.yaml for what hooks are executed
 name: pre-commit tests
 
-
 on:
   push:
     branches:
-    - '*_'  # ending underscore for trying things
-    - devel
+      - '*_'  # ending underscore for trying things
+      - devel
     tags:
-    - '*_'  # ending underscore for trying things
-    - 'v[0-9]+.[0-9]+.[0-9]+'  # final version
-    - 'v[0-9]+.[0-9]+.[0-9]+[abrc]+[0-9]+'  # alpha, beta, release candidate (rc)
-    - 'v[0-9]+.[0-9]+.[0-9]+.dev[0-9]+'  # development versions
+      - '*_'  # ending underscore for trying things
+      - 'v[0-9]+.[0-9]+.[0-9]+'  # final version
+      - 'v[0-9]+.[0-9]+.[0-9]+[abrc]+[0-9]+'  # alpha, beta, release candidate (rc)
+      - 'v[0-9]+.[0-9]+.[0-9]+.dev[0-9]+'  # development versions
   pull_request:
   schedule:
     - cron: "0 6 * * *"
@@ -25,6 +24,6 @@ jobs:
       collection_namespace: infra
       collection_name: controller_configuration
       collection_version: 2.10.0
-      collection_repo: https://github.com/redhat-cop/controller_configuration/
+      collection_repo: https://github.com/redhat-cop/infra.controller_configuration/
       collection_dependencies: awx.awx
 ...
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -39,7 +39,7 @@ jobs:
       galaxy_publish_2: false
       ah_publish_2: true
       collection_version: ${{ github.ref_name }}
-      collection_repo: https://github.com/redhat-cop/controller_configuration/
+      collection_repo: https://github.com/redhat-cop/infra.controller_configuration/
       quay_username: redhat_cop
       collection_dependencies: awx.awx
       matrix_message: This Ansible collection allows for easy interaction with an AWX or Ansible Controller server via Ansible roles using the AWX/Controller collection modules.

diff --git a/.github/workflows/release_manual.yml b/.github/workflows/release_manual.yml
@@ -27,7 +27,7 @@ jobs:
       galaxy_publish_2: false
       ah_publish_2: true
       collection_version: ${{ github.event.inputs.tagged_version }}
-      collection_repo: https://github.com/redhat-cop/controller_configuration/
+      collection_repo: https://github.com/redhat-cop/infra.controller_configuration/
       quay_username: redhat_cop
       collection_dependencies: awx.awx
       matrix_message: This Ansible collection allows for easy interaction with an AWX or Ansible Controller server via Ansible roles using the AWX/Controller collection modules.

diff --git a/.github/workflows/update_pre_commit.yml b/.github/workflows/update_pre_commit.yml
@@ -3,7 +3,6 @@
 # See .pre-commit-config.yaml for what hooks are executed
 name: Update pre-commit configuration
 
-
 on:
   schedule:
     - cron: "0 5 * * *"

diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-collections/*
-!collections/requirements.yml
+ansible_collections
 *.tar.gz
 *.pyc
 id_rsa*

diff --git a/.yamllint.yml b/.yamllint.yml
@@ -10,11 +10,23 @@ rules:
   colons:
     max-spaces-before: 0
     max-spaces-after: -1
+  comments:
+    min-spaces-from-content: 1 # prettier compatibility
+  comments-indentation: false
+  document-start: disable
   document-end: {present: true}
   indentation:
     level: error
     # Require indentation https://redhat-cop.github.io/automation-good-practices/#_yaml_and_jinja2_syntax
     indent-sequences: true
+  braces:
+    min-spaces-inside: 0 # yamllint defaults to 0
+    max-spaces-inside: 1 # yamllint defaults to 0
+  key-duplicates:
+    forbid-duplicated-merge-keys: true # not enabled by default
+  octal-values:
+    forbid-implicit-octal: true # yamllint defaults to false
+    forbid-explicit-octal: true # yamllint defaults to false
   truthy:
     level: error
     # Allow only YAML 1.2 booleans https://redhat-cop.github.io/automation-good-practices/#_yaml_and_jinja2_syntax

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # Red Hat Communities of Practice Controller Configuration Collection
 
-![pre-commit tests](https://github.com/redhat-cop/controller_configuration/actions/workflows/pre-commit.yml/badge.svg)
-![Release](https://github.com/redhat-cop/controller_configuration/actions/workflows/release.yml/badge.svg)
-<!-- markdownlint-disable-line MD033 MD034 --><a href="https://raw.githubusercontent.com/redhat-cop/controller_configuration/devel/docs/aap_config_as_code_public_meeting.ics"><img border="0" alt="Google Calendar invite" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a>
+![pre-commit tests](https://github.com/redhat-cop/infra.controller_configuration/actions/workflows/pre-commit.yml/badge.svg)
+![Release](https://github.com/redhat-cop/infra.controller_configuration/actions/workflows/release.yml/badge.svg)
+<!-- markdownlint-disable-line MD033 MD034 --><a href="https://raw.githubusercontent.com/redhat-cop/infra.controller_configuration/devel/docs/aap_config_as_code_public_meeting.ics"><img border="0" alt="Google Calendar invite" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a>
 <!-- Further CI badges go here as above -->
 
 This Ansible collection allows for easy interaction with an AWX or Ansible Controller server via Ansible roles using the AWX/Controller collection modules.
@@ -41,7 +41,7 @@ The awx.awx or ansible.controller collections MUST be installed in order for thi
 
 |                                      Collection Name                                       |                 Purpose                  |
 |:------------------------------------------------------------------------------------------:|:----------------------------------------:|
-| [Controller Configuration](https://github.com/redhat-cop/controller_configuration) |   Automation controller configuration    |
+| [Controller Configuration](https://github.com/redhat-cop/infra.controller_configuration) |   Automation controller configuration    |
 |             [EE Utilities](https://github.com/redhat-cop/ee_utilities)             | Execution Environment creation utilities |
 |     [AAP installation Utilities](https://github.com/redhat-cop/aap_utilities)      |  Ansible Automation Platform Utilities   |
 |   [AAP Configuration Template](https://github.com/redhat-cop/aap_configuration_template)   |  Configuration Template for this suite   |
@@ -179,13 +179,13 @@ Adding the ability to use direct output from the awx export command in the roles
 
 ## Contributing to this collection
 
-We welcome community contributions to this collection. If you find problems, please open an issue or create a PR against the [Controller Configuration collection repository](https://github.com/redhat-cop/controller_configuration).
-More information about contributing can be found in our [Contribution Guidelines.](https://github.com/redhat-cop/controller_configuration/blob/devel/.github/CONTRIBUTING.md)
+We welcome community contributions to this collection. If you find problems, please open an issue or create a PR against the [Controller Configuration collection repository](https://github.com/redhat-cop/infra.controller_configuration).
+More information about contributing can be found in our [Contribution Guidelines.](https://github.com/redhat-cop/infra.controller_configuration/blob/devel/.github/CONTRIBUTING.md)
 
-We have a community meeting every 4 weeks. Find the agenda in the [issues](https://github.com/redhat-cop/controller_configuration/issues) and the calendar invitation below:
+We have a community meeting every 4 weeks. Find the agenda in the [issues](https://github.com/redhat-cop/infra.controller_configuration/issues) and the calendar invitation below:
 
 <!-- markdownlint-disable-next-line MD033 MD034 -->
-<a target="_blank" href="https://raw.githubusercontent.com/redhat-cop/controller_configuration/devel/docs/aap_config_as_code_public_meeting.ics"><img border="0" alt="Google Calendar invite" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a>
+<a target="_blank" href="https://raw.githubusercontent.com/redhat-cop/infra.controller_configuration/devel/docs/aap_config_as_code_public_meeting.ics"><img border="0" alt="Google Calendar invite" src="https://www.google.com/calendar/images/ext/gc_button1_en-GB.gif"></a>
 
 ## Code of Conduct
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -402,7 +402,7 @@ releases:
     changes:
       bugfixes:
       - Enable the ability to define simple_workflow_nodes on workflow_job_templates
-        without the need to set the `state` on a workflow_job_template (https://github.com/redhat-cop/controller_configuration/issues/297).
+        without the need to set the `state` on a workflow_job_template (https://github.com/redhat-cop/infra.controller_configuration/issues/297).
       minor_changes:
       - Add max_forks, max_concurrent_jobs as options to instance_groups role
       - Add no_log everywhere controller_api_plugin is used to avoid to expose sensitive

diff --git a/changelogs/fragments/filetree_back_port.yml b/changelogs/fragments/filetree_back_port.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - Backport enhacenments from infra.aap_configuration_extended
+...
diff --git a/changelogs/fragments/filetree_create_allow_skip_inventory_related_objects.yml b/changelogs/fragments/filetree_create_allow_skip_inventory_related_objects.yml
@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - filetree_create is able to export inventory without sources/hosts/groups.
+...
diff --git a/changelogs/fragments/filetree_create_customize_exported_objects.yml b/changelogs/fragments/filetree_create_customize_exported_objects.yml
@@ -0,0 +1,4 @@
+---
+major_changes:
+  - filetree_create is able to use external dictionary to modify object during the export
+...
diff --git a/changelogs/fragments/filetree_create_disabling_key_sorting.yml b/changelogs/fragments/filetree_create_disabling_key_sorting.yml
@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - filetree_create is able to export variables without key sorting
+...
diff --git a/changelogs/fragments/filetree_create_double_quotes_issue.yaml b/changelogs/fragments/filetree_create_double_quotes_issue.yaml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create job_template double quote issue
+...
diff --git a/changelogs/fragments/filetree_create_extra_vars_issue.yml b/changelogs/fragments/filetree_create_extra_vars_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create extra_vars regex issue
+...
diff --git a/changelogs/fragments/filetree_create_hostfilter_issue.yml b/changelogs/fragments/filetree_create_hostfilter_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create exported properly smart inventories host filter (double quotes issue)
+...
diff --git a/changelogs/fragments/filetree_create_issue39.yaml b/changelogs/fragments/filetree_create_issue39.yaml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create job_template and workflow_job_template issues with complex fields
+...
diff --git a/changelogs/fragments/filetree_create_missing_inventory_ask.yml b/changelogs/fragments/filetree_create_missing_inventory_ask.yml
@@ -0,0 +1,5 @@
+---
+bugfixes:
+  - filetree_create export missing inventory ask settings of workflows
+  - filetree_create export missing inventory for workflow node
+...
diff --git a/changelogs/fragments/filetree_create_missing_limits_workflows.yml b/changelogs/fragments/filetree_create_missing_limits_workflows.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create export missing limits settings of workflows
+...
diff --git a/changelogs/fragments/filetree_create_missing_support_approval_node.yml b/changelogs/fragments/filetree_create_missing_support_approval_node.yml
@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - filetree_create is able to export approval node of workflow
+...
diff --git a/changelogs/fragments/filetree_create_role_issue.yml b/changelogs/fragments/filetree_create_role_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create roles export issue
+...
diff --git a/changelogs/fragments/filetree_create_role_issues.yaml b/changelogs/fragments/filetree_create_role_issues.yaml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create roles export issues introduced by PR #14
+...
diff --git a/changelogs/fragments/filetree_create_schedule_extra_data_issue.yml b/changelogs/fragments/filetree_create_schedule_extra_data_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create no longer export schedules extra data when extra_vars of job template is empty (null issue)
+...
diff --git a/changelogs/fragments/filetree_create_single_inventory.yaml b/changelogs/fragments/filetree_create_single_inventory.yaml
@@ -0,0 +1,4 @@
+---
+minor_changes:
+  - filetree_create able to export single inventory
+...
diff --git a/changelogs/fragments/filetree_create_survey_defaults_issue.yaml b/changelogs/fragments/filetree_create_survey_defaults_issue.yaml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create job_template and workflow_job_template survey default values issue when they are multiline
+...
diff --git a/changelogs/fragments/filetree_create_unsafe_regex_issue.yml b/changelogs/fragments/filetree_create_unsafe_regex_issue.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - filetree_create properly escape every variable with unsafe
+...
diff --git a/docs/CONVERSION_GUIDE.md b/docs/CONVERSION_GUIDE.md
@@ -26,6 +26,7 @@ Otherwise it will look for the modules only in your base installation. If there
 ### Major Variable names changed
 
 The Following Variables need to be changed:
+
 |Tower Variable Name|Controller Variable Name|
 |:---:|:---:|
 |`tower_ad_hoc_commands`|`controller_ad_hoc_commands`|

diff --git a/docs/aap_config_as_code_public_meeting.ics b/docs/aap_config_as_code_public_meeting.ics
@@ -14,7 +14,7 @@ URL:https://meet.google.com/npj-fyzv-oyo
 X-GOOGLE-CONFERENCE:https://meet.google.com/npj-fyzv-oyo
 DESCRIPTION:
  https://forum.ansible.com/t/aap-config-as-code-office-hours-first-thursday-of-every-month/398\n\n
- https://github.com/redhat-cop/controller_configuration/issues?q=is%3Aissue+is%3Aopen+label%3Aoffice_hours\n\n
+ https://github.com/redhat-cop/infra.controller_configuration/issues?q=is%3Aissue+is%3Aopen+label%3Aoffice_hours\n\n
  -::~:~::~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~:~
  :~:~:~:~:~:~:~:~:~:~:~:~::~:~::-\nJoin with Google Meet: https://meet.go
  ogle.com/npj-fyzv-oyo\nOr dial: (US) +1 470-722-0265 PIN: 621302239#\n\n

diff --git a/galaxy.yml b/galaxy.yml
@@ -11,6 +11,9 @@ authors:
     - Tom Page @Tompage1994
     - Sean Sullivan @sean-m-sullivan
     - David Danielsson @djdanielsson
+    - Ivan Aragonés
+    - Silvio Perez
+    - Adonis García
 repository: https://github.com/redhat-cop/infra.controller_configuration/
 issues: https://github.com/redhat-cop/infra.controller_configuration/issues
 build_ignore:

diff --git a/plugins/modules/controller_export_diff.py b/plugins/modules/controller_export_diff.py
@@ -62,7 +62,7 @@
       elements: str
     inventory_sources:
       description:
-        - inventory soruces to export
+        - inventory sources to export
       type: list
       elements: str
     inventory:

diff --git a/roles/ad_hoc_command/README.md b/roles/ad_hoc_command/README.md
@@ -100,7 +100,7 @@ controller_ad_hoc_commands:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/ad_hoc_command_cancel/README.md b/roles/ad_hoc_command_cancel/README.md
@@ -91,7 +91,7 @@ controller_ad_hoc_commands_cancel:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/applications/README.md b/roles/applications/README.md
@@ -142,7 +142,7 @@ controller_applications:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/bulk_host_create/README.md b/roles/bulk_host_create/README.md
@@ -137,7 +137,7 @@ controller_bulk_hosts:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/bulk_job_launch/README.md b/roles/bulk_job_launch/README.md
@@ -135,7 +135,7 @@ This also speeds up the overall role.
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/credential_input_sources/README.md b/roles/credential_input_sources/README.md
@@ -168,7 +168,7 @@ controller_credential_input_sources:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/credential_types/README.md b/roles/credential_types/README.md
@@ -243,7 +243,7 @@ controller_credential_types:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/credentials/README.md b/roles/credentials/README.md
@@ -169,7 +169,7 @@ controller_credentials:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md
@@ -113,7 +113,7 @@ This also speeds up the overall role. Each individual role has its own variable
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author
 

diff --git a/roles/execution_environments/README.md b/roles/execution_environments/README.md
@@ -132,7 +132,7 @@ controller_execution_environments:
 
 ## License
 
-[GPL-3.0](https://github.com/redhat-cop/controller_configuration#licensing)
+[GPL-3.0](https://github.com/redhat-cop/infra.controller_configuration#licensing)
 
 ## Author