From 2423d0c8001e36620ba95fb308392db876ac5f05 Mon Sep 17 00:00:00 2001 From: whoffler Date: Mon, 20 Oct 2025 15:27:35 +0100 Subject: [PATCH 1/3] update dependencies and prefix input, remove account infra dep --- ibm_catalog.json | 142 +++++++++++------------ solutions/quickstart/variables.tf | 4 +- solutions/security-enforced/variables.tf | 4 +- 3 files changed, 71 insertions(+), 79 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index f42b6fc4..13359822 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -104,13 +104,6 @@ "service_name": "messagehub", "notes": "Required for creating EventStreams instance." }, - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Administrator" - ], - "service_name": "iam-identity", - "notes": "[Optional] Required if Cloud automation for account configuration is enabled." - }, { "role_crns": [ "crn:v1:bluemix:public:iam::::serviceRole:Manager", @@ -141,7 +134,18 @@ }, { "key": "prefix", - "required": true + "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, + "value_constraints": [ + { + "type": "regex", + "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.", + "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$" + } + ] }, { "key": "region", @@ -201,7 +205,7 @@ } }, "default_value": "Default", - "description": "The name of an existing resource group to provision the resources." + "description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." }, { "key": "plan", @@ -330,31 +334,6 @@ } ], "dependencies": [ - { - "name": "deploy-arch-ibm-account-infra-base", - "description": "Organize your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, expand to apply recommended security controls via \"with Account Settings\" variation.", - "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3", - "flavors": [ - "resource-group-only", - "resource-groups-with-account-settings" - ], - "default_flavor": "resource-group-only", - "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global", - "input_mapping": [ - { - "dependency_output": "workload_resource_group_name", - "version_input": "existing_resource_group_name" - }, - { - "dependency_input": "prefix", - "version_input": "prefix", - "reference_version": true - } - ], - "optional": true, - "on_by_default": false, - "version": "v3.0.23" - }, { "name": "deploy-arch-ibm-cloud-monitoring", "description": "Configure IBM Cloud Monitoring to collect the platform metrics.", @@ -382,11 +361,16 @@ "dependency_input": "enable_platform_metrics", "version_input": "enable_platform_metrics", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.7.2" + "version": "v1.9.0" }, { "name": "deploy-arch-ibm-cloud-logs", @@ -411,11 +395,16 @@ "dependency_input": "logs_routing_tenant_regions", "version_input": "logs_routing_tenant_regions", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.6.28" + "version": "v1.9.0" }, { "name": "deploy-arch-ibm-activity-tracker", @@ -435,11 +424,16 @@ "dependency_input": "region", "version_input": "region", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.2.34" + "version": "v1.4.3" }, { "name": "deploy-arch-ibm-scc-workload-protection", @@ -459,11 +453,16 @@ "dependency_input": "region", "version_input": "region", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.12.3" + "version": "v1.14.0" }, { "name": "deploy-arch-ibm-secrets-manager", @@ -488,11 +487,16 @@ "reference_version": true, "dependency_input": "service_plan", "version_input": "secrets_manager_service_plan" + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": false, - "version": "v2.10.0" + "version": "v2.11.0" } ], "dependency_version_2": true, @@ -555,13 +559,6 @@ ], "notes": "[Optional] Required if KMS encryption is enabled to encrypt the payload data." }, - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Administrator" - ], - "service_name": "iam-identity", - "notes": "[Optional] Required if Cloud automation for account configuration is enabled." - }, { "role_crns": [ "crn:v1:bluemix:public:iam::::serviceRole:Manager", @@ -780,31 +777,6 @@ } ], "dependencies": [ - { - "name": "deploy-arch-ibm-account-infra-base", - "description": "Cloud automation for Account Configuration organizes your IBM Cloud account with a ready-made set of resource groups by default and when you enable the \"with Account Settings\" option, it also applies baseline security and governance settings. ", - "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3", - "flavors": [ - "resource-group-only", - "resource-groups-with-account-settings" - ], - "default_flavor": "resource-group-only", - "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global", - "input_mapping": [ - { - "dependency_output": "workload_resource_group_name", - "version_input": "existing_resource_group_name" - }, - { - "dependency_input": "prefix", - "version_input": "prefix", - "reference_version": true - } - ], - "optional": true, - "on_by_default": false, - "version": "v3.0.23" - }, { "name": "deploy-arch-ibm-kms", "description": "Enable Cloud Automation for Key Protect when you want services to use your own managed encryption keys for encrypting the payload data. If disabled, it will fall back on IBM Cloud's default service-managed encryption.", @@ -868,11 +840,16 @@ "dependency_input": "enable_platform_metrics", "version_input": "enable_platform_metrics", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.7.2" + "version": "v1.9.0" }, { "name": "deploy-arch-ibm-cloud-logs", @@ -897,11 +874,16 @@ "dependency_input": "logs_routing_tenant_regions", "version_input": "logs_routing_tenant_regions", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.6.28" + "version": "v1.9.0" }, { "name": "deploy-arch-ibm-activity-tracker", @@ -921,11 +903,16 @@ "dependency_input": "region", "version_input": "region", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v1.2.34" + "version": "v1.4.3" }, { "name": "deploy-arch-ibm-secrets-manager", @@ -945,11 +932,16 @@ { "dependency_output": "secrets_manager_crn", "version_input": "existing_secrets_manager_instance_crn" + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, "on_by_default": true, - "version": "v2.10.0" + "version": "v2.11.0" } ], "dependency_version_2": true, diff --git a/solutions/quickstart/variables.tf b/solutions/quickstart/variables.tf index 7570a4dd..dd08e906 100644 --- a/solutions/quickstart/variables.tf +++ b/solutions/quickstart/variables.tf @@ -21,8 +21,8 @@ variable "provider_visibility" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used." - default = null + description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." + default = "Default" } variable "region" { diff --git a/solutions/security-enforced/variables.tf b/solutions/security-enforced/variables.tf index fe144dda..00a3d3a8 100644 --- a/solutions/security-enforced/variables.tf +++ b/solutions/security-enforced/variables.tf @@ -10,8 +10,8 @@ variable "ibmcloud_api_key" { variable "existing_resource_group_name" { type = string - description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used." - default = null + description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." + default = "Default" } variable "region" { From 16f5069f3ce558faada590a64de9897ce3d4ad3b Mon Sep 17 00:00:00 2001 From: whoffler Date: Mon, 20 Oct 2025 15:30:34 +0100 Subject: [PATCH 2/3] update prefix --- ibm_catalog.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 13359822..e1a5d579 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -632,7 +632,18 @@ }, { "key": "prefix", - "required": true + "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, + "value_constraints": [ + { + "type": "regex", + "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.", + "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$" + } + ] }, { "key": "existing_resource_group_name", @@ -646,7 +657,7 @@ } }, "default_value": "Default", - "description": "The name of an existing resource group to provision the resources." + "description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group." }, { "key": "event_streams_name" From 509b547db2c2a7076b288c125c43aecdbd550270 Mon Sep 17 00:00:00 2001 From: whoffler Date: Mon, 20 Oct 2025 16:12:59 +0100 Subject: [PATCH 3/3] update --- tests/go.mod | 2 +- tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/go.mod b/tests/go.mod index b4634015..9dda1445 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -7,7 +7,7 @@ toolchain go1.25.3 require ( github.com/IBM/go-sdk-core v1.1.0 github.com/stretchr/testify v1.11.1 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.16 ) require ( diff --git a/tests/go.sum b/tests/go.sum index f6a55df3..28a2f51f 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -303,8 +303,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15 h1:vTLAB97MQ45Hfla67pIWYnb/Z5YuEzRLjQ6WN4GHWgI= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.15/go.mod h1:g0kmBhFk6pVoTmse42tMNCSNktiOYJHAda/pAzOIxco= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.16 h1:E/tVpWNkcq/W1G6pk4WgSGyUa+RHeyiZQGsi0UHewek= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.16/go.mod h1:g0kmBhFk6pVoTmse42tMNCSNktiOYJHAda/pAzOIxco= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw= github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=