Merge branch 'main' into patch-1

knee-na · web-flow · commit 8f5e5669d1ea · 2025-10-06T11:39:52.000-04:00
diff --git a/common-dev-assets b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 47c0edbc6d669874511116e4cb645097d10561b9
+Subproject commit 325cfd0d91902e08079644092bbf298c4872f388
diff --git a/examples/basic/variables.tf b/examples/basic/variables.tf
@@ -29,7 +29,7 @@ variable "resource_group" {
 variable "plan" {
   type        = string
   description = "The desired pricing plan for IBM Enterprise Application Service instance."
-  default     = "standard"
+  default     = "Standard"
 }
 
 variable "region" {
diff --git a/examples/bdr_complete/variables.tf b/examples/bdr_complete/variables.tf
@@ -29,7 +29,7 @@ variable "resource_group" {
 variable "plan" {
   type        = string
   description = "The desired pricing plan for IBM Enterprise Application Service instance."
-  default     = "standard"
+  default     = "Standard"
 }
 
 variable "region" {
diff --git a/examples/dr_complete/variables.tf b/examples/dr_complete/variables.tf
@@ -29,7 +29,7 @@ variable "resource_group" {
 variable "plan" {
   type        = string
   description = "The desired pricing plan for IBM Enterprise Application Service instance."
-  default     = "standard"
+  default     = "Standard"
 }
 
 variable "region" {
diff --git a/ibm_catalog.json b/ibm_catalog.json
@@ -11,7 +11,7 @@
         "solution",
         "enterprise_app",
         "application_modernization",
-        "converged_infra"
+        "platform_engineering"
       ],
       "keywords": [
         "IaC",
@@ -187,7 +187,7 @@
                 "fully-configurable"
               ],
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
-              "version": "v2.6.3",
+              "version": "v2.8.6",
               "optional": true,
               "on_by_default": true,
               "default_flavor": "fully-configurable",
@@ -215,27 +215,75 @@
             },
             {
               "name": "deploy-arch-ibm-observability",
-              "description": "Configure IBM Cloud Logs, Cloud Monitoring and Activity Tracker event routing for analyzing logs and metrics that are generated by the Enterprise Application Service instance.",
+              "description": "Configure IBM Cloud Logs, Cloud Monitoring, and Activity Tracker event routing for analyzing logs and metrics that are generated by the Enterprise Application Service instance.",
               "flavors": [
-                "instances"
+                "fully-configurable"
               ],
-              "id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
+              "id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
               "input_mapping": [
                 {
                   "dependency_input": "prefix",
                   "version_input": "prefix",
                   "reference_version": true
                 },
+                {
+                  "dependency_input": "region",
+                  "version_input": "region",
+                  "reference_version": true
+                },
                 {
                   "dependency_input": "enable_platform_metrics",
                   "version_input": "enable_platform_metrics",
                   "reference_version": true
+                }
+              ],
+              "optional": true,
+              "on_by_default": true,
+              "version": "v1.6.4"
+            },
+            {
+              "name": "deploy-arch-ibm-cloud-logs",
+              "description": "Set up an IBM Cloud Logs instance to analyze platform logs.",
+              "flavors": [
+                "fully-configurable"
+              ],
+              "id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
+              "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
+              "input_mapping": [
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
+                },
+                {
+                  "dependency_input": "region",
+                  "version_input": "region",
+                  "reference_version": true
                 },
                 {
                   "dependency_input": "logs_routing_tenant_regions",
                   "version_input": "logs_routing_tenant_regions",
                   "reference_version": true
+                }
+              ],
+              "optional": true,
+              "on_by_default": true,
+              "version": "v1.6.11"
+            },
+            {
+              "name": "deploy-arch-ibm-activity-tracker",
+              "description": "Configure Activity Tracker Event Routing to route the auditing events.",
+              "flavors": [
+                "fully-configurable"
+              ],
+              "id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
+              "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
+              "input_mapping": [
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
                 },
                 {
                   "dependency_input": "region",
@@ -245,7 +293,7 @@
               ],
               "optional": true,
               "on_by_default": true,
-              "version": "v3.0.3"
+              "version": "v1.2.25"
             },
             {
               "name": "deploy-arch-ibm-account-infra-base",
@@ -330,6 +378,11 @@
                   "dependency_input": "prefix",
                   "version_input": "prefix"
                 },
+                {
+                  "reference_version": true,
+                  "dependency_input": "queue_manager_name",
+                  "version_input": "queue_manager_name"
+                },
                 {
                   "reference_version": true,
                   "dependency_input": "existing_mq_capacity_crn",
@@ -338,6 +391,11 @@
                 {
                   "value": true,
                   "dependency_input": "mq_s2s_policy_enable"
+                },
+                {
+                  "dependency_input": "secrets_manager_service_plan",
+                  "version_input": "secrets_manager_service_plan",
+                  "reference_version": true
                 }
               ]
             }
@@ -388,7 +446,7 @@
               "options": [
                 {
                   "displayname": "Standard",
-                  "value": "standard"
+                  "value": "Standard"
                 },
                 {
                   "displayname": "Trial (for allowlisted accounts only)",
@@ -411,10 +469,13 @@
                 "config_constraints": {
                   "identifier": "rg_name"
                 }
-              }
+              },
+              "default_value": "Default",
+              "description": "The name of an existing resource group to provision the resources."
             },
             {
               "key": "secrets_manager_region",
+              "type": "string",
               "required": true,
               "virtual": true,
               "default_value": "us-south",
@@ -494,8 +555,8 @@
             },
             {
               "key": "logs_routing_tenant_regions",
-              "type": "list(string)",
-              "default_value": "[]",
+              "type": "array",
+              "default_value": [],
               "description": "To manage platform logs that are generated by IBM Cloud services in a region of IBM Cloud, you must create a tenant in each region that you operate. Pass a list of regions to create a tenant in. [Learn more](https://cloud.ibm.com/docs/logs-router?topic=logs-router-about-platform-logs).",
               "required": true,
               "virtual": true,
@@ -559,6 +620,14 @@
             {
               "key": "maven_repository_password"
             },
+            {
+              "key": "queue_manager_name",
+              "type": "string",
+              "default_value": "queuemanager",
+              "description": "The name of the queue manager.",
+              "required": true,
+              "virtual": true
+            },
             {
               "key": "mq_s2s_policy_enable"
             },
diff --git a/reference-architecture/deployable-architecture-ease.svg b/reference-architecture/deployable-architecture-ease.svg
diff --git a/solutions/fully-configurable/outputs.tf b/solutions/fully-configurable/outputs.tf
@@ -79,7 +79,7 @@ output "db2_s2s_policy_id_crn_scope" {
 
 output "db2_s2s_policy_id_account_scope" {
   description = "Service to Service policy id to DB2 service with account scope"
-  value       = var.db2_s2s_policy_enable == true && var.db2_s2s_policy_target_crn != null ? ibm_iam_authorization_policy.db2_s2s_policy_account_scope[0].id : null
+  value       = var.db2_s2s_policy_enable == true && var.db2_s2s_policy_target_crn == null ? ibm_iam_authorization_policy.db2_s2s_policy_account_scope[0].id : null
 }
 
 output "db2_s2s_resource_id" {
diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf
@@ -73,11 +73,11 @@ variable "instance_name" {
 variable "plan" {
   type        = string
   description = "The desired pricing plan for Enterprise Application Service instance."
-  default     = "standard"
+  default     = "Standard"
   validation {
     # free plan is added only to allow test/validation execution (its catalog name is Trial, programmatic name is free)
-    condition     = contains(["standard", "free"], var.plan)
-    error_message = "The only values accepted for the plan field are standard and free."
+    condition     = contains(["Standard", "free"], var.plan)
+    error_message = "The only values accepted for the plan field are Standard and free."
   }
 }
 
diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -11,7 +11,10 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo"
+	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
+	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testaddons"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testschematic"
 	"gopkg.in/yaml.v3"
@@ -229,6 +232,7 @@ func TestRunStandardSolutionSchematics(t *testing.T) {
 		{Name: "plan", Value: testPlan, DataType: "string"},
 		{Name: "region", Value: region, DataType: "string"},
 		{Name: "prefix", Value: options.Prefix, DataType: "string"},
+		{Name: "instance_name", Value: fmt.Sprintf("instance-%s", common.UniqueId(3)), DataType: "string"},
 		{Name: "existing_resource_group_name", Value: daExistingResourceGroup, DataType: "string"},
 		{Name: "mq_s2s_policy_enable", Value: true, DataType: "bool"},
 		{Name: "mq_s2s_policy_target_crn", Value: mqCapacityInstanceCRN, DataType: "string"},
@@ -271,6 +275,7 @@ func TestRunStandardSolutionUpgradeSchematics(t *testing.T) {
 		{Name: "plan", Value: testPlan, DataType: "string"},
 		{Name: "region", Value: region, DataType: "string"},
 		{Name: "prefix", Value: options.Prefix, DataType: "string"},
+		{Name: "instance_name", Value: fmt.Sprintf("instance-%s", common.UniqueId(3)), DataType: "string"},
 		{Name: "existing_resource_group_name", Value: daExistingResourceGroup, DataType: "string"},
 		{Name: "mq_s2s_policy_enable", Value: true, DataType: "bool"},
 		{Name: "mq_s2s_policy_target_crn", Value: mqCapacityInstanceCRN, DataType: "string"},
@@ -320,3 +325,55 @@ func checkDashboardUrl(t *testing.T, terraformOutput map[string]interface{}) boo
 	}
 	return false
 }
+
+func TestAddonsDefaultConfiguration(t *testing.T) {
+
+	options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
+		Testing:       t,
+		Prefix:        "ease",
+		ResourceGroup: resourceGroup,
+		QuietMode:     false, // Suppress logs except on failure
+	})
+
+	options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
+		options.Prefix,
+		"deploy-arch-ibm-ease",
+		"fully-configurable",
+		map[string]interface{}{
+			"prefix":                       options.Prefix,
+			"existing_resource_group_name": resourceGroup,
+			"subscription_id":              subscriptionIdSecretId,
+			"secrets_manager_service_plan": "trial",
+			"plan":                         "free",
+			"secrets_manager_region":       "eu-de",
+			"mq_s2s_policy_target_crn":     mqCapacityInstanceCRN,
+		},
+	)
+
+	err := options.RunAddonTest()
+	require.NoError(t, err)
+}
+
+// TestDependencyPermutations runs dependency permutations for all dependencies
+func TestDependencyPermutations(t *testing.T) {
+
+	t.Skip("Skip permutation test until some fix is done in testwrapper to tackle heavy load")
+	options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
+		Testing: t,
+		Prefix:  "ease-perm",
+		AddonConfig: cloudinfo.AddonConfig{
+			OfferingName:   "deploy-arch-ibm-ease",
+			OfferingFlavor: "fully-configurable",
+			Inputs: map[string]interface{}{
+				"prefix":                       "ease-perm",
+				"existing_resource_group_name": resourceGroup,
+				"subscription_id":              subscriptionIdSecretId,
+				"secrets_manager_service_plan": "trial",
+				"secrets_manager_region":       "eu-de",
+			},
+		},
+	})
+
+	err := options.RunAddonPermutationTest()
+	assert.NoError(t, err, "Dependency permutation test should not fail")
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ variable "resource_group" {`
`29`	`29`	`variable "plan" {`
`30`	`30`	`type = string`
`31`	`31`	`description = "The desired pricing plan for IBM Enterprise Application Service instance."`
`32`		`- default = "standard"`
	`32`	`+ default = "Standard"`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`variable "region" {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ output "db2_s2s_policy_id_crn_scope" {`
`79`	`79`
`80`	`80`	`output "db2_s2s_policy_id_account_scope" {`
`81`	`81`	`description = "Service to Service policy id to DB2 service with account scope"`
`82`		`- value = var.db2_s2s_policy_enable == true && var.db2_s2s_policy_target_crn != null ? ibm_iam_authorization_policy.db2_s2s_policy_account_scope[0].id : null`
	`82`	`+ value = var.db2_s2s_policy_enable == true && var.db2_s2s_policy_target_crn == null ? ibm_iam_authorization_policy.db2_s2s_policy_account_scope[0].id : null`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`output "db2_s2s_resource_id" {`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ variable "instance_name" {`
`73`	`73`	`variable "plan" {`
`74`	`74`	`type = string`
`75`	`75`	`description = "The desired pricing plan for Enterprise Application Service instance."`
`76`		`- default = "standard"`
	`76`	`+ default = "Standard"`
`77`	`77`	`validation {`
`78`	`78`	`# free plan is added only to allow test/validation execution (its catalog name is Trial, programmatic name is free)`
`79`		`- condition = contains(["standard", "free"], var.plan)`
`80`		`- error_message = "The only values accepted for the plan field are standard and free."`
	`79`	`+ condition = contains(["Standard", "free"], var.plan)`
	`80`	`+ error_message = "The only values accepted for the plan field are Standard and free."`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`