Skip to content

update dependencies and prefix input, remove account infra dep #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 21, 2025
Merged

update dependencies and prefix input, remove account infra dep #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2423d0c
update dependencies and prefix input, remove account infra dep
whoffler Oct 20, 2025
16f5069
update prefix
whoffler Oct 20, 2025
509b547
update
whoffler Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 80 additions & 77 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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.",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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,
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -635,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",
Expand All @@ -649,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"
Expand Down Expand Up @@ -780,31 +788,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.",
Expand Down Expand Up @@ -868,11 +851,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",
Expand All @@ -897,11 +885,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",
Expand All @@ -921,11 +914,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",
Expand All @@ -945,11 +943,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,
Expand Down
4 changes: 2 additions & 2 deletions solutions/quickstart/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions solutions/security-enforced/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
2 changes: 1 addition & 1 deletion tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down