fixing a few more issues found (#18)

* modified: .github/controller_install_inventories/openshift_awx modified: .github/workflows/pre-commit.yml modified: .github/workflows/update_pre_commit.yml modified: CHANGELOG.rst modified: CODEOWNERS modified: README.md modified: plugins/lookup/controller_object_diff.py modified: plugins/modules/controller_export_diff.py modified: roles/filetree_create/README.md modified: roles/filetree_create/meta/argument_specs.yml modified: roles/filetree_create/meta/main.yml modified: roles/filetree_read/meta/argument_specs.yml modified: roles/filetree_read/meta/main.yml modified: roles/filetree_read/tests/config-controller-filetree.yml modified: roles/object_diff/meta/argument_specs.yml modified: roles/object_diff/meta/main.yml modified: roles/object_diff/tasks/schedules.yml modified: roles/object_diff/tests/drop_diff.yml modified: tests/configure_controller_export_model.yml modified: tests/playbooks/configure_awx.yml modified: tests/playbooks/configure_controller.yml modified: tests/templates/controller_config.yml * renamed: .github/workflows/ci_standalone.yml -> .github/disabled_workflows/ci_standalone.yml renamed: .github/workflows/ci_standalone_versioned.yml -> .github/disabled_workflows/ci_standalone_versioned.yml * modified: galaxy.yml modified: roles/filetree_create/meta/main.yml modified: roles/filetree_read/meta/main.yml modified: roles/filetree_read/tests/config-controller-filetree.yml modified: roles/object_diff/meta/main.yml modified: roles/object_diff/tests/drop_diff.yml modified: roles/offline_sync/tasks/main.yml deleted: tests/configure_controller.yml deleted: tests/configure_controller_export_model.yml deleted: tests/playbooks/configure_awx.yml deleted: tests/playbooks/configure_controller.yml * modified: .github/workflows/pre-commit.yml modified: .yamllint.yml * modified: plugins/lookup/controller_object_diff.py modified: plugins/modules/controller_export_diff.py * deleted: tests/sanity/ignore-2.14.txt deleted: tests/sanity/ignore-2.15.txt
redhat-cop · Oct 24, 2024 · 6c01bbe · 6c01bbe
1 parent 0ef46a3
commit 6c01bbe
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 572 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/workflows/ci_standalone.yml → .github/disabled_workflows/ci_standalone.yml b/.github/workflows/ci_standalone.yml → .github/disabled_workflows/ci_standalone.yml
diff --git a/...hub/workflows/ci_standalone_versioned.yml → ...led_workflows/ci_standalone_versioned.yml b/...hub/workflows/ci_standalone_versioned.yml → ...led_workflows/ci_standalone_versioned.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 * * *"
@@ -26,5 +25,5 @@ jobs:
       collection_name: aap_configuration_extended
       collection_version: 1.0.0
       collection_repo: https://github.com/redhat-cop/aap_configuration_extended/
-      collection_dependencies: awx.awx
+      collection_dependencies: awx.awx ansible.hub
 ...
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/.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/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,7 +4,6 @@ infra.aap_configuration_extended Release Notes
 
 .. contents:: Topics
 
-
 v0.1.0
 ======
 

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -2,4 +2,4 @@
 roles/filetree_create @silvinux @ivarmu @adonisgarciac
 roles/filetree_read @silvinux @ivarmu @adonisgarciac
 roles/object_diff @silvinux @ivarmu @adonisgarciac
-roles/offline_sync @djdanielsson
+roles/offline_sync @djdanielsson
diff --git a/README.md b/README.md
@@ -48,7 +48,6 @@ The awx.awx or ansible.controller collections MUST be installed in order for thi
 | [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             |
 
-
 ## Included content
 
 Click the `Content` button to see the list of content included in this collection.

diff --git a/galaxy.yml b/galaxy.yml
@@ -2,7 +2,7 @@
 namespace: infra
 name: aap_configuration_extended
 version: 1.0.0-devel
-description: A collection of roles to extend functionality of aap_configuration collection 
+description: A collection of roles to extend functionality of aap_configuration collection
 readme: README.md
 authors:
     - Andrew Huffman

diff --git a/plugins/lookup/controller_object_diff.py b/plugins/lookup/controller_object_diff.py
@@ -340,8 +340,8 @@ def run(self, terms, variables=None, **kwargs):
                     if self.equal_dicts(compare_item, item, "state"):
                         break
                     elif (
-                        ("organization" in compare_item)  # permission applies to all objects in orga
-                        and (len(compare_item) == 3)  # we only have orga, team/user, and role
+                        ("organization" in compare_item)  # permission applies to all objects in org
+                        and (len(compare_item) == 3)  # we only have org, team/user, and role
                         and self.equal_dicts(compare_item, item, ["organization"] + list(item.keys() - compare_item.keys()))
                     ):
                         break

diff --git a/plugins/modules/controller_export_diff.py b/plugins/modules/controller_export_diff.py
@@ -8,10 +8,8 @@
 
 __metaclass__ = type
 
-
 ANSIBLE_METADATA = {"metadata_version": "1.1", "status": ["preview"], "supported_by": "community"}
 
-
 DOCUMENTATION = """
 ---
 module: controller_export_diff
@@ -62,7 +60,7 @@
       elements: str
     inventory_sources:
       description:
-        - inventory soruces to export
+        - inventory sources to export
       type: list
       elements: str
     inventory:

diff --git a/roles/filetree_create/README.md b/roles/filetree_create/README.md
@@ -72,7 +72,6 @@ A list of other roles hosted on Galaxy should go here, plus any details in regar
       tags:
         - always
 
-
   roles:
     - infra.aap_configuration_extended.filetree_create
 

diff --git a/roles/filetree_create/meta/argument_specs.yml b/roles/filetree_create/meta/argument_specs.yml
@@ -26,7 +26,6 @@ argument_specs:
         type: bool
         description: Whether to create output files without objects id.
 
-
       # Async variables
       controller_configuration_async_retries:
         default: 30
@@ -37,7 +36,6 @@ argument_specs:
         required: false
         description: This variable sets delay between retries across all roles as a default.
 
-
       # No_log variables
       controller_configuration_filetree_create_secure_logging:
         default: "{{ controller_configuration_secure_logging | default(false) }}"

diff --git a/roles/filetree_create/meta/main.yml b/roles/filetree_create/meta/main.yml
@@ -33,7 +33,6 @@ galaxy_info:
       versions:
         - "all"
 
-
   galaxy_tags: []
   # List tags for your role here, one per line. A tag is a keyword that describes
   # and categorizes the role. Users find roles by searching for tags. Be sure to
@@ -48,5 +47,5 @@ collections:
 dependencies:
   # List your role dependencies here, one per line. Be sure to remove the '[]' above,
   # if you add dependencies to this list.
-  - role: meta_dependency_check
+  - role: infra.aap_configuration.meta_dependency_check
 ...
diff --git a/roles/filetree_read/meta/argument_specs.yml b/roles/filetree_read/meta/argument_specs.yml
@@ -152,7 +152,6 @@ argument_specs:
         required: false
         description: This variable sets delay between retries across all roles as a default.
 
-
       # No_log variables
       controller_configuration_filetree_create_secure_logging:
         default: "{{ controller_configuration_secure_logging | default(false) }}"

diff --git a/roles/filetree_read/meta/main.yml b/roles/filetree_read/meta/main.yml
@@ -33,7 +33,6 @@ galaxy_info:
       versions:
         - "all"
 
-
   galaxy_tags: []
   # List tags for your role here, one per line. A tag is a keyword that describes
   # and categorizes the role. Users find roles by searching for tags. Be sure to
@@ -45,5 +44,5 @@ galaxy_info:
 dependencies:
   # List your role dependencies here, one per line. Be sure to remove the '[]' above,
   # if you add dependencies to this list.
-  - role: meta_dependency_check
+  - role: infra.aap_configuration.meta_dependency_check
 ...
diff --git a/roles/filetree_read/tests/config-controller-filetree.yml b/roles/filetree_read/tests/config-controller-filetree.yml
@@ -33,8 +33,8 @@
             controller_oauthtoken: "{{ authtoken_res.json.token }}"
             controller_oauthtoken_url: "{{ authtoken_res.json.url }}"
   roles:
-    - infra.aap_configuration_extended.d.filetree_read
-    - infra.aap_configuration_extended.dispatch
+    - infra.aap_configuration_extended.filetree_read
+    - infra.aap_configuration.dispatch
 
   post_tasks:
     - name: "Delete the Authentication Token used"

diff --git a/roles/object_diff/meta/argument_specs.yml b/roles/object_diff/meta/argument_specs.yml
@@ -28,7 +28,6 @@ argument_specs:
         required: false
         description: This variable sets delay between retries across all roles as a default.
 
-
       # No_log variables
       controller_configuration_filetree_create_secure_logging:
         default: "{{ controller_configuration_secure_logging | default(false) }}"

diff --git a/roles/object_diff/meta/main.yml b/roles/object_diff/meta/main.yml
@@ -33,7 +33,6 @@ galaxy_info:
       versions:
         - "all"
 
-
   galaxy_tags: []
   # List tags for your role here, one per line. A tag is a keyword that describes
   # and categorizes the role. Users find roles by searching for tags. Be sure to
@@ -45,5 +44,5 @@ galaxy_info:
 dependencies:
   # List your role dependencies here, one per line. Be sure to remove the '[]' above,
   # if you add dependencies to this list.
-  - role: meta_dependency_check
+  - role: infra.aap_configuration.meta_dependency_check
 ...
diff --git a/roles/object_diff/tasks/schedules.yml b/roles/object_diff/tasks/schedules.yml
@@ -19,7 +19,6 @@
                                                        return_all=true, max_objects=query_controller_api_max_objects)
                                               }}"
 
-
 - name: "Get WF and JT IDs"  # noqa jinja[spacing]
   ansible.builtin.set_fact:
     __controller_api_templates_ids: '{{ __controller_api_job_templates | selectattr("id", "defined") | map(attribute="id") | flatten | unique  +  __controller_api_workflow_job_templates | selectattr("id", "defined") | map(attribute="id") | flatten | unique }}'

diff --git a/roles/object_diff/tests/drop_diff.yml b/roles/object_diff/tests/drop_diff.yml
@@ -33,9 +33,9 @@
             controller_oauthtoken_url: "{{ authtoken_res.json.url }}"
 
   roles:
-    - role: infra.aap_configuration_extended.d.filetree_read
+    - role: infra.aap_configuration_extended.filetree_read
     - role: infra.aap_configuration_extended.object_diff
-    - role: infra.aap_configuration_extended.dispatch
+    - role: infra.aap_configuration.dispatch
       vars:
         controller_configuration_dispatcher_roles:
           - {role: workflow_job_templates, var: controller_workflows, tags: workflow_job_templates}

diff --git a/roles/offline_sync/tasks/main.yml b/roles/offline_sync/tasks/main.yml
@@ -14,7 +14,7 @@
   when: (not r_ansible_cfg['stat']['exists']) and (ah_token is not defined or ah_token['token'] is defined)
   block:
     - name: Authenticate and get an API token from Automation Hub
-      ah_token:
+      ansible.hub.ah_token:
         ah_host: "{{ ah_host }}"
         ah_username: "{{ ah_username }}"
         ah_password: "{{ ah_password }}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@ infra.aap_configuration_extended Release Notes

		.. contents:: Topics


		v0.1.0
		======

Expand Down
-Original file line number
+Diff line change
@@ Expand Up @@
           tags:
             - always
       roles:
         - infra.aap_configuration_extended.filetree_create
@@ Expand Down @@