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

Added kms:GenerateDataKey action to KMSEncryptPolicy policy #3657

Merged
merged 9 commits into from
Nov 4, 2024
Merged

Added kms:GenerateDataKey action to KMSEncryptPolicy policy #3657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
78d6101
Added permission required to generate data key for encryption.
Sep 30, 2024
e207a71
Fixed expected data used by tests.
Oct 3, 2024
2e089a8
Changed "kms:GenerateDataKey" permission to "kms:GenerateDataKey*".
Oct 3, 2024
d66aa22
Listed actions individually instead of using wildcard.
elmaimbo Oct 3, 2024
7341594
Merge branch 'develop' into develop
aaythapa Oct 11, 2024
6000a62
Moved changes into new policy "KMSEncryptPolicy_v2", and restored old…
elmaimbo Oct 13, 2024
5117061
Merge branch 'develop' into develop
elmaimbo Oct 22, 2024
d98a78a
Merge branch 'develop' into develop
elmaimbo Oct 24, 2024
1465cf9
Merge branch 'develop' into develop
aaythapa Nov 4, 2024
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
32 changes: 32 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 @@ -1275,6 +1275,38 @@
}
}
},
"KMSEncryptPolicy_v2": {
"Definition": {
"Statement": [
{
"Action": [
aaythapa marked this conversation as resolved.
Show resolved Hide resolved
"kms:Encrypt",
"kms:GenerateDataKey",
"kms:GenerateDataKeyWithoutPlaintext",
"kms:GenerateDataKeyPair",
"kms:GenerateDataKeyPairWithoutPlaintext"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:kms:${AWS::Region}:${AWS::AccountId}:key/${keyId}",
{
"keyId": {
"Ref": "KeyId"
}
}
]
}
}
]
},
"Description": "Gives permission to encrypt with KMS Key",
"Parameters": {
"KeyId": {
"Description": "ID of the KMS Key"
}
}
},
"KinesisCrudPolicy": {
"Definition": {
"Statement": [
Expand Down
3 changes: 3 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 @@ -187,3 +187,6 @@ Resources:

- StepFunctionsCallbackPolicy:
StateMachineName: name

- KMSEncryptPolicy_v2:
KeyId: keyId
25 changes: 25 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 @@ -1726,6 +1726,31 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy63"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"kms:Encrypt",
"kms:GenerateDataKey",
"kms:GenerateDataKeyWithoutPlaintext",
"kms:GenerateDataKeyPair",
"kms:GenerateDataKeyPairWithoutPlaintext"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:kms:${AWS::Region}:${AWS::AccountId}:key/${keyId}",
{
"keyId": "keyId"
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
}
],
"Tags": [
Expand Down
25 changes: 25 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 @@ -1726,6 +1726,31 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy63"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"kms:Encrypt",
"kms:GenerateDataKey",
"kms:GenerateDataKeyWithoutPlaintext",
"kms:GenerateDataKeyPair",
"kms:GenerateDataKeyPairWithoutPlaintext"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:kms:${AWS::Region}:${AWS::AccountId}:key/${keyId}",
{
"keyId": "keyId"
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
}
],
"Tags": [
Expand Down
25 changes: 25 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 @@ -1726,6 +1726,31 @@
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy63"
},
{
"PolicyDocument": {
"Statement": [
{
"Action": [
"kms:Encrypt",
"kms:GenerateDataKey",
"kms:GenerateDataKeyWithoutPlaintext",
"kms:GenerateDataKeyPair",
"kms:GenerateDataKeyPairWithoutPlaintext"
],
"Effect": "Allow",
"Resource": {
"Fn::Sub": [
"arn:${AWS::Partition}:kms:${AWS::Region}:${AWS::AccountId}:key/${keyId}",
{
"keyId": "keyId"
}
]
}
}
]
},
"PolicyName": "KitchenSinkFunctionRolePolicy64"
}
],
"Tags": [
Expand Down