Skip to content

Update action names in AWS auth manager #37572

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
Taragolis merged 2 commits into from
Feb 21, 2024
Merged

Update action names in AWS auth manager #37572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd72d26
Update action names in AWS auth manager
Feb 20, 2024
2140eba
Fix test
vincbeck Feb 20, 2024
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
4 changes: 2 additions & 2 deletions 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 @@ -57,9 +57,9 @@ def get_action_id(resource_type: AvpEntities, method: ResourceMethod):
"""
Return action id.

Convention for action ID is <resource_type>::<method>. Example: Variable::GET.
Convention for action ID is <resource_type>.<method>. Example: Variable.GET.

:param resource_type: Resource type.
:param method: Resource method.
"""
return f"{resource_type.value}::{method}"
return f"{resource_type.value}.{method}"
38 changes: 19 additions & 19 deletions airflow/providers/amazon/aws/auth_manager/cli/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"Airflow": {
"actions": {
"Connection::DELETE": {
"Connection.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
}
},
"Connection::GET": {
"Connection.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
}
},
"Connection::POST": {
"Connection.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
}
},
"Connection::PUT": {
"Connection.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Connection"]
}
},
"Configuration::GET": {
"Configuration.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Configuration"]
}
},
"Dag::DELETE": {
"Dag.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
Expand All @@ -46,7 +46,7 @@
}
}
},
"Dag::GET": {
"Dag.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
Expand All @@ -61,7 +61,7 @@
}
}
},
"Dag::POST": {
"Dag.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
Expand All @@ -76,7 +76,7 @@
}
}
},
"Dag::PUT": {
"Dag.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
Expand All @@ -91,61 +91,61 @@
}
}
},
"Dataset::GET": {
"Dataset.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dataset"]
}
},
"Pool::DELETE": {
"Pool.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
}
},
"Pool::GET": {
"Pool.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
}
},
"Pool::POST": {
"Pool.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
}
},
"Pool::PUT": {
"Pool.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Pool"]
}
},
"Variable::DELETE": {
"Variable.DELETE": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
}
},
"Variable::GET": {
"Variable.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
}
},
"Variable::POST": {
"Variable.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
}
},
"Variable::PUT": {
"Variable.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Variable"]
}
},
"View::GET": {
"View.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["View"]
Expand Down
2 changes: 1 addition & 1 deletion tests/providers/amazon/aws/auth_manager/avp/test_entities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ def test_get_entity_type():


def test_get_action_id():
assert get_action_id(AvpEntities.VARIABLE, "GET") == "Variable::GET"
assert get_action_id(AvpEntities.VARIABLE, "GET") == "Variable.GET"
⚡