rename names of data models related to roles for consistency across requests and responses

providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/datamodels/roles.py

@@ -21,30 +21,30 @@
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
 
 
-class ActionResponse(BaseModel):
+class Action(BaseModel):
     """Outgoing representation of an action (permission name)."""
 
     name: str
 
 
-class ResourceResponse(BaseModel):
+class Resource(BaseModel):
     """Outgoing representation of a resource."""
 
     name: str
 
 
-class ActionResourceResponse(BaseModel):
+class ActionResource(BaseModel):
     """Pairing of an action with a resource."""
 
-    action: ActionResponse
-    resource: ResourceResponse
+    action: Action
+    resource: Resource
 
 
 class RoleBody(StrictBaseModel):
     """Incoming payload for creating/updating a role."""
 
     name: str = Field(min_length=1)
-    permissions: list[ActionResourceResponse] = Field(
+    permissions: list[ActionResource] = Field(
         default_factory=list, alias="actions", validation_alias="actions"
     )
 
@@ -53,7 +53,7 @@ class RoleResponse(BaseModel):
     """Outgoing representation of a role and its permissions."""
 
     name: str
-    permissions: list[ActionResourceResponse] = Field(default_factory=list, serialization_alias="actions")
+    permissions: list[ActionResource] = Field(default_factory=list, serialization_alias="actions")
 
 
 class RoleCollectionResponse(BaseModel):

providers/fab/src/airflow/providers/fab/auth_manager/api_fastapi/openapi/v2-fab-auth-manager-generated.yaml

@@ -326,28 +326,28 @@ paths:
                 $ref: '#/components/schemas/HTTPValidationError'
 components:
   schemas:
-    ActionResourceResponse:
-      properties:
-        action:
-          $ref: '#/components/schemas/ActionResponse'
-        resource:
-          $ref: '#/components/schemas/ResourceResponse'
-      type: object
-      required:
-      - action
-      - resource
-      title: ActionResourceResponse
-      description: Pairing of an action with a resource.
-    ActionResponse:
+    Action:
       properties:
         name:
           type: string
           title: Name
       type: object
       required:
       - name
-      title: ActionResponse
+      title: Action
       description: Outgoing representation of an action (permission name).
+    ActionResource:
+      properties:
+        action:
+          $ref: '#/components/schemas/Action'
+        resource:
+          $ref: '#/components/schemas/Resource'
+      type: object
+      required:
+      - action
+      - resource
+      title: ActionResource
+      description: Pairing of an action with a resource.
     HTTPExceptionResponse:
       properties:
         detail:
@@ -394,15 +394,15 @@ components:
       - access_token
       title: LoginResponse
       description: API Token serializer for responses.
-    ResourceResponse:
+    Resource:
       properties:
         name:
           type: string
           title: Name
       type: object
       required:
       - name
-      title: ResourceResponse
+      title: Resource
       description: Outgoing representation of a resource.
     RoleBody:
       properties:
@@ -412,7 +412,7 @@ components:
           title: Name
         actions:
           items:
-            $ref: '#/components/schemas/ActionResourceResponse'
+            $ref: '#/components/schemas/ActionResource'
           type: array
           title: Actions
       additionalProperties: false
@@ -444,7 +444,7 @@ components:
           title: Name
         actions:
           items:
-            $ref: '#/components/schemas/ActionResourceResponse'
+            $ref: '#/components/schemas/ActionResource'
           type: array
           title: Actions
       type: object

providers/fab/tests/unit/fab/auth_manager/api_fastapi/datamodels/test_roles.py

@@ -22,9 +22,9 @@
 from pydantic import ValidationError
 
 from airflow.providers.fab.auth_manager.api_fastapi.datamodels.roles import (
-    ActionResourceResponse,
-    ActionResponse,
-    ResourceResponse,
+    Action,
+    ActionResource,
+    Resource,
     RoleBody,
     RoleCollectionResponse,
     RoleResponse,
@@ -57,9 +57,9 @@ def test_rolebody_name_min_length_enforced(self):
             RoleBody.model_validate({"name": "", "actions": []})
 
     def test_roleresponse_serializes_permissions_under_actions_alias(self):
-        ar = ActionResourceResponse(
-            action=ActionResponse(name="can_read"),
-            resource=ResourceResponse(name="DAG"),
+        ar = ActionResource(
+            action=Action(name="can_read"),
+            resource=Resource(name="DAG"),
         )
         rr = RoleResponse(name="viewer", permissions=[ar])
 
@@ -89,9 +89,9 @@ def test_roleresponse_model_validate_from_simple_namespace(self):
         assert first.action.name == "can_read"
 
     def test_rolecollection_response_dump_and_counts(self):
-        ar = ActionResourceResponse(
-            action=ActionResponse(name="can_read"),
-            resource=ResourceResponse(name="DAG"),
+        ar = ActionResource(
+            action=Action(name="can_read"),
+            resource=Resource(name="DAG"),
         )
         rc = RoleCollectionResponse(
             roles=[RoleResponse(name="viewer", permissions=[ar])],