Skip to content

Commit 0d0e641

Browse files
authored
Merge pull request #89 from zama-ai/fred/fix/add-backup-in-configmap
fix: Add backup info in configmap
2 parents fbfd0aa + 2abeca6 commit 0d0e641

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

modules/mpc-backup-key/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ resource "aws_kms_key" "this_backup" {
4848
},
4949
Action = [
5050
"kms:GetPublicKey",
51+
"kms:DescribeKey",
5152
],
5253
Resource = "*"
5354
},

modules/mpc-party/main.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ resource "aws_iam_policy" "mpc_aws" {
224224
{
225225
Sid = "AllowCrossAccountKeyBackup"
226226
Effect = "Allow"
227-
Action = "kms:GetPublicKey"
227+
Action = ["kms:GetPublicKey", "kms:DescribeKey", "kms:GenerateDataKey", "kms:Decrypt"]
228228
Resource = var.kms_backup_vault_kms_key_arn
229229
}
230230
] : []
@@ -535,6 +535,10 @@ resource "kubernetes_config_map" "mpc_party_config" {
535535
"KMS_CORE__PRIVATE_VAULT__KEYCHAIN__AWS_KMS__ROOT_KEY_ID" = local.kms_key_id
536536
"KMS_CORE__PRIVATE_VAULT__KEYCHAIN__AWS_KMS__ROOT_KEY_SPEC" = var.kms_enabled_nitro_enclaves ? "symm" : null
537537
"KMS_CONNECTOR__TX_SENDER_AWS_KMS_KEY_ID" = var.kms_connector_enable_txsender_key ? local.connector_key_id : null
538+
"KMS_CORE__BACKUP_VAULT__STORAGE__S3__BUCKET" = var.kms_enable_backup_vault && var.kms_backup_vault_bucket_name != null ? var.kms_backup_vault_bucket_name : null
539+
"KMS_CORE__BACKUP_VAULT__STORAGE__S3__PREFIX" = "backup"
540+
"KMS_CORE__BACKUP_VAULT__KEYCHAIN__AWS_KMS__ROOT_KEY_ID" = var.kms_enable_backup_vault && var.kms_backup_vault_kms_key_arn != null ? var.kms_backup_vault_kms_key_arn : null
541+
"KMS_CORE__BACKUP_VAULT__KEYCHAIN__AWS_KMS__ROOT_KEY_SPEC" = var.kms_enable_backup_vault && var.kms_backup_vault_kms_key_arn != null ? "asymm" : null
538542
}
539543

540544
depends_on = [kubernetes_namespace.mpc_party_namespace, aws_s3_bucket.vault_private_bucket, aws_s3_bucket.vault_public_bucket]

0 commit comments

Comments
 (0)