Merge branch 'split-observability-da' of github.com:terraform-ibm-modules/terraform-ibm-secrets-manager into split-observability-da

rajatagarwal-ibm · rajatagarwal-ibm · commit a02c2f93c205 · 2025-08-01T11:24:16.000+01:00
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ You need the following permissions to run this module.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.32.3 |
+| <a name="module_cbr_rule"></a> [cbr\_rule](#module\_cbr\_rule) | terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module | 1.32.4 |
 | <a name="module_kms_key_crn_parser"></a> [kms\_key\_crn\_parser](#module\_kms\_key\_crn\_parser) | terraform-ibm-modules/common-utilities/ibm//modules/crn-parser | 1.2.0 |
 | <a name="module_secrets"></a> [secrets](#module\_secrets) | ./modules/secrets | n/a |
 
diff --git a/examples/complete/README.md b/examples/complete/README.md
@@ -15,8 +15,8 @@ This examples handles the provisioning of a new Secrets Manager instance.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_event_notification"></a> [event\_notification](#module\_event\_notification) | terraform-ibm-modules/event-notifications/ibm | 2.4.17 |
-| <a name="module_key_protect"></a> [key\_protect](#module\_key\_protect) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.1.11 |
+| <a name="module_event_notification"></a> [event\_notification](#module\_event\_notification) | terraform-ibm-modules/event-notifications/ibm | 2.4.22 |
+| <a name="module_key_protect"></a> [key\_protect](#module\_key\_protect) | terraform-ibm-modules/kms-all-inclusive/ibm | 5.1.13 |
 | <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.2.1 |
 | <a name="module_secrets_manager"></a> [secrets\_manager](#module\_secrets\_manager) | ../.. | n/a |
 
diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -8,7 +8,7 @@ module "resource_group" {
 
 module "key_protect" {
   source                    = "terraform-ibm-modules/kms-all-inclusive/ibm"
-  version                   = "5.1.11"
+  version                   = "5.1.13"
   key_protect_instance_name = "${var.prefix}-key-protect"
   resource_group_id         = module.resource_group.resource_group_id
   region                    = var.region
@@ -27,7 +27,7 @@ module "key_protect" {
 
 module "event_notification" {
   source            = "terraform-ibm-modules/event-notifications/ibm"
-  version           = "2.4.17"
+  version           = "2.4.22"
   resource_group_id = module.resource_group.resource_group_id
   name              = "${var.prefix}-en"
   tags              = var.resource_tags
diff --git a/examples/fscloud/main.tf b/examples/fscloud/main.tf
@@ -30,7 +30,7 @@ resource "ibm_is_vpc" "vpc" {
 ##############################################################################
 module "cbr_zone" {
   source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-zone-module"
-  version          = "1.32.3"
+  version          = "1.32.4"
   name             = "${var.prefix}-CBR-zone"
   zone_description = "CBR Network zone representing VPC"
   account_id       = data.ibm_iam_account_settings.iam_account_settings.account_id
@@ -42,7 +42,7 @@ module "cbr_zone" {
 
 module "event_notification" {
   source            = "terraform-ibm-modules/event-notifications/ibm"
-  version           = "2.4.17"
+  version           = "2.4.22"
   resource_group_id = module.resource_group.resource_group_id
   name              = "${var.prefix}-en"
   tags              = var.resource_tags
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -9,7 +9,8 @@
         "target_terraform",
         "terraform",
         "solution",
-        "security"
+        "security",
+        "converged_infra"
       ],
       "keywords": [
         "Secrets",
diff --git a/main.tf b/main.tf
@@ -79,10 +79,10 @@ locals {
 ########################################################################################################################
 
 module "kms_key_crn_parser" {
-  count   = local.create_kms_auth_policy ? 1 : 0
+  count   = var.kms_encryption_enabled ? 1 : 0
   source  = "terraform-ibm-modules/common-utilities/ibm//modules/crn-parser"
   version = "1.2.0"
-  crn     = var.kms_key_crn
+  crn     = var.kms_key_crn != null ? var.kms_key_crn : ""
 }
 
 # Create auth policy (scoped to exact KMS key)
@@ -163,7 +163,7 @@ locals {
 module "cbr_rule" {
   count            = length(var.cbr_rules) > 0 ? length(var.cbr_rules) : 0
   source           = "terraform-ibm-modules/cbr/ibm//modules/cbr-rule-module"
-  version          = "1.32.3"
+  version          = "1.32.4"
   rule_description = var.cbr_rules[count.index].description
   enforcement_mode = var.cbr_rules[count.index].enforcement_mode
   rule_contexts    = var.cbr_rules[count.index].rule_contexts
diff --git a/modules/secrets/README.md b/modules/secrets/README.md
@@ -50,7 +50,7 @@ module "secrets_manager" {
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_secret_groups"></a> [secret\_groups](#module\_secret\_groups) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.10 |
+| <a name="module_secret_groups"></a> [secret\_groups](#module\_secret\_groups) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.3.11 |
 | <a name="module_secrets"></a> [secrets](#module\_secrets) | terraform-ibm-modules/secrets-manager-secret/ibm | 1.7.0 |
 
 ### Resources
diff --git a/modules/secrets/main.tf b/modules/secrets/main.tf
@@ -25,7 +25,7 @@ data "ibm_sm_secret_groups" "existing_secret_groups" {
 module "secret_groups" {
   for_each                 = { for obj in local.secret_groups : obj.secret_group_name => obj }
   source                   = "terraform-ibm-modules/secrets-manager-secret-group/ibm"
-  version                  = "1.3.10"
+  version                  = "1.3.11"
   region                   = var.existing_sm_instance_region
   secrets_manager_guid     = var.existing_sm_instance_guid
   secret_group_name        = each.value.secret_group_name
diff --git a/solutions/fully-configurable/main.tf b/solutions/fully-configurable/main.tf
@@ -130,7 +130,7 @@ module "kms" {
   }
   count                       = var.existing_secrets_manager_crn == null && var.kms_encryption_enabled && var.existing_secrets_manager_kms_key_crn == null ? 1 : 0 # no need to create any KMS resources if passing an existing key
   source                      = "terraform-ibm-modules/kms-all-inclusive/ibm"
-  version                     = "5.1.11"
+  version                     = "5.1.13"
   create_key_protect_instance = false
   region                      = local.kms_region
   existing_kms_instance_crn   = var.existing_kms_instance_crn
diff --git a/solutions/fully-configurable/version.tf b/solutions/fully-configurable/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.80.3"
+      version = "1.80.4"
     }
     time = {
       source  = "hashicorp/time"
diff --git a/tests/existing-resources/main.tf b/tests/existing-resources/main.tf
@@ -16,7 +16,7 @@ module "resource_group" {
 
 module "event_notifications" {
   source            = "terraform-ibm-modules/event-notifications/ibm"
-  version           = "2.4.17"
+  version           = "2.4.22"
   resource_group_id = module.resource_group.resource_group_id
   name              = "${var.prefix}-en"
   tags              = var.resource_tags
@@ -31,7 +31,7 @@ module "event_notifications" {
 
 module "key_protect" {
   source                    = "terraform-ibm-modules/kms-all-inclusive/ibm"
-  version                   = "5.1.11"
+  version                   = "5.1.13"
   key_protect_instance_name = "${var.prefix}-key-protect"
   resource_group_id         = module.resource_group.resource_group_id
   region                    = var.region
diff --git a/tests/existing-resources/outputs.tf b/tests/existing-resources/outputs.tf
@@ -18,7 +18,7 @@ output "secrets_manager_kms_instance_crn" {
   description = "CRN of created secret manager KMS instance"
 }
 
-output "event_notification_instance_crn" {
+output "event_notifications_instance_crn" {
   value       = module.event_notifications.crn
   description = "CRN of created event notification"
 }
diff --git a/tests/new-resources/main.tf b/tests/new-resources/main.tf
@@ -16,8 +16,7 @@ module "resource_group" {
 
 module "secrets_manager" {
   count                         = var.provision_secrets_manager == true ? 1 : 0
-  source                        = "terraform-ibm-modules/secrets-manager/ibm"
-  version                       = "2.6.10" # Replace "X.X.X" with a release version to lock into a specific release
+  source                        = "../.."
   resource_group_id             = module.resource_group.resource_group_id
   region                        = var.region
   secrets_manager_name          = "${var.prefix}-tsm"
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -164,7 +164,7 @@ func TestRunExistingResourcesInstancesFullyConfigurable(t *testing.T) {
 			{Name: "prefix", Value: options.Prefix, DataType: "string"},
 			{Name: "region", Value: region, DataType: "string"},
 			{Name: "existing_resource_group_name", Value: terraform.Output(t, existingTerraformOptions, "resource_group_name"), DataType: "string"},
-			{Name: "existing_event_notification_instance_crn", Value: terraform.Output(t, existingTerraformOptions, "event_notification_instance_crn"), DataType: "string"},
+			{Name: "existing_event_notifications_instance_crn", Value: terraform.Output(t, existingTerraformOptions, "event_notifications_instance_crn"), DataType: "string"},
 			{Name: "existing_secrets_manager_kms_key_crn", Value: terraform.Output(t, existingTerraformOptions, "secrets_manager_kms_key_crn"), DataType: "string"},
 			{Name: "kms_encryption_enabled", Value: true, DataType: "bool"},
 			{Name: "service_plan", Value: "trial", DataType: "string"},

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ module "kms" {`
`130`	`130`	`}`
`131`	`131`	`count = var.existing_secrets_manager_crn == null && var.kms_encryption_enabled && var.existing_secrets_manager_kms_key_crn == null ? 1 : 0 # no need to create any KMS resources if passing an existing key`
`132`	`132`	`source = "terraform-ibm-modules/kms-all-inclusive/ibm"`
`133`		`- version = "5.1.11"`
	`133`	`+ version = "5.1.13"`
`134`	`134`	`create_key_protect_instance = false`
`135`	`135`	`region = local.kms_region`
`136`	`136`	`existing_kms_instance_crn = var.existing_kms_instance_crn`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`ibm = {`
`6`	`6`	`source = "IBM-Cloud/ibm"`
`7`		`- version = "1.80.3"`
	`7`	`+ version = "1.80.4"`
`8`	`8`	`}`
`9`	`9`	`time = {`
`10`	`10`	`source = "hashicorp/time"`