This is an automated email from the ASF dual-hosted git repository.
taragolis pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new d8c8989d42 Update action names in AWS auth manager (#37572)
d8c8989d42 is described below
commit d8c8989d42b27d94722bb367f0dbb0fddb7ddc79
Author: Vincent <[email protected]>
AuthorDate: Wed Feb 21 07:52:50 2024 -0500
Update action names in AWS auth manager (#37572)
* Update action names in AWS auth manager
* Fix test
---------
Co-authored-by: Beck <[email protected]>
---
.../amazon/aws/auth_manager/avp/entities.py | 4 +--
.../amazon/aws/auth_manager/cli/schema.json | 38 +++++++++++-----------
.../amazon/aws/auth_manager/avp/test_entities.py | 2 +-
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/airflow/providers/amazon/aws/auth_manager/avp/entities.py
b/airflow/providers/amazon/aws/auth_manager/avp/entities.py
index 213a89fc03..666ebf8fe3 100644
--- a/airflow/providers/amazon/aws/auth_manager/avp/entities.py
+++ b/airflow/providers/amazon/aws/auth_manager/avp/entities.py
@@ -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}"
diff --git a/airflow/providers/amazon/aws/auth_manager/cli/schema.json
b/airflow/providers/amazon/aws/auth_manager/cli/schema.json
index e7d9b81d16..caf0698799 100644
--- a/airflow/providers/amazon/aws/auth_manager/cli/schema.json
+++ b/airflow/providers/amazon/aws/auth_manager/cli/schema.json
@@ -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"],
@@ -46,7 +46,7 @@
}
}
},
- "Dag::GET": {
+ "Dag.GET": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
@@ -61,7 +61,7 @@
}
}
},
- "Dag::POST": {
+ "Dag.POST": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
@@ -76,7 +76,7 @@
}
}
},
- "Dag::PUT": {
+ "Dag.PUT": {
"appliesTo": {
"principalTypes": ["User"],
"resourceTypes": ["Dag"],
@@ -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"]
diff --git a/tests/providers/amazon/aws/auth_manager/avp/test_entities.py
b/tests/providers/amazon/aws/auth_manager/avp/test_entities.py
index c5b512f22c..72142532bd 100644
--- a/tests/providers/amazon/aws/auth_manager/avp/test_entities.py
+++ b/tests/providers/amazon/aws/auth_manager/avp/test_entities.py
@@ -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"
