Skip to content
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

[Feature] Updated AWS UC storage credential to include permissions for file events #4406

Merged
merged 5 commits into from
Jan 27, 2025
Merged

[Feature] Updated AWS UC storage credential to include permissions for file events #4406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9085086
Updated AWS UC storage credential to include permissions for file events
borremosch-db Jan 16, 2025
01e79da
fmt
borremosch-db Jan 16, 2025
28dc5d2
Processed feedback
borremosch-db Jan 17, 2025
d1cc672
Processed feedback
borremosch-db Jan 17, 2025
0fb1ec4
Processed feedback
borremosch-db Jan 24, 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
56 changes: 56 additions & 0 deletions aws/data_aws_unity_catalog_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,62 @@ func generateReadContext(ctx context.Context, d *schema.ResourceData, m *common.
Resources: []string{kmsArn},
})
}
policy.Statements = append(policy.Statements, &awsIamPolicyStatement{
Sid: "ManagedFileEventsSetupStatement",
Effect: "Allow",
Actions: []string{
"s3:GetBucketNotification",
"s3:PutBucketNotification",
"sns:ListSubscriptionsByTopic",
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:TagResource",
"sns:Publish",
"sns:Subscribe",
"sqs:CreateQueue",
"sqs:DeleteMessage",
"sqs:ReceiveMessage",
"sqs:SendMessage",
"sqs:GetQueueUrl",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes",
"sqs:TagQueue",
"sqs:ChangeMessageVisibility",
"sqs:PurgeQueue",
},
Resources: []string{
fmt.Sprintf("arn:%s:s3:::%s", awsPartition, bucket),
fmt.Sprintf("arn:%s:sqs:*:%s:csms-*", awsPartition, awsAccountId),
fmt.Sprintf("arn:%s:sns:*:%s:csms-*", awsPartition, awsAccountId),
},
},
&awsIamPolicyStatement{
Sid: "ManagedFileEventsListStatement",
Effect: "Allow",
Actions: []string{
"sqs:ListQueues",
"sqs:ListQueueTags",
"sns:ListTopics",
},
Resources: []string{
fmt.Sprintf("arn:%s:sqs:*:%s:csms-*", awsPartition, awsAccountId),
fmt.Sprintf("arn:%s:sns:*:%s:csms-*", awsPartition, awsAccountId),
},
},
&awsIamPolicyStatement{
Sid: "ManagedFileEventsTeardownStatement",
Effect: "Allow",
Actions: []string{
"sns:Unsubscribe",
"sns:DeleteTopic",
"sqs:DeleteQueue",
},
Resources: []string{
fmt.Sprintf("arn:%s:sqs:*:%s:csms-*", awsPartition, awsAccountId),
fmt.Sprintf("arn:%s:sns:*:%s:csms-*", awsPartition, awsAccountId),
},
})
policyJSON, err := json.MarshalIndent(policy, "", " ")
if err != nil {
return err
Expand Down
224 changes: 224 additions & 0 deletions aws/data_aws_unity_catalog_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,62 @@ func TestDataAwsUnityCatalogPolicy(t *testing.T) {
"Resource": [
"arn:aws:kms:databricks-kms"
]
},
{
"Sid": "ManagedFileEventsSetupStatement",
"Effect": "Allow",
"Action": [
"s3:GetBucketNotification",
"s3:PutBucketNotification",
"sns:ListSubscriptionsByTopic",
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:TagResource",
"sns:Publish",
"sns:Subscribe",
"sqs:CreateQueue",
"sqs:DeleteMessage",
"sqs:ReceiveMessage",
"sqs:SendMessage",
"sqs:GetQueueUrl",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes",
"sqs:TagQueue",
"sqs:ChangeMessageVisibility",
"sqs:PurgeQueue"
],
"Resource": [
"arn:aws:s3:::databricks-bucket",
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsListStatement",
"Effect": "Allow",
"Action": [
"sqs:ListQueues",
"sqs:ListQueueTags",
"sns:ListTopics"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsTeardownStatement",
"Effect": "Allow",
"Action": [
"sns:Unsubscribe",
"sns:DeleteTopic",
"sqs:DeleteQueue"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
}
]
}`
Expand Down Expand Up @@ -116,6 +172,62 @@ func TestDataAwsUnityCatalogPolicyFullKms(t *testing.T) {
"Resource": [
"arn:aws:kms:us-west-2:111122223333:key/databricks-kms"
]
},
{
"Sid": "ManagedFileEventsSetupStatement",
"Effect": "Allow",
"Action": [
"s3:GetBucketNotification",
"s3:PutBucketNotification",
"sns:ListSubscriptionsByTopic",
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:TagResource",
"sns:Publish",
"sns:Subscribe",
"sqs:CreateQueue",
"sqs:DeleteMessage",
"sqs:ReceiveMessage",
"sqs:SendMessage",
"sqs:GetQueueUrl",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes",
"sqs:TagQueue",
"sqs:ChangeMessageVisibility",
"sqs:PurgeQueue"
],
"Resource": [
"arn:aws:s3:::databricks-bucket",
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsListStatement",
"Effect": "Allow",
"Action": [
"sqs:ListQueues",
"sqs:ListQueueTags",
"sns:ListTopics"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsTeardownStatement",
"Effect": "Allow",
"Action": [
"sns:Unsubscribe",
"sns:DeleteTopic",
"sqs:DeleteQueue"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
}
]
}`
Expand Down Expand Up @@ -161,6 +273,62 @@ func TestDataAwsUnityCatalogPolicyWithoutKMS(t *testing.T) {
"Resource": [
"arn:aws:iam::123456789098:role/databricks-role"
]
},
{
"Sid": "ManagedFileEventsSetupStatement",
"Effect": "Allow",
"Action": [
"s3:GetBucketNotification",
"s3:PutBucketNotification",
"sns:ListSubscriptionsByTopic",
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:TagResource",
"sns:Publish",
"sns:Subscribe",
"sqs:CreateQueue",
"sqs:DeleteMessage",
"sqs:ReceiveMessage",
"sqs:SendMessage",
"sqs:GetQueueUrl",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes",
"sqs:TagQueue",
"sqs:ChangeMessageVisibility",
"sqs:PurgeQueue"
],
"Resource": [
"arn:aws:s3:::databricks-bucket",
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsListStatement",
"Effect": "Allow",
"Action": [
"sqs:ListQueues",
"sqs:ListQueueTags",
"sns:ListTopics"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsTeardownStatement",
"Effect": "Allow",
"Action": [
"sns:Unsubscribe",
"sns:DeleteTopic",
"sqs:DeleteQueue"
],
"Resource": [
"arn:aws:sqs:*:123456789098:csms-*",
"arn:aws:sns:*:123456789098:csms-*"
]
}
]
}`
Expand Down Expand Up @@ -219,6 +387,62 @@ func TestDataAwsUnityCatalogPolicyPartionGov(t *testing.T) {
"Resource": [
"arn:aws-us-gov:kms:databricks-kms"
]
},
{
"Sid": "ManagedFileEventsSetupStatement",
"Effect": "Allow",
"Action": [
"s3:GetBucketNotification",
"s3:PutBucketNotification",
"sns:ListSubscriptionsByTopic",
"sns:GetTopicAttributes",
"sns:SetTopicAttributes",
"sns:CreateTopic",
"sns:TagResource",
"sns:Publish",
"sns:Subscribe",
"sqs:CreateQueue",
"sqs:DeleteMessage",
"sqs:ReceiveMessage",
"sqs:SendMessage",
"sqs:GetQueueUrl",
"sqs:GetQueueAttributes",
"sqs:SetQueueAttributes",
"sqs:TagQueue",
"sqs:ChangeMessageVisibility",
"sqs:PurgeQueue"
],
"Resource": [
"arn:aws-us-gov:s3:::databricks-bucket",
"arn:aws-us-gov:sqs:*:123456789098:csms-*",
"arn:aws-us-gov:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsListStatement",
"Effect": "Allow",
"Action": [
"sqs:ListQueues",
"sqs:ListQueueTags",
"sns:ListTopics"
],
"Resource": [
"arn:aws-us-gov:sqs:*:123456789098:csms-*",
"arn:aws-us-gov:sns:*:123456789098:csms-*"
]
},
{
"Sid": "ManagedFileEventsTeardownStatement",
"Effect": "Allow",
"Action": [
"sns:Unsubscribe",
"sns:DeleteTopic",
"sqs:DeleteQueue"
],
"Resource": [
"arn:aws-us-gov:sqs:*:123456789098:csms-*",
"arn:aws-us-gov:sns:*:123456789098:csms-*"
]
}
]
}`
Expand Down
Loading