-
Notifications
You must be signed in to change notification settings - Fork 4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(s3): add
allowedActionPatterns parameter to grantWrite (#24211)
I've added an optional parameter `allowedActionPatterns` that will restrict the permissions to a certain list of action patterns for the `grantWrite` method. Closes #24074 ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
- Loading branch information
1 parent
cdfa970
commit 5b5c36f
Showing
11 changed files
with
590 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...t-grant-write.js.snapshot/BucketGrantWriteTestDefaultTestDeployAssertF3318F24.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "30.0.0", | ||
| "files": { | ||
| "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22": { | ||
| "source": { | ||
| "path": "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
36 changes: 36 additions & 0 deletions
36
...grant-write.js.snapshot/BucketGrantWriteTestDefaultTestDeployAssertF3318F24.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
19 changes: 19 additions & 0 deletions
19
packages/@aws-cdk/aws-s3/test/integ.bucket-grant-write.js.snapshot/aws-cdk-s3.assets.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| { | ||
| "version": "30.0.0", | ||
| "files": { | ||
| "34e0a1e6ce9d1aa5b00cd8325cf0dbe5e3f48e12033dd7ac3cdfa0c604491edf": { | ||
| "source": { | ||
| "path": "aws-cdk-s3.template.json", | ||
| "packaging": "file" | ||
| }, | ||
| "destinations": { | ||
| "current_account-current_region": { | ||
| "bucketName": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}", | ||
| "objectKey": "34e0a1e6ce9d1aa5b00cd8325cf0dbe5e3f48e12033dd7ac3cdfa0c604491edf.json", | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-file-publishing-role-${AWS::AccountId}-${AWS::Region}" | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "dockerImages": {} | ||
| } |
102 changes: 102 additions & 0 deletions
102
packages/@aws-cdk/aws-s3/test/integ.bucket-grant-write.js.snapshot/aws-cdk-s3.template.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| { | ||
| "Resources": { | ||
| "MyBucketF68F3FF0": { | ||
| "Type": "AWS::S3::Bucket", | ||
| "Properties": { | ||
| "BucketEncryption": { | ||
| "ServerSideEncryptionConfiguration": [ | ||
| { | ||
| "ServerSideEncryptionByDefault": { | ||
| "SSEAlgorithm": "AES256" | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "UpdateReplacePolicy": "Delete", | ||
| "DeletionPolicy": "Delete" | ||
| }, | ||
| "MyUserDC45028B": { | ||
| "Type": "AWS::IAM::User" | ||
| }, | ||
| "MyUserDefaultPolicy7B897426": { | ||
| "Type": "AWS::IAM::Policy", | ||
| "Properties": { | ||
| "PolicyDocument": { | ||
| "Statement": [ | ||
| { | ||
| "Action": [ | ||
| "s3:DeleteObject*", | ||
| "s3:PutObject" | ||
| ], | ||
| "Effect": "Allow", | ||
| "Resource": [ | ||
| { | ||
| "Fn::GetAtt": [ | ||
| "MyBucketF68F3FF0", | ||
| "Arn" | ||
| ] | ||
| }, | ||
| { | ||
| "Fn::Join": [ | ||
| "", | ||
| [ | ||
| { | ||
| "Fn::GetAtt": [ | ||
| "MyBucketF68F3FF0", | ||
| "Arn" | ||
| ] | ||
| }, | ||
| "/*" | ||
| ] | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "Version": "2012-10-17" | ||
| }, | ||
| "PolicyName": "MyUserDefaultPolicy7B897426", | ||
| "Users": [ | ||
| { | ||
| "Ref": "MyUserDC45028B" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "Parameters": { | ||
| "BootstrapVersion": { | ||
| "Type": "AWS::SSM::Parameter::Value<String>", | ||
| "Default": "/cdk-bootstrap/hnb659fds/version", | ||
| "Description": "Version of the CDK Bootstrap resources in this environment, automatically retrieved from SSM Parameter Store. [cdk:skip]" | ||
| } | ||
| }, | ||
| "Rules": { | ||
| "CheckBootstrapVersion": { | ||
| "Assertions": [ | ||
| { | ||
| "Assert": { | ||
| "Fn::Not": [ | ||
| { | ||
| "Fn::Contains": [ | ||
| [ | ||
| "1", | ||
| "2", | ||
| "3", | ||
| "4", | ||
| "5" | ||
| ], | ||
| { | ||
| "Ref": "BootstrapVersion" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| "AssertDescription": "CDK bootstrap stack version 6 required. Please run 'cdk bootstrap' with a recent version of the CDK CLI." | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
1 change: 1 addition & 0 deletions
1
packages/@aws-cdk/aws-s3/test/integ.bucket-grant-write.js.snapshot/cdk.out
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| {"version":"30.0.0"} |
12 changes: 12 additions & 0 deletions
12
packages/@aws-cdk/aws-s3/test/integ.bucket-grant-write.js.snapshot/integ.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "version": "30.0.0", | ||
| "testCases": { | ||
| "BucketGrantWriteTest/DefaultTest": { | ||
| "stacks": [ | ||
| "aws-cdk-s3" | ||
| ], | ||
| "assertionStack": "BucketGrantWriteTest/DefaultTest/DeployAssert", | ||
| "assertionStackName": "BucketGrantWriteTestDefaultTestDeployAssertF3318F24" | ||
| } | ||
| } | ||
| } |
123 changes: 123 additions & 0 deletions
123
packages/@aws-cdk/aws-s3/test/integ.bucket-grant-write.js.snapshot/manifest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| { | ||
| "version": "30.0.0", | ||
| "artifacts": { | ||
| "aws-cdk-s3.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "aws-cdk-s3.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "aws-cdk-s3": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "aws-cdk-s3.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/34e0a1e6ce9d1aa5b00cd8325cf0dbe5e3f48e12033dd7ac3cdfa0c604491edf.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "aws-cdk-s3.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "aws-cdk-s3.assets" | ||
| ], | ||
| "metadata": { | ||
| "/aws-cdk-s3/MyBucket/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "MyBucketF68F3FF0" | ||
| } | ||
| ], | ||
| "/aws-cdk-s3/MyUser/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "MyUserDC45028B" | ||
| } | ||
| ], | ||
| "/aws-cdk-s3/MyUser/DefaultPolicy/Resource": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "MyUserDefaultPolicy7B897426" | ||
| } | ||
| ], | ||
| "/aws-cdk-s3/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/aws-cdk-s3/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "aws-cdk-s3" | ||
| }, | ||
| "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.assets": { | ||
| "type": "cdk:asset-manifest", | ||
| "properties": { | ||
| "file": "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.assets.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "BucketGrantWriteTestDefaultTestDeployAssertF3318F24": { | ||
| "type": "aws:cloudformation:stack", | ||
| "environment": "aws://unknown-account/unknown-region", | ||
| "properties": { | ||
| "templateFile": "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.template.json", | ||
| "validateOnSynth": false, | ||
| "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}", | ||
| "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}", | ||
| "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/21fbb51d7b23f6a6c262b46a9caee79d744a3ac019fd45422d988b96d44b2a22.json", | ||
| "requiresBootstrapStackVersion": 6, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version", | ||
| "additionalDependencies": [ | ||
| "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.assets" | ||
| ], | ||
| "lookupRole": { | ||
| "arn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-lookup-role-${AWS::AccountId}-${AWS::Region}", | ||
| "requiresBootstrapStackVersion": 8, | ||
| "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version" | ||
| } | ||
| }, | ||
| "dependencies": [ | ||
| "BucketGrantWriteTestDefaultTestDeployAssertF3318F24.assets" | ||
| ], | ||
| "metadata": { | ||
| "/BucketGrantWriteTest/DefaultTest/DeployAssert/BootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "BootstrapVersion" | ||
| } | ||
| ], | ||
| "/BucketGrantWriteTest/DefaultTest/DeployAssert/CheckBootstrapVersion": [ | ||
| { | ||
| "type": "aws:cdk:logicalId", | ||
| "data": "CheckBootstrapVersion" | ||
| } | ||
| ] | ||
| }, | ||
| "displayName": "BucketGrantWriteTest/DefaultTest/DeployAssert" | ||
| }, | ||
| "Tree": { | ||
| "type": "cdk:tree", | ||
| "properties": { | ||
| "file": "tree.json" | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.