Skip to content

Commit 5656ae1

Browse files
jor2Jordan-Williams2ocofaigh
authored
fix: fix bug in the DA which can occur when using BYOK / KYOK for data encryption, but using the default ICD key for backups encryption (#199)
Co-authored-by: Jordan-Williams2 <[email protected]> Co-authored-by: Conall Ó Cofaigh <[email protected]>
1 parent cd9dd4a commit 5656ae1

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

main.tf

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,30 +33,35 @@ locals {
3333
# Parse info from KMS key CRNs
3434
########################################################################################################################
3535

36+
locals {
37+
parse_kms_key = !var.use_ibm_owned_encryption_key
38+
parse_backup_kms_key = !var.use_ibm_owned_encryption_key && !var.use_default_backup_encryption_key
39+
}
40+
3641
module "kms_key_crn_parser" {
37-
count = var.use_ibm_owned_encryption_key ? 0 : 1
42+
count = local.parse_kms_key ? 1 : 0
3843
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
3944
version = "1.1.0"
4045
crn = var.kms_key_crn
4146
}
4247

4348
module "backup_key_crn_parser" {
44-
count = var.use_ibm_owned_encryption_key ? 0 : 1
49+
count = local.parse_backup_kms_key ? 1 : 0
4550
source = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
4651
version = "1.1.0"
4752
crn = local.backup_encryption_key_crn
4853
}
4954

5055
# Put parsed values into locals
5156
locals {
52-
kms_service = !var.use_ibm_owned_encryption_key ? module.kms_key_crn_parser[0].service_name : null
53-
kms_account_id = !var.use_ibm_owned_encryption_key ? module.kms_key_crn_parser[0].account_id : null
54-
kms_key_id = !var.use_ibm_owned_encryption_key ? module.kms_key_crn_parser[0].resource : null
55-
kms_key_instance_guid = !var.use_ibm_owned_encryption_key ? module.kms_key_crn_parser[0].service_instance : null
56-
backup_kms_service = !var.use_ibm_owned_encryption_key ? module.backup_key_crn_parser[0].service_name : null
57-
backup_kms_account_id = !var.use_ibm_owned_encryption_key ? module.backup_key_crn_parser[0].account_id : null
58-
backup_kms_key_id = !var.use_ibm_owned_encryption_key ? module.backup_key_crn_parser[0].resource : null
59-
backup_kms_key_instance_guid = !var.use_ibm_owned_encryption_key ? module.backup_key_crn_parser[0].service_instance : null
57+
kms_service = local.parse_kms_key ? module.kms_key_crn_parser[0].service_name : null
58+
kms_account_id = local.parse_kms_key ? module.kms_key_crn_parser[0].account_id : null
59+
kms_key_id = local.parse_kms_key ? module.kms_key_crn_parser[0].resource : null
60+
kms_key_instance_guid = local.parse_kms_key ? module.kms_key_crn_parser[0].service_instance : null
61+
backup_kms_service = local.parse_backup_kms_key ? module.backup_key_crn_parser[0].service_name : null
62+
backup_kms_account_id = local.parse_backup_kms_key ? module.backup_key_crn_parser[0].account_id : null
63+
backup_kms_key_id = local.parse_backup_kms_key ? module.backup_key_crn_parser[0].resource : null
64+
backup_kms_key_instance_guid = local.parse_backup_kms_key ? module.backup_key_crn_parser[0].service_instance : null
6065
}
6166

6267
########################################################################################################################

0 commit comments

Comments
 (0)