rebase to devel

ansible · Oct 12, 2023 · d116369 · d116369
2 parents 3465dc7 + 508964b
commit d116369
Show file tree

Hide file tree

Showing 48 changed files with 37 additions and 57 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,12 @@
 ---
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: 'https://github.com/ansible-community/ansible-lint.git'
-    rev: v6.17.2
+    rev: v6.20.3
     hooks:
       # see discussions here about what arguments are used, and behavior
       # https://github.com/ansible/ansible-lint/issues/649
@@ -19,7 +19,7 @@ repos:
         args:
           - "--profile=production"
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.8.1
+    rev: v0.10.0
     hooks:
       - id: markdownlint-cli2
   - repo: https://github.com/pycqa/flake8

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,5 @@
 ====================================
-ansible.automation_hub Release Notes
+galaxy.galaxy Release Notes
 ====================================
 
 .. contents:: Topics
@@ -50,7 +50,7 @@ Breaking Changes / Porting Guide
 New Modules
 -----------
 
-- ansible.automation_hub.ah_role - Manage a role of group permissions
+- galaxy.galaxy.ah_role - Manage a role of group permissions
 
 v1.0.1
 ======
@@ -199,7 +199,7 @@ Breaking Changes / Porting Guide
 New Modules
 -----------
 
-- ansible.automation_hub.ah_ee_registry - Manage private automation hub execution environment remote registries.
+- galaxy.galaxy.ah_ee_registry - Manage private automation hub execution environment remote registries.
 
 v0.6.1
 ======

diff --git a/bindep.txt b/bindep.txt
@@ -0,0 +1 @@
+python >=3.5
diff --git a/changelogs/config.yaml b/changelogs/config.yaml
@@ -28,7 +28,7 @@ sections:
   - Bugfixes
 - - known_issues
   - Known Issues
-title: ansible.automation_hub
+title: galaxy.galaxy
 trivial_section_name: trivial
 use_fqcn: true
 ...
diff --git a/changelogs/fragments/collection_repos.yml b/changelogs/fragments/collection_repos.yml
@@ -1,4 +1,5 @@
 ---
 major_changes:
   - Added collection_repository and collection_repository_sync roles and modules to manage collection repositories. This will only work in Galaxy 4.7 or AAP 2.4.
+  - Fix collection repository roles and modules update options and role options to behave correctly.
 ...
diff --git a/changelogs/fragments/token_auth.yml b/changelogs/fragments/token_auth.yml
@@ -0,0 +1,6 @@
+---
+bugfixes:
+  - Removed token authentication from the following roles - collection_remote, collection_repository, collection_repository_sync. The corresponding modules did not support token authentication.
+  - Removed References in the readmes to token authentication for any module that does not support token authentication.
+  - ah_repository_sync incorrectly stated which module replaced it, It is being replaced by collection_repository_sync.
+...
diff --git a/plugins/modules/ah_repository_sync.py b/plugins/modules/ah_repository_sync.py
@@ -26,7 +26,7 @@
       U(https://www.ansible.com/) for an overview.
 deprecated:
   why: The endpoint has been removed and is not supported in AAP 2.4 onwards. It's functionality has been replaced by collection_remote_sync.
-  alternative: collection_remote_sync
+  alternative: collection_repository_sync
   removed_in: 3.0.0
   removed_from_collection: infra.ah_configuration
 options:

diff --git a/plugins/modules/ah_token.py b/plugins/modules/ah_token.py
@@ -48,12 +48,6 @@
   infra.ah_configuration.ah_token:
     ah_token: "{{ my_existing_token }}"
 
-- name: Delete this token
-  infra.ah_configuration.ah_token:
-    ah_token: "{{ ah_token }}"
-    state: absent
-
-- name: Create a new token using username/password
   infra.ah_configuration.ah_token:
     state: present
     ah_username: "{{ my_username }}"

diff --git a/roles/collection_remote/README.md b/roles/collection_remote/README.md
@@ -11,7 +11,6 @@ An Ansible Role to create a Collection Remote Repository.
 |`ah_host`|""|yes|URL to the Automation Hub or Galaxy Server. (alias: `ah_hostname`)|127.0.0.1|
 |`ah_username`|""|yes|Admin User on the Automation Hub or Galaxy Server.||
 |`ah_password`|""|yes|Automation Hub Admin User's password on the Automation Hub Server.  This should be stored in an Ansible Vault at vars/tower-secrets.yml or elsewhere and called from a parent playbook.||
-|`ah_token`|""|yes|Tower Admin User's token on the Automation Hub Server.  This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
 |`ah_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Hub Server's SSL certificate.||
 |`ah_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.||
 |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom||
@@ -108,7 +107,6 @@ ah_collection_remotes:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/collection_remote/tasks/main.yml b/roles/collection_remote/tasks/main.yml
@@ -30,7 +30,6 @@
     ah_host:                  "{{ ah_host | default(ah_hostname) }}"
     ah_username:              "{{ ah_username | default(omit) }}"
     ah_password:              "{{ ah_password | default(omit) }}"
-    ah_token:                 "{{ ah_token | default(omit) }}"
     ah_path_prefix:           "{{ ah_path_prefix | default(omit) }}"
     validate_certs:           "{{ ah_validate_certs | default(omit) }}"
     request_timeout:          "{{ ah_request_timeout | default(omit) }}"

diff --git a/roles/collection_repository/README.md b/roles/collection_repository/README.md
@@ -11,7 +11,6 @@ An Ansible Role to create a Collection Repository.
 |`ah_host`|""|yes|URL to the Automation Hub or Galaxy Server. (alias: `ah_hostname`)|127.0.0.1|
 |`ah_username`|""|yes|Admin User on the Automation Hub or Galaxy Server.||
 |`ah_password`|""|yes|Automation Hub Admin User's password on the Automation Hub Server.  This should be stored in an Ansible Vault at vars/tower-secrets.yml or elsewhere and called from a parent playbook.||
-|`ah_token`|""|yes|Tower Admin User's token on the Automation Hub Server.  This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
 |`ah_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Hub Server's SSL certificate.||
 |`ah_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.||
 |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom||
@@ -116,7 +115,6 @@ ah_collection_repositories:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/collection_repository/tasks/main.yml b/roles/collection_repository/tasks/main.yml
@@ -17,7 +17,6 @@
     ah_host:                  "{{ ah_host | default(ah_hostname) }}"
     ah_username:              "{{ ah_username | default(omit) }}"
     ah_password:              "{{ ah_password | default(omit) }}"
-    ah_token:                 "{{ ah_token | default(omit) }}"
     ah_path_prefix:           "{{ ah_path_prefix | default(omit) }}"
     validate_certs:           "{{ ah_validate_certs | default(omit) }}"
     request_timeout:          "{{ ah_request_timeout | default(omit) }}"

diff --git a/roles/collection_repository_sync/README.md b/roles/collection_repository_sync/README.md
@@ -11,7 +11,6 @@ An Ansible Role to sync a Collection Repository.
 |`ah_host`|""|yes|URL to the Automation Hub or Galaxy Server. (alias: `ah_hostname`)|127.0.0.1|
 |`ah_username`|""|yes|Admin User on the Automation Hub or Galaxy Server.||
 |`ah_password`|""|yes|Automation Hub Admin User's password on the Automation Hub Server.  This should be stored in an Ansible Vault at vars/tower-secrets.yml or elsewhere and called from a parent playbook.||
-|`ah_token`|""|yes|Tower Admin User's token on the Automation Hub Server.  This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
 |`ah_validate_certs`|`False`|no|Whether or not to validate the Ansible Automation Hub Server's SSL certificate.||
 |`ah_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.||
 |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom||
@@ -87,7 +86,6 @@ ah_collection_repositories:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/collection_repository_sync/tasks/main.yml b/roles/collection_repository_sync/tasks/main.yml
@@ -9,7 +9,6 @@
     ah_host:                  "{{ ah_host | default(ah_hostname) }}"
     ah_username:              "{{ ah_username | default(omit) }}"
     ah_password:              "{{ ah_password | default(omit) }}"
-    ah_token:                 "{{ ah_token | default(omit) }}"
     ah_path_prefix:           "{{ ah_path_prefix | default(omit) }}"
     validate_certs:           "{{ ah_validate_certs | default(omit) }}"
     request_timeout:          "{{ ah_request_timeout | default(omit) }}"

diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md
@@ -26,7 +26,7 @@ ah_configuration_dispatcher_roles:
   - {role: ee_registry_sync, var: [ah_ee_registries], tags: regsync}
   - {role: ee_repository, var: [ah_ee_repositories], tags: repos}
   - {role: ee_repository_sync, var: [ah_ee_repository_sync], tags: reposync}
-  - {role: namespace, var: [ah_ee_namespaces], tags: namespaces}
+  - {role: namespace, var: [ah_namespaces], tags: namespaces}
   - {role: group, var: [ah_groups], tags: groups}
   - {role: publish, var: [ah_collections], tags: publish}
   - {role: user, var: [ah_users], tags: users}

diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml
@@ -2,7 +2,7 @@
 ah_configuration_dispatcher_roles:
   - {role: group, var: ah_groups, tags: groups}
   - {role: user, var: ah_users, tags: users}
-  - {role: namespace, var: ah_ee_namespaces, tags: namespaces}
+  - {role: namespace, var: ah_namespaces, tags: namespaces}
   - {role: collection, var: ah_collections, tags: collections}
   - {role: ee_repository, var: ah_ee_repositories, tags: repos}
   - {role: ee_repository_sync, var: ah_ee_repository_sync, tags: reposync}

diff --git a/roles/dispatch/meta/argument_specs.yml b/roles/dispatch/meta/argument_specs.yml
@@ -23,7 +23,7 @@ argument_specs:
         default:
           - {role: group, var: ah_groups, tags: groups}
           - {role: user, var: ah_users, tags: users}
-          - {role: namespace, var: ah_ee_namespaces, tags: namespaces}
+          - {role: namespace, var: ah_namespaces, tags: namespaces}
           - {role: collection, var: ah_collections, tags: collections}
           - {role: ee_repository, var: ah_ee_repositories, tags: repos}
           - {role: ee_repository_sync, var: ah_ee_repository_sync, tags: reposync}

diff --git a/roles/ee_image/README.md b/roles/ee_image/README.md
@@ -85,7 +85,6 @@ ah_ee_images:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_namespace/README.md b/roles/ee_namespace/README.md
@@ -83,7 +83,6 @@ ah_ee_namespaces:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_registry/README.md b/roles/ee_registry/README.md
@@ -87,7 +87,6 @@ ah_ee_registries:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_registry_index/README.md b/roles/ee_registry_index/README.md
@@ -83,7 +83,6 @@ ah_ee_registries:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_registry_sync/README.md b/roles/ee_registry_sync/README.md
@@ -83,7 +83,6 @@ ah_ee_registries:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_repository/README.md b/roles/ee_repository/README.md
@@ -85,7 +85,6 @@ ah_ee_repositories:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/ee_repository_sync/README.md b/roles/ee_repository_sync/README.md
@@ -83,7 +83,6 @@ ah_ee_repositories:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/group/README.md b/roles/group/README.md
@@ -93,7 +93,6 @@ ah_groups:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/group/tasks/main.yml b/roles/group/tasks/main.yml
@@ -9,7 +9,6 @@
     ah_host:          "{{ ah_host | default(ah_hostname) }}"
     ah_username:      "{{ ah_username | default(omit) }}"
     ah_password:      "{{ ah_password | default(omit) }}"
-    # ah_token:         "{{ ah_token | default(omit) }}"
     ah_path_prefix:   "{{ ah_path_prefix | default(omit) }}"
     validate_certs:   "{{ ah_validate_certs | default(omit) }}"
     request_timeout:  "{{ ah_request_timeout | default(omit) }}"

diff --git a/roles/group_roles/README.md b/roles/group_roles/README.md
@@ -133,7 +133,6 @@ ah_group_roles:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/group_roles/tasks/main.yml b/roles/group_roles/tasks/main.yml
@@ -8,7 +8,6 @@
     ah_host:          "{{ ah_host | default(ah_hostname) }}"
     ah_username:      "{{ ah_username | default(omit) }}"
     ah_password:      "{{ ah_password | default(omit) }}"
-    # ah_token:         "{{ ah_token | default(omit) }}"
     ah_path_prefix:   "{{ ah_path_prefix | default(omit) }}"
     validate_certs:   "{{ ah_validate_certs | default(omit) }}"
     request_timeout:  "{{ ah_request_timeout | default(omit) }}"

diff --git a/roles/role/README.md b/roles/role/README.md
@@ -105,7 +105,6 @@ ah_roles:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/roles/user/README.md b/roles/user/README.md
@@ -93,7 +93,6 @@ ah_users:
     ah_validate_certs: false
   # Define following vars here, or in ah_configs/ah_auth.yml
   # ah_host: ansible-ah-web-svc-test-project.example.com
-  # ah_token: changeme
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/tests/collections/requirements.yml b/tests/collections/requirements.yml
@@ -1,4 +1,4 @@
 ---
 collections:
-  - name: ansible.automation_hub
+  - name: galaxy.galaxy
 ...
diff --git a/tests/pah_configure.yml b/tests/pah_configure.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
 
   vars:
     target_state: "present"

diff --git a/tests/playbooks/testing_collections_playbook.yml b/tests/playbooks/testing_collections_playbook.yml
@@ -4,7 +4,7 @@
   connection: local
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   pre_tasks:
     - name: Include vars from ah_configs directory
       ansible.builtin.include_vars:

diff --git a/tests/playbooks/testing_playbook_ee_namespace.yml b/tests/playbooks/testing_playbook_ee_namespace.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     ah_hostname: http://localhost:8002/
     ah_username: admin

diff --git a/tests/playbooks/testing_playbook_ee_repository.yml b/tests/playbooks/testing_playbook_ee_repository.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     hub_host: localhost:5001
     ah_hostname: http://localhost:8002/

diff --git a/tests/playbooks/testing_playbook_user.yml b/tests/playbooks/testing_playbook_user.yml
@@ -5,7 +5,7 @@
   become: false
   gather_facts: false
   collections:
-    - ansible.automation_hub
+    - galaxy.galaxy
   vars:
     ah_hostname: http://localhost:8002/
     ah_username: admin

diff --git a/tests/tasks/manage_ansible_config.yml b/tests/tasks/manage_ansible_config.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ansible_config
+    name: galaxy.galaxy.ansible_config
   tags:
     - ansible_config
 

diff --git a/tests/tasks/manage_collection_namespaces.yml b/tests/tasks/manage_collection_namespaces.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.namespace
+    name: galaxy.galaxy.namespace
   tags:
     - namespaces
 ...
diff --git a/tests/tasks/manage_collection_publish.yml b/tests/tasks/manage_collection_publish.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.publish
+    name: galaxy.galaxy.publish
   tags:
     - publish
 ...
diff --git a/tests/tasks/manage_ee_images.yml b/tests/tasks/manage_ee_images.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_image
+    name: galaxy.galaxy.ee_image
   tags:
     - ee_images
 ...
diff --git a/tests/tasks/manage_ee_namespaces.yml b/tests/tasks/manage_ee_namespaces.yml
@@ -6,7 +6,7 @@
 
 - name: Import ah_configuration role
   ansible.builtin.import_role:
-    name: ansible.automation_hub.ee_namespace
+    name: galaxy.galaxy.ee_namespace
   tags:
     - ee_namespaces
 ...