Merge branch 'develop'

abought · abought · commit 406581f192a2 · 2024-02-25T23:31:18.000-05:00
diff --git a/modules/imputation-server/main.tf b/modules/imputation-server/main.tf
@@ -57,13 +57,13 @@ resource "aws_kms_alias" "emr_kms" {
 resource "aws_kms_grant" "ec2_kms_grant" {
   key_id            = aws_kms_key.emr_kms.arn
   grantee_principal = var.ec2_role_arn
-  operations        = ["Encrypt", "Decrypt", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext"]
+  operations        = ["Encrypt", "Decrypt", "ReEncryptFrom", "ReEncryptTo", "DescribeKey", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext"]
 }
 
 resource "aws_kms_grant" "emr_kms_grant" {
   key_id            = aws_kms_key.emr_kms.arn
   grantee_principal = var.emr_role_arn
-  operations        = ["Encrypt", "Decrypt", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext", "CreateGrant", "RetireGrant"]
+  operations        = ["Encrypt", "Decrypt", "ReEncryptFrom", "ReEncryptTo", "DescribeKey", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext", "CreateGrant", "RetireGrant"]
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,13 @@ resource "aws_kms_alias" "emr_kms" {`
`57`	`57`	`resource "aws_kms_grant" "ec2_kms_grant" {`
`58`	`58`	`key_id = aws_kms_key.emr_kms.arn`
`59`	`59`	`grantee_principal = var.ec2_role_arn`
`60`		`- operations = ["Encrypt", "Decrypt", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext"]`
	`60`	`+ operations = ["Encrypt", "Decrypt", "ReEncryptFrom", "ReEncryptTo", "DescribeKey", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext"]`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`resource "aws_kms_grant" "emr_kms_grant" {`
`64`	`64`	`key_id = aws_kms_key.emr_kms.arn`
`65`	`65`	`grantee_principal = var.emr_role_arn`
`66`		`- operations = ["Encrypt", "Decrypt", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext", "CreateGrant", "RetireGrant"]`
	`66`	`+ operations = ["Encrypt", "Decrypt", "ReEncryptFrom", "ReEncryptTo", "DescribeKey", "GenerateDataKey", "GenerateDataKeyWithoutPlaintext", "CreateGrant", "RetireGrant"]`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`# ---------------------------------------------------------------------------------------------------------------------`