Skip to content

Update AwsAuthManager to support multi-team #65371 #65393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vincbeck merged 3 commits into from
Apr 21, 2026
Merged

Update AwsAuthManager to support multi-team #65371 #65393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2e2b32
Update AwsAuthManager to support multi-team #65371
haseebmalik18 Apr 16, 2026
70c5cbe
Merge branch 'main' into aws-auth-manager-multi-team
haseebmalik18 Apr 18, 2026
d699294
Merge branch 'main' into aws-auth-manager-multi-team
haseebmalik18 Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions providers/amazon/src/airflow/providers/amazon/aws/auth_manager/avp/entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class AvpEntities(Enum):
DAG = "Dag"
MENU = "Menu"
POOL = "Pool"
TEAM = "Team"
VARIABLE = "Variable"
VIEW = "View"

Expand Down
22 changes: 21 additions & 1 deletion providers/amazon/src/airflow/providers/amazon/aws/auth_manager/avp/facade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class IsAuthorizedRequest(TypedDict, total=False):
entity_type: AvpEntities
entity_id: str | None
context: dict | None
team_name: str | None


class AwsAuthManagerAmazonVerifiedPermissionsFacade(LoggingMixin):
Expand Down Expand Up @@ -87,6 +88,7 @@ def is_authorized(
user: AwsAuthManagerUser,
entity_id: str | None = None,
context: dict | None = None,
team_name: str | None = None,
) -> bool:
"""
Make an authorization decision against Amazon Verified Permissions.
Expand All @@ -102,7 +104,9 @@ def is_authorized(
:param entity_id: the entity ID the user accesses. If not provided, all entities of the type will be
considered.
:param context: optional additional context to pass to Amazon Verified Permissions.
:param team_name: optional team name for multi-team authorization.
"""
context = self._enrich_context_with_team(context, team_name)
entity_list = self._get_user_group_entities(user)

self.log.debug(
Expand Down Expand Up @@ -259,6 +263,21 @@ def _get_user_group_entities(user: AwsAuthManagerUser) -> list[dict]:
]
return [user_entity, *group_entities]

@staticmethod
def _enrich_context_with_team(context: dict | None, team_name: str | None) -> dict | None:
"""
Add team_name to context if provided.

:param context: existing context dict or None
:param team_name: team name to add to context
"""
if not team_name:
return context
team_context = {"team_name": {"string": team_name}}
if context is None:
return team_context
return {**context, **team_context}

@staticmethod
def _build_context(context: dict | None) -> dict | None:
if context is None or len(context) == 0:
Expand All @@ -275,6 +294,7 @@ def _build_is_authorized_request_payload(self, request: IsAuthorizedRequest, use
:param request: the request information
:param user: the user
"""
context = self._enrich_context_with_team(request.get("context"), request.get("team_name"))
return prune_dict(
{
"principal": {"entityType": get_entity_type(AvpEntities.USER), "entityId": user.get_id()},
Expand All @@ -288,6 +308,6 @@ def _build_is_authorized_request_payload(self, request: IsAuthorizedRequest, use
"entityType": get_entity_type(request["entity_type"]),
"entityId": request.get("entity_id", "*"),
},
"context": self._build_context(request.get("context")),
"context": self._build_context(context),
}
)
198 changes: 183 additions & 15 deletions providers/amazon/src/airflow/providers/amazon/aws/auth_manager/avp/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,31 +64,76 @@
"Connection.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
"resourceTypes": ["Connection"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Connection.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
"resourceTypes": ["Connection"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Connection.LIST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
"resourceTypes": ["Connection"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Connection.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
"resourceTypes": ["Connection"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Connection.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
"resourceTypes": ["Connection"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Custom.DELETE": {
Expand Down Expand Up @@ -142,6 +187,10 @@
"dag_entity": {
"type": "String",
"required": false
},
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
Expand All @@ -157,6 +206,10 @@
"dag_entity": {
"required": false,
"type": "String"
},
"team_name": {
"required": false,
"type": "String"
}
},
"type": "Record"
Expand All @@ -172,6 +225,10 @@
"dag_entity": {
"required": false,
"type": "String"
},
"team_name": {
"required": false,
"type": "String"
}
},
"type": "Record"
Expand All @@ -187,6 +244,10 @@
"dag_entity": {
"required": false,
"type": "String"
},
"team_name": {
"required": false,
"type": "String"
}
},
"type": "Record"
Expand All @@ -202,6 +263,10 @@
"dag_entity": {
"required": false,
"type": "String"
},
"team_name": {
"required": false,
"type": "String"
}
},
"type": "Record"
Expand All @@ -217,61 +282,163 @@
"Pool.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
"resourceTypes": ["Pool"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Pool.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
"resourceTypes": ["Pool"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Pool.LIST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
"resourceTypes": ["Pool"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Pool.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
"resourceTypes": ["Pool"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Pool.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
"resourceTypes": ["Pool"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Team.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Team"]
}
},
"Team.LIST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Team"]
}
},
"Variable.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
"resourceTypes": ["Variable"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Variable.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
"resourceTypes": ["Variable"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Variable.LIST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
"resourceTypes": ["Variable"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Variable.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
"resourceTypes": ["Variable"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"Variable.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
"resourceTypes": ["Variable"],
"context": {
"attributes": {
"team_name": {
"type": "String",
"required": false
}
},
"type": "Record"
}
}
},
"View.GET": {
Expand All @@ -291,6 +458,7 @@
"Dag": {},
"Menu": {},
"Pool": {},
"Team": {},
"Group": {},
"User": {
"memberOfTypes": [
Expand Down
Loading
Loading