Skip to content

feat: remove Account Config DA from customize DA flow, add default value for prefix using random string generator and update logic that handles default resource group lookup #820

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 5 commits into from
Oct 20, 2025
+56 −59
Merged

feat: remove Account Config DA from customize DA flow, add default value for prefix using random string generator and update logic that handles default resource group lookup #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96207e4
feat: remove Account Config DA from customize DA flow, add default va…
ocofaigh Oct 17, 2025
ccec736
update RG
ocofaigh Oct 17, 2025
a17c085
bump deps
ocofaigh Oct 20, 2025
791e816
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm…
ocofaigh Oct 20, 2025
221e1a5
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm…
ocofaigh 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
106 changes: 52 additions & 54 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,12 @@
"service_name": "Resource group only",
"notes": "Viewer access is required in the resource group you want to provision in."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Account Management services",
"notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Identity and Access enabled services",
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
},
{
"role_crns": [
Expand Down Expand Up @@ -559,8 +552,6 @@
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
Expand Down Expand Up @@ -1018,7 +1009,7 @@
"name": "deploy-arch-ibm-slz-vpc",
"description": "Configure the VPC and subnets required to deploy your OpenShift cluster.",
"id": "9fc0fa64-27af-4fed-9dce-47b3640ba739-global",
"version": "v8.5.0",
"version": "v8.7.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -1031,6 +1022,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
Expand All @@ -1052,36 +1048,11 @@
}
]
},
{
"name": "deploy-arch-ibm-account-infra-base",
"description": "Organize your IBM Cloud account using preconfigured groups and access policies to manage resource group usage. Optionally, extend security controls with IAM Account Settings validation.",
"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": "Integrate IBM Key Protect to manage encryption keys for your cluster, securing persistent volumes and supporting compliance. If unselected, encryption is still applied using IBM-managed keys.",
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
"version": "v5.1.27",
"version": "v5.4.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -1102,6 +1073,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
Expand All @@ -1113,7 +1089,7 @@
"name": "deploy-arch-ibm-cos",
"description": "Set up a Cloud Object Storage (COS) instance and bucket to serve as internal registry storage for your OpenShift cluster.",
"id": "68921490-2778-4930-ac6d-bae7be6cd958-global",
"version": "v10.2.21",
"version": "v10.5.0",
"flavors": [
"instance"
],
Expand All @@ -1129,6 +1105,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -1140,7 +1121,7 @@
"fully-configurable"
],
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
"version": "v1.6.28",
"version": "v1.9.0",
"optional": true,
"on_by_default": true,
"input_mapping": [
Expand All @@ -1149,6 +1130,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
Expand All @@ -1175,7 +1161,7 @@
"name": "deploy-arch-ibm-cloud-monitoring",
"description": "Set up a Cloud Monitoring instance to collect platform metrics.",
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
"version": "v1.7.2",
"version": "v1.9.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -1189,18 +1175,13 @@
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "existing_cos_instance_crn",
"version_input": "existing_cos_instance_crn",
"reference_version": true
},
{
"dependency_input": "existing_kms_instance_crn",
"version_input": "existing_kms_instance_crn",
"dependency_input": "region",
"version_input": "region",
"reference_version": true
},
{
Expand All @@ -1214,7 +1195,7 @@
"name": "deploy-arch-ibm-activity-tracker",
"description": "Configure Activity Tracker Event Routing to direct auditing events appropriately.",
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
"version": "v1.2.34",
"version": "v1.4.3",
"flavors": [
"fully-configurable"
],
Expand All @@ -1232,6 +1213,11 @@
"version_input": "region",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "existing_cos_instance_crn",
"version_input": "existing_cos_instance_crn",
Expand All @@ -1248,7 +1234,7 @@
"name": "deploy-arch-ibm-secrets-manager",
"description": "Provision a Secrets Manager instance to securely store and manage sensitive credentials—such as certificates—used by services integrated with your cluster.",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"version": "v2.10.0",
"version": "v2.11.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -1261,6 +1247,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
Expand Down Expand Up @@ -1290,7 +1281,7 @@
"name": "deploy-arch-ibm-scc-workload-protection",
"description": "Integrate with Workload Protection to monitor and manage your cluster’s security posture, helping detect misconfigurations and enforce compliance.",
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
"version": "v1.12.3",
"version": "v1.14.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -1303,6 +1294,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
Expand Down Expand Up @@ -1390,8 +1386,6 @@
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
Expand All @@ -1404,6 +1398,10 @@
{
"key": "prefix",
"required": true,
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand Down
4 changes: 2 additions & 2 deletions solutions/fully-configurable/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ variable "prefix" {

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 "cluster_resource_tags" {
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 @@ -7,8 +7,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 "provider_visibility" {
Expand Down
1 change: 0 additions & 1 deletion tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) {
"deploy-arch-ibm-slz-ocp",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"region": "eu-de",
},
)
Expand Down