fix: fix kms reference error when sm crn is set (#112)

* fix: fix kms reference error when sm crn is set

* fix: leverage lookup by crn to return existing sm instance details

* fix: output index

* docs: fix description

Author: vburckhardt

solutions/standard/main.tf

@@ -3,6 +3,7 @@
 ########################################################################################################################
 
 module "resource_group" {
+  count                        = var.existing_secrets_manager_crn == null ? 1 : 0
   source                       = "terraform-ibm-modules/resource-group/ibm"
   version                      = "1.1.4"
   resource_group_name          = var.use_existing_resource_group == false ? (var.prefix != null ? "${var.prefix}-${var.resource_group_name}" : var.resource_group_name) : null
@@ -13,7 +14,7 @@ module "resource_group" {
 # KMS Key
 #######################################################################################################################
 locals {
-  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_crn       = var.existing_secrets_manager_crn == null ? (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) : null
   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
 
@@ -67,7 +68,7 @@ locals {
 module "secrets_manager" {
   count                = var.existing_secrets_manager_crn != null ? 0 : 1
   source               = "../.."
-  resource_group_id    = module.resource_group.resource_group_id
+  resource_group_id    = module.resource_group[0].resource_group_id
   region               = var.region
   secrets_manager_name = var.prefix != null ? "${var.prefix}-${var.secrets_manager_instance_name}" : var.secrets_manager_instance_name
   sm_service_plan      = var.service_plan
@@ -137,3 +138,8 @@ module "private_secret_engine" {
   certificate_template_name = var.certificate_template_name
   endpoint_type             = var.allowed_network == "private-only" ? "private" : "public"
 }
+
+data "ibm_resource_instance" "existing_sm" {
+  count      = var.existing_secrets_manager_crn == null ? 0 : 1
+  identifier = var.existing_secrets_manager_crn
+}

solutions/standard/outputs.tf

@@ -1,11 +1,11 @@
 output "resource_group_name" {
   description = "Resource group name"
-  value       = module.resource_group.resource_group_name
+  value       = var.existing_secrets_manager_crn == null ? module.resource_group[0].resource_group_name : data.ibm_resource_instance.existing_sm[0].resource_group_name
 }
 
 output "resource_group_id" {
   description = "Resource group ID"
-  value       = module.resource_group.resource_group_id
+  value       = var.existing_secrets_manager_crn == null ? module.resource_group[0].resource_group_name : data.ibm_resource_instance.existing_sm[0].resource_group_id
 }
 
 output "secrets_manager_guid" {
@@ -14,12 +14,12 @@ output "secrets_manager_guid" {
 }
 
 output "secrets_manager_id" {
-  description = "ID of Secrets Manager instance"
+  description = "ID of Secrets Manager instance. Same value as secrets_manager_guid"
   value       = var.existing_secrets_manager_crn == null ? module.secrets_manager[0].secrets_manager_id : local.secrets_manager_guid
 }
 
 output "secrets_manager_name" {
-  value       = var.existing_secrets_manager_crn == null ? module.secrets_manager[0].secrets_manager_name : null
+  value       = var.existing_secrets_manager_crn == null ? module.secrets_manager[0].secrets_manager_name : data.ibm_resource_instance.existing_sm[0].resource_name
   description = "Name of the Secrets Manager instance"
 }
 

solutions/standard/variables.tf

@@ -16,7 +16,8 @@ variable "use_existing_resource_group" {
 
 variable "resource_group_name" {
   type        = string
-  description = "The name of a new or an existing resource group in which to provision Secrets Manager resources to. If prefix input variable is passed then it will get prefixed infront of the value in the format of '<prefix>-value'"
+  description = "The name of a new or an existing resource group in which to provision Secrets Manager resources to. If prefix input variable is passed then it will get prefixed infront of the value in the format of '<prefix>-value'. Optional if existing_secrets_manager_crn is not set."
+  default     = null
 }
 
 variable "region" {