Skip to content

Commit

Permalink
Merge branch 'devel' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
sean-m-sullivan authored Oct 15, 2024
2 parents 6abab2f + 221601c commit 0a058cf
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
...
2 changes: 1 addition & 1 deletion .github/workflows/update_pre_commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
with:
github_actor: ${{ github.actor }}
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GH_WORKFLOW_KEY }}
...
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/gateway_authenticator_maps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
2 changes: 1 addition & 1 deletion roles/gateway_authenticators/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
2 changes: 1 addition & 1 deletion roles/gateway_service_clusters/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:**

Expand Down
4 changes: 2 additions & 2 deletions roles/gateway_settings/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ An Ansible role to alter Settings on Ansible Automation Gateway.

## Variables

Detailed description of variables are provided in the [top-level README](../../README.md).
Settings doesn't implement the `platform_configuration_enforce_defaults` because it's not applicable.
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:

Expand Down

0 comments on commit 0a058cf

Please sign in to comment.