feat: The following variables have been renamed in the DA solution:<br>- existing_sm_kms_key_crn -> existing_secrets_manager_kms_key_crn<br>- existing_en_instance_crn -> existing_event_notification_instance_crn<br>- skip_en_iam_authorization_policy -> skip_event_notification_iam_authorization_policy (#105)

Author: Khuzaima05

solutions/standard/main.tf

@@ -13,7 +13,7 @@ module "resource_group" {
 # KMS Key
 #######################################################################################################################
 locals {
-  kms_key_crn       = var.existing_sm_kms_key_crn != null ? var.existing_sm_kms_key_crn : module.kms[0].keys[format("%s.%s", local.kms_key_ring_name, local.kms_key_name)].crn
+  kms_key_crn       = var.existing_secrets_manager_kms_key_crn != null ? var.existing_secrets_manager_kms_key_crn : module.kms[0].keys[format("%s.%s", local.kms_key_ring_name, local.kms_key_name)].crn
   kms_key_ring_name = var.prefix != null ? "${var.prefix}-${var.kms_key_ring_name}" : var.kms_key_ring_name
   kms_key_name      = var.prefix != null ? "${var.prefix}-${var.kms_key_name}" : var.kms_key_name
 }
@@ -22,7 +22,7 @@ module "kms" {
   providers = {
     ibm = ibm.kms
   }
-  count                       = var.existing_sm_kms_key_crn != null ? 0 : 1 # no need to create any KMS resources if passing an existing key, or bucket
+  count                       = var.existing_secrets_manager_kms_key_crn != null ? 0 : 1 # no need to create any KMS resources if passing an existing key, or bucket
   source                      = "terraform-ibm-modules/kms-all-inclusive/ibm"
   version                     = "4.8.5"
   create_key_protect_instance = false
@@ -66,9 +66,9 @@ module "secrets_manager" {
   kms_key_crn                       = local.kms_key_crn
   skip_kms_iam_authorization_policy = var.skip_kms_iam_authorization_policy
   # event notifications dependency
-  enable_event_notification        = var.existing_en_instance_crn != null ? true : false
-  existing_en_instance_crn         = var.existing_en_instance_crn
-  skip_en_iam_authorization_policy = var.skip_en_iam_authorization_policy
+  enable_event_notification        = var.existing_event_notification_instance_crn != null ? true : false
+  existing_en_instance_crn         = var.existing_event_notification_instance_crn
+  skip_en_iam_authorization_policy = var.skip_event_notification_iam_authorization_policy
   endpoint_type                    = var.allowed_network == "private-only" ? "private" : "public"
 }
 

solutions/standard/variables.tf

@@ -89,7 +89,7 @@ variable "skip_kms_iam_authorization_policy" {
   default     = false
 }
 
-variable "existing_sm_kms_key_crn" {
+variable "existing_secrets_manager_kms_key_crn" {
   type        = string
   description = "The CRN of an existing KMS key to use for Secrets Manager. If not supplied, a new key ring and key will be created."
   default     = null
@@ -137,13 +137,13 @@ variable "kms_key_name" {
 # Event Notifications
 ########################################################################################################################
 
-variable "existing_en_instance_crn" {
+variable "existing_event_notification_instance_crn" {
   type        = string
   description = "The CRN of the Event Notifications service to enable lifecycle notifications for your Secrets Manager instance."
   default     = null
 }
 
-variable "skip_en_iam_authorization_policy" {
+variable "skip_event_notification_iam_authorization_policy" {
   type        = bool
   description = "Set to true to skip the creation of an IAM authorization policy that permits all Secrets Manager instances (scoped to the resource group) an 'Event Source Manager' role to the given Event Notifications instance passed in the `existing_en_instance_crn` input variable."
   default     = false