Skip to content

Introduce AthenaQueryPolicy_v2 #3786

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

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Introduce AthenaQueryPolicy_v2 #3786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07ecf62
replace deprecated APIs in AthenaQueryPolicy
Smoothex Jun 23, 2025
d25eefb
Merge branch 'aws:develop' into patch-2
Smoothex Sep 10, 2025
b978b66
introduce AthenaQueryPolicy_v2
Smoothex Sep 10, 2025
d1143fa
Update descriptions for Glue Database and Table
Smoothex Sep 15, 2025
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
95 changes: 95 additions & 0 deletions samtranslator/policy_templates_data/policy_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,101 @@
}
}
},
"AthenaQueryPolicy_v2": {
"Definition": {
"Statement": [
{
"Action": [
"athena:ListWorkGroups",
"athena:GetWorkGroup",
"athena:GetExecutionEngines",
"athena:GetDatabase",
"athena:ListDataCatalogs",
"athena:ListDatabases",
"athena:ListTableMetadata",
"athena:GetTableMetadata"
],
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"glue:GetDatabases",
"glue:GetDatabase",
"glue:GetTables",
"glue:GetTable"
],
"Effect": "Allow",
"Resource": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:catalog",
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:database/${databaseName}",
{
"databaseName": {
"Ref": "DatabaseName"
}
}
]
},
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:table/${databaseName}/${tableName}",
{
"databaseName": {
"Ref": "DatabaseName"
},
"tableName": {
"Ref": "TableName"
}
}
]
}
]
},
{
"Action": [
"athena:StartQueryExecution",
"athena:GetQueryResults",
"athena:DeleteNamedQuery",
"athena:GetNamedQuery",
"athena:ListQueryExecutions",
"athena:StopQueryExecution",
"athena:GetQueryResultsStream",
"athena:ListNamedQueries",
"athena:CreateNamedQuery",
"athena:GetQueryExecution",
"athena:BatchGetNamedQuery",
"athena:BatchGetQueryExecution",
"athena:GetWorkGroup"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:athena:${AWS::Region}:${AWS::AccountId}:workgroup/${workgroupName}",
{
"workgroupName": {
"Ref": "WorkGroupName"
}
}
]
}
}
]
},
"Description": "Gives permissions to execute Athena queries",
"Parameters": {
"WorkGroupName": {
"Description": "Name of the Athena Workgroup"
},
"DatabaseName": {
"Description": "Name of the Glue Database"
},
"TableName": {
"Description": "Name of the Glue Table"
}
}
},
"CloudFormationDescribeStacksPolicy": {
"Definition": {
"Statement": [
Expand Down
5 changes: 5 additions & 0 deletions tests/translator/input/all_policy_templates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@ Resources:
- AthenaQueryPolicy:
WorkGroupName: name

- AthenaQueryPolicy_v2:
WorkGroupName: name
DatabaseName: name
TableName: name

- S3WritePolicy:
BucketName: name

Expand Down
84 changes: 84 additions & 0 deletions tests/translator/output/all_policy_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,90 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"athena:ListWorkGroups",
"athena:GetWorkGroup",
"athena:GetExecutionEngines",
"athena:GetDatabase",
"athena:ListDataCatalogs",
"athena:ListDatabases",
"athena:ListTableMetadata",
"athena:GetTableMetadata"
],
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"glue:GetDatabases",
"glue:GetDatabase",
"glue:GetTables",
"glue:GetTable"
],
"Effect": "Allow",
"Resource": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:catalog",
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:database/${databaseName}",
{
"databaseName": {
"Ref": "DatabaseName"
}
}
]
},
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:table/${databaseName}/${tableName}",
{
"databaseName": {
"Ref": "DatabaseName"
},
"tableName": {
"Ref": "TableName"
}
}
]
}
]
},
{
"Action": [
"athena:StartQueryExecution",
"athena:GetQueryResults",
"athena:DeleteNamedQuery",
"athena:GetNamedQuery",
"athena:ListQueryExecutions",
"athena:StopQueryExecution",
"athena:GetQueryResultsStream",
"athena:ListNamedQueries",
"athena:CreateNamedQuery",
"athena:GetQueryExecution",
"athena:BatchGetNamedQuery",
"athena:BatchGetQueryExecution",
"athena:GetWorkGroup"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:athena:${AWS::Region}:${AWS::AccountId}:workgroup/${workgroupName}",
{
"workgroupName": {
"Ref": "WorkGroupName"
}
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy65"
}
],
"Tags": [
Expand Down
84 changes: 84 additions & 0 deletions tests/translator/output/aws-cn/all_policy_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,90 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"athena:ListWorkGroups",
"athena:GetWorkGroup",
"athena:GetExecutionEngines",
"athena:GetDatabase",
"athena:ListDataCatalogs",
"athena:ListDatabases",
"athena:ListTableMetadata",
"athena:GetTableMetadata"
],
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"glue:GetDatabases",
"glue:GetDatabase",
"glue:GetTables",
"glue:GetTable"
],
"Effect": "Allow",
"Resource": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:catalog",
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:database/${databaseName}",
{
"databaseName": {
"Ref": "DatabaseName"
}
}
]
},
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:table/${databaseName}/${tableName}",
{
"databaseName": {
"Ref": "DatabaseName"
},
"tableName": {
"Ref": "TableName"
}
}
]
}
]
},
{
"Action": [
"athena:StartQueryExecution",
"athena:GetQueryResults",
"athena:DeleteNamedQuery",
"athena:GetNamedQuery",
"athena:ListQueryExecutions",
"athena:StopQueryExecution",
"athena:GetQueryResultsStream",
"athena:ListNamedQueries",
"athena:CreateNamedQuery",
"athena:GetQueryExecution",
"athena:BatchGetNamedQuery",
"athena:BatchGetQueryExecution",
"athena:GetWorkGroup"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:athena:${AWS::Region}:${AWS::AccountId}:workgroup/${workgroupName}",
{
"workgroupName": {
"Ref": "WorkGroupName"
}
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy65"
}
],
"Tags": [
Expand Down
84 changes: 84 additions & 0 deletions tests/translator/output/aws-us-gov/all_policy_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1751,6 +1751,90 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"athena:ListWorkGroups",
"athena:GetWorkGroup",
"athena:GetExecutionEngines",
"athena:GetDatabase",
"athena:ListDataCatalogs",
"athena:ListDatabases",
"athena:ListTableMetadata",
"athena:GetTableMetadata"
],
"Effect": "Allow",
"Resource": "*"
},
{
"Action": [
"glue:GetDatabases",
"glue:GetDatabase",
"glue:GetTables",
"glue:GetTable"
],
"Effect": "Allow",
"Resource": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:catalog",
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:database/${databaseName}",
{
"databaseName": {
"Ref": "DatabaseName"
}
}
]
},
{
"Fn::Sub": [
"arn:${AWS::Partition}:glue:${AWS::Region}:${AWS::AccountId}:table/${databaseName}/${tableName}",
{
"databaseName": {
"Ref": "DatabaseName"
},
"tableName": {
"Ref": "TableName"
}
}
]
}
]
},
{
"Action": [
"athena:StartQueryExecution",
"athena:GetQueryResults",
"athena:DeleteNamedQuery",
"athena:GetNamedQuery",
"athena:ListQueryExecutions",
"athena:StopQueryExecution",
"athena:GetQueryResultsStream",
"athena:ListNamedQueries",
"athena:CreateNamedQuery",
"athena:GetQueryExecution",
"athena:BatchGetNamedQuery",
"athena:BatchGetQueryExecution",
"athena:GetWorkGroup"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:athena:${AWS::Region}:${AWS::AccountId}:workgroup/${workgroupName}",
{
"workgroupName": {
"Ref": "WorkGroupName"
}
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy65"
}
],
"Tags": [
Expand Down