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.

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

feat(codepipeline-actions): add KMSEncryptionKeyARN for S3DeployAction #24536

Merged
merged 68 commits into from
May 18, 2023
Merged
Changes from 2 commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
3260703
Add KMSEncryptionKeyARN
hussainak Mar 9, 2023
6529ff3
Merge branch 'main' into main
hussainak Mar 9, 2023
464021a
Added KMSEncryptionKeyARN info for S3DeployAction
hussainak Mar 9, 2023
c9d3e02
Add KMSEncryptionKeyARN for S3DeployAction
hussainak Mar 9, 2023
24490b5
S3 Deploy Action KMS Encryption ARN
Mar 9, 2023
9ea81e0
Merge branch 'main' of https://github.com/hussainak/aws-cdk
Mar 9, 2023
b384c45
Add integration test
Mar 9, 2023
53c33b1
KMSEncryptionKeyARN inclusion in integration tests
Mar 9, 2023
38aec24
Merge branch 'main' into main
hussainak Mar 9, 2023
e49cf2c
Not doing integ tests
Mar 9, 2023
beef056
Merge branch 'main' into main
hussainak Mar 9, 2023
fb2115e
Add IKey instead of string to encryptionKey param
Mar 10, 2023
d795b43
Merge branch 'main' of https://github.com/hussainak/aws-cdk
Mar 10, 2023
6c121fb
Add bucket encryption and key to the pipeline
Mar 10, 2023
95ec3ac
Rollback root level readme
Mar 13, 2023
f1251fb
Merge branch 'main' into main
hussainak Mar 13, 2023
7f17b89
Merge branch 'main' into main
hussainak Mar 14, 2023
b149706
Merge branch 'main' into main
hussainak Mar 14, 2023
a2db654
Merge branch 'main' into main
hussainak Mar 15, 2023
653d313
Merge branch 'main' into main
hussainak Mar 15, 2023
877715e
Merge branch 'main' into main
hussainak Mar 16, 2023
f04277a
Merge branch 'main' into main
hussainak Mar 19, 2023
9bf869e
Merge branch 'main' into main
hussainak Mar 27, 2023
34da951
Added expected KMS key value
Mar 30, 2023
b6a5cc6
Merge
Apr 3, 2023
07bd564
Merge
Apr 3, 2023
61af06b
Merge branch 'aws-main'
Apr 3, 2023
50ad669
Merge branch 'main' of https://github.com/aws/aws-cdk into aws-main
Apr 3, 2023
43d5690
Revert "Merge branch 'main' of https://github.com/aws/aws-cdk into aw…
Apr 3, 2023
19087b2
Merge from aws-cdk
Apr 3, 2023
7a1fac5
Merge branch 'main' into main
hussainak Apr 3, 2023
93808a7
Merge branch 'main' into main
hussainak Apr 3, 2023
fc11079
Merge branch 'main' into main
hussainak Apr 5, 2023
20bcd5d
Merge branch 'main' into main
hussainak Apr 5, 2023
ebba46b
Merge branch 'main' into main
hussainak Apr 6, 2023
a51d6a7
Merge branch 'main' into main
hussainak Apr 11, 2023
b86edee
Merge branch 'main' into main
hussainak Apr 13, 2023
15cbd4b
Merge branch 'main' into main
hussainak Apr 14, 2023
1fb978a
Merge branch 'main' into main
hussainak Apr 17, 2023
e881279
Merge branch 'main' into main
hussainak Apr 18, 2023
706e00d
Merge branch 'main' into main
hussainak Apr 19, 2023
d3ce634
Merge branch 'main' into main
hussainak Apr 19, 2023
a691732
Merge branch 'main' into main
hussainak Apr 20, 2023
bd7ea13
Merge branch 'main' into main
hussainak Apr 20, 2023
0b774ce
Merge branch 'main' into main
hussainak Apr 21, 2023
23b7c19
Add encryptionKey for S3DeployAction
hussainak Apr 21, 2023
7d36aa7
Merge branch 'main' into main
hussainak Apr 24, 2023
caea320
Merge branch 'main' into main
hussainak Apr 25, 2023
6016657
Merge branch 'main' into main
hussainak Apr 27, 2023
50bcffd
Merge branch 'main' into main
hussainak Apr 27, 2023
70dcf17
Merge branch 'main' into main
hussainak Apr 28, 2023
c0b702b
Merge branch 'main' into main
hussainak May 4, 2023
c78098a
Merge branch 'main' into main
hussainak May 5, 2023
6d9ba1a
Merge branch 'main' into main
hussainak May 5, 2023
a4bcf86
Merge branch 'main' into main
hussainak May 8, 2023
deb6217
Merge branch 'main' into main
hussainak May 9, 2023
ae5de37
Merge branch 'main' into main
hussainak May 10, 2023
b6f2c01
Merge branch 'main' into main
hussainak May 10, 2023
28ebf2a
Merge branch 'main' into main
hussainak May 10, 2023
ed84b2b
Merge branch 'main' into main
hussainak May 11, 2023
15be46c
Merge branch 'main' into main
hussainak May 12, 2023
429b97b
Merge branch 'main' into main
hussainak May 15, 2023
b63c481
Merge branch 'main' into main
hussainak May 16, 2023
db65e51
Merge branch 'main' into main
hussainak May 17, 2023
e324820
Merge branch 'main' into main
hussainak May 18, 2023
7844db7
Fixed integ tests
otaviomacedo May 18, 2023
efc0680
Replaced anyValue() with a more strict check
otaviomacedo May 18, 2023
3835769
Merge branch 'main' into main
mergify[bot] May 18, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@ export interface S3DeployActionProps extends codepipeline.CommonAwsActionProps {
* @default - none, decided by the HTTP client
*/
readonly cacheControl?: CacheControl[];

/**
* The ARN of the AWS KMS encryption key for the host bucket.
* The KMSEncryptionKeyARN parameter encrypts uploaded artifacts with the provided AWS KMS key.
* For a KMS key, you can use the key ID, the key ARN, or the alias ARN.
hussainak marked this conversation as resolved.
Show resolved Hide resolved
* @default - none
*/
readonly kmsEncryptionKeyArn?: string;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than this being an ARN, we should be taking in an IKey here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Kendra, Thanks for reviewing this :)

I have updated the code.

}

/**
Expand Down Expand Up @@ -129,6 +137,7 @@ export class S3DeployAction extends Action {
ObjectKey: this.props.objectKey,
CannedACL: acl ? toKebabCase(acl.toString()) : undefined,
CacheControl: this.props.cacheControl && this.props.cacheControl.map(ac => ac.value).join(', '),
KMSEncryptionKeyARN: this.props.kmsEncryptionKeyArn,
},
};
}
Expand Down