CMK support #137
Merged
CMK support #137
Conversation
This file contains hidden or 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
foxus
suggested changes
Aug 22, 2025
infrastructure/CMK/README.md
Outdated
| "infrastructure.kinesisanalytics.amazonaws.com" | ||
| ] | ||
| }, | ||
| "Action": "kms:*", |
There was a problem hiding this comment.
Suggested change
| "Action": "kms:*", | |
| "Action": [ "kms:DescribeKey", "kms:Decrypt", "kms:GenerateDataKey", "kms:GenerateDataKeyWithoutPlaintext", "kms:CreateGrant", ], |
There was a problem hiding this comment.
Updated (just removing the trailing comma)
infrastructure/CMK/msf-kms-key.yaml
Outdated
Comment on lines
64
to
88
| - Sid: 'Allow Operator to use key for durable state via Managed Flink' | ||
| Effect: Allow | ||
| Principal: | ||
| AWS: !Ref OperatorUserArn | ||
| Action: | ||
| - 'kms:Decrypt' | ||
| - 'kms:GenerateDataKey' | ||
| Resource: '*' | ||
| Condition: | ||
| StringEquals: | ||
| 'kms:EncryptionContext:aws:kinesisanalytics:arn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
| 'kms:ViaService': !Sub 'kinesisanalytics.${AWS::Region}.amazonaws.com' | ||
|
|
||
| - Sid: 'Allow Operator to use key for running state via Managed Flink' | ||
| Effect: Allow | ||
| Principal: | ||
| AWS: !Ref OperatorUserArn | ||
| Action: | ||
| - 'kms:Decrypt' | ||
| - 'kms:GenerateDataKeyWithoutPlaintext' | ||
| Resource: '*' | ||
| Condition: | ||
| StringEquals: | ||
| 'kms:EncryptionContext:aws:kinesisanalytics:arn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
| 'kms:ViaService': !Sub 'kinesisanalytics.${AWS::Region}.amazonaws.com' |
There was a problem hiding this comment.
Let's merge these to become the following instead
"Sid": "AllowOperatorToConfigureAppToUseKeyForApplicationState",
"Effect": "Allow",
"Principal": {
"AWS": "arn:aws:iam::Application-account-ID:role/Operator"
},
"Action": [
"kms:Decrypt",
"kms:GenerateDataKey",
"kms:GenerateDataKeyWithoutPlaintext"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"kms:EncryptionContext:aws:kinesisanalytics:arn":
"arn:aws:kinesisanalytics:Aws-region:Application-account-ID:application/MyCmkApplication",
"kms:ViaService": "kinesisanalytics.Aws-region.amazonaws.com"
}
}
infrastructure/CMK/msf-kms-key.yaml
Outdated
Comment on lines
117
to
129
| - Sid: 'Allow Managed Flink application to decrypt durable state storage' | ||
| Effect: Allow | ||
| Principal: | ||
| Service: 'kinesisanalytics.amazonaws.com' | ||
| Action: | ||
| - 'kms:Decrypt' | ||
| - 'kms:GenerateDataKey' | ||
| Resource: '*' | ||
| Condition: | ||
| StringEquals: | ||
| 'aws:SourceArn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
| 'kms:EncryptionContext:aws:kinesisanalytics:arn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
| 'aws:SourceAccount': !Ref 'AWS::AccountId' |
There was a problem hiding this comment.
We'll need to split this into the following for the time being as Source context is not provided during decrypt
{
"Sid": "AllowMSFServiceToGenerateDataKeyForDurableState",
"Effect": "Allow",
"Principal": {
"Service": "kinesisanalytics.amazonaws.com"
},
"Action": [
"kms:GenerateDataKey"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"aws:SourceArn":
"arn:aws:kinesisanalytics:Aws-region:Application-account-ID:application/MyCmkApplication",
"kms:EncryptionContext:aws:kinesisanalytics:arn":
"arn:aws:kinesisanalytics:Aws-region:Application-account-ID:application/MyCmkApplication",
"aws:SourceAccount": "Application-account-ID"
}
}
},
{
"Sid": "AllowMSFServiceToDecryptForDurableState",
"Effect": "Allow",
"Principal": {
"Service": "kinesisanalytics.amazonaws.com"
},
"Action": [
"kms:Decrypt"
],
"Resource": "*",
"Condition": {
"StringEquals": {
"kms:EncryptionContext:aws:kinesisanalytics:arn":
"arn:aws:kinesisanalytics:Aws-region:Application-account-ID:application/MyCmkApplication"
}
}
}
infrastructure/CMK/msf-kms-key.yaml
Outdated
| Effect: Allow | ||
| Principal: | ||
| Service: | ||
| - 'kinesisanalytics.amazonaws.com' |
There was a problem hiding this comment.
Let's remove 'kinesisanalytics.amazonaws.com' from here
|
@leekeiabstraction they key policy should be fixed now. Please triple-check |
infrastructure/CMK/msf-kms-key.yaml
Outdated
| 'aws:SourceArn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
| 'aws:SourceAccount': !Ref 'AWS::AccountId' | ||
|
|
||
| - Sid: 'FIXME Allow Managed Flink application to generate data key for durable state storage' |
infrastructure/CMK/msf-kms-key.yaml
Outdated
| StringEquals: | ||
| 'kms:EncryptionContext:aws:kinesisanalytics:arn': !Sub 'arn:aws:kinesisanalytics:${AWS::Region}:${AWS::AccountId}:application/${ApplicationName}' | ||
|
|
||
| - Sid: 'Allow Managed Flink application to decrypt running application storage' |
There was a problem hiding this comment.
Nit: Allow Managed Flink application to use key for running application storage
|
@leekeiabstraction fixed the two SIDs |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of the change
CFN template examples for CMK support