Merge branch 'devel' into error_handling_v2

redhat-cop · Jan 17, 2025 · e2d22f8 · e2d22f8
2 parents ba3bb69 + 64f6689
commit e2d22f8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
           - ansible-core>=2.15
           - yamllint>=1.26,<2.0
   - repo: https://github.com/DavidAnson/markdownlint-cli2
-    rev: v0.16.0
+    rev: v0.17.1
     hooks:
       - id: markdownlint-cli2
   - repo: https://github.com/ambv/black

diff --git a/changelogs/fragments/dispatcher_gateway_order.yml b/changelogs/fragments/dispatcher_gateway_order.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Fixed the object creation order for the gateway staf.
diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml
@@ -9,15 +9,15 @@ gateway_configuration_dispatcher_roles:
   - role: gateway_settings
     var: gateway_settings
     tags: settings
+  - role: gateway_organizations
+    var: aap_organizations
+    tags: organizations
   - role: gateway_applications
     var: aap_applications
     tags: applications
   - role: gateway_http_ports
     var: http_ports_list
     tags: http_ports
-  - role: gateway_organizations
-    var: aap_organizations
-    tags: organizations
   - role: gateway_service_clusters
     var: gateway_service_clusters
     tags: service_clusters
@@ -30,18 +30,18 @@ gateway_configuration_dispatcher_roles:
   - role: gateway_services
     var: gateway_services
     tags: services
+  - role: gateway_teams
+    var: aap_teams
+    tags: teams
+  - role: gateway_users
+    var: aap_user_accounts
+    tags: users
   - role: gateway_role_user_assignments
     var: gateway_role_user_assignments
     tags: role_user_assignments
   - role: gateway_routes
     var: gateway_routes
     tags: routes
-  - role: gateway_teams
-    var: aap_teams
-    tags: teams
-  - role: gateway_users
-    var: aap_user_accounts
-    tags: teams
 
 hub_configuration_dispatcher_roles:
   - role: hub_namespace

diff --git a/roles/gateway_role_user_assignments/README.md b/roles/gateway_role_user_assignments/README.md
@@ -55,7 +55,7 @@ Options for the `role_user_assignments` variable:
 | Variable Name       | Default Value | Required | Type | Description                                                                                           |
 |:--------------------|:-------------:|:--------:|:----:|:------------------------------------------------------------------------------------------------------|
 | `role_definition`   |      N/A      |   yes    | str  | The name or id of the role definition to assign to the user.                                          |
-| `user`              |      N/A      |    no    | str  | The username or id of the user to assign to the object.                                               |
+| `user`              |      N/A      |    no    | str  | The username of the user to assign to the object.                                                     |
 | `user_ansible_id`   |      N/A      |    no    | str  | Resource id of the user who will receive permissions from this assignment. Alternative to user field. |
 | `object_id`         |      N/A      |    no    | int  | Primary key of the object this assignment applies to.                                                 |
 | `object_ansible_id` |      N/A      |    no    | str  | Resource id of the object this role applies to. Alternative to the object_id field.                   |