From f9ebc5761555b011fb7896e37df58a4df4f687ad Mon Sep 17 00:00:00 2001 From: David Danielsson Date: Mon, 14 Oct 2024 08:02:04 -0500 Subject: [PATCH 1/2] Update pre-commit (#929) Co-authored-by: sean-m-sullivan --- .pre-commit-config.yaml | 8 ++++---- roles/gateway_authenticator_maps/README.md | 2 +- roles/gateway_authenticators/README.md | 2 +- roles/gateway_service_clusters/README.md | 2 +- roles/gateway_settings/README.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d9a4a7a75..f6274fdfe 100644 --- 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.6.0 + rev: v5.0.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace - repo: 'https://github.com/ansible-community/ansible-lint.git' - rev: v24.7.0 + rev: v24.9.2 hooks: # see discussions here about what arguments are used, and behavior # https://github.com/ansible/ansible-lint/issues/649 @@ -22,11 +22,11 @@ repos: - "ansible-core>=2.15" - "yamllint>=1.26,<2.0" - repo: https://github.com/DavidAnson/markdownlint-cli2 - rev: v0.13.0 + rev: v0.14.0 hooks: - id: markdownlint-cli2 - repo: https://github.com/ambv/black - rev: 24.8.0 + rev: 24.10.0 hooks: - id: black name: black diff --git a/roles/gateway_authenticator_maps/README.md b/roles/gateway_authenticator_maps/README.md index c6c90bfc3..235de7245 100644 --- a/roles/gateway_authenticator_maps/README.md +++ b/roles/gateway_authenticator_maps/README.md @@ -32,7 +32,7 @@ Options for the `authenticator_maps_list` variable: | `new_authenticator` | N/A | no | str | The name or ID referencing newly associated authenticator | | `revoke` | `false` | no | bool | If a user does not meet this rule should we revoke the permission | | `map_type` | `team` | no | str | What does the map work on, a team, a user flag or is this an allow rule. choices: ["allow", "is_superuser", "team", "organization", "role"] | -| `role` | N/A | no | str | The name of RBAC Role Definition to be used for this map | +| `role` | N/A | no | str | The name of RBAC Role Definition to be used for this map | | `team` | N/A | no | str | A team name this rule works on | | `organization` | N/A | no | str | An organization name this rule works on | | `triggers` | `{}` | no | dict | Trigger information for this rule | diff --git a/roles/gateway_authenticators/README.md b/roles/gateway_authenticators/README.md index 77125bfde..dc8e96876 100644 --- a/roles/gateway_authenticators/README.md +++ b/roles/gateway_authenticators/README.md @@ -71,7 +71,7 @@ Options for the `authenticators_list` variable: - Deletes 1 authenticator - Creates an AzureAD authenticator with configuration provided by the `ansible_base.authentication.authenticator_plugins.azuread` module - - configuration class can be found in https://github.com/ansible/django-ansible-base/tree/devel/ansible_base/authentication/authenticator_plugins + - configuration class can be found in https://github.com/ansible/django-ansible-base/tree/devel/ansible_base/authentication/authenticator_plugins File name: `data/gateway_authenticators.yml` diff --git a/roles/gateway_service_clusters/README.md b/roles/gateway_service_clusters/README.md index b32e84e98..2eb9201c3 100644 --- a/roles/gateway_service_clusters/README.md +++ b/roles/gateway_service_clusters/README.md @@ -29,7 +29,7 @@ Options for the `service_clusters_list` variable: | `name` | N/A | yes | str | The name of the resource | | `new_name` | N/A | no | str | Setting this option will change the existing name (looked up via the name field) | | `service_type` | N/A | state is 'present' | str | The type of service for this cluster. Choices : ["hub", "controller", "eda", "gateway"] | -| `state` | `present` | no | str | [more](../../README.md#state-variable) | +| `state` | `present` | no | str | [more](../../README.md#state-variable) | **Unique value:** diff --git a/roles/gateway_settings/README.md b/roles/gateway_settings/README.md index 8382afe99..e60a5540d 100644 --- a/roles/gateway_settings/README.md +++ b/roles/gateway_settings/README.md @@ -4,7 +4,7 @@ An Ansible role to alter Settings on Ansible Automation gateway settings. ## Variables -Detailed description of variables are provided in the [top-level README](../../README.md). +Detailed description of variables are provided in the [top-level README](../../README.md). Settings doesn't implement the `gateway_configuration_enforce_defaults` because it's not applicable. Variables specific for this role are following: From 221601cb94e8ed10382ca89a38af74fa1ab68227 Mon Sep 17 00:00:00 2001 From: Tom Page Date: Mon, 14 Oct 2024 14:35:56 +0100 Subject: [PATCH 2/2] replace default GH token with fine grained access token (#930) --- .github/workflows/release.yml | 2 +- .github/workflows/update_pre_commit.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a0a07da92..579fb6f7b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,7 +46,7 @@ jobs: secrets: collection_api_key_1: ${{ secrets.GALAXY_INFRA_KEY }} collection_api_key_2: ${{ secrets.CRC_PUBLISH_KEY }} - git_token: ${{ secrets.GITHUB_TOKEN }} + git_token: ${{ secrets.GH_WORKFLOW_KEY }} quay_token: ${{ secrets.quay_token }} matrix_token: ${{ secrets.matrix_token }} ... diff --git a/.github/workflows/update_pre_commit.yml b/.github/workflows/update_pre_commit.yml index edbd05279..c1d389cd8 100644 --- a/.github/workflows/update_pre_commit.yml +++ b/.github/workflows/update_pre_commit.yml @@ -14,5 +14,5 @@ jobs: with: github_actor: ${{ github.actor }} secrets: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GH_WORKFLOW_KEY }} ...