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 #332

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
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 #332

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
0260516
feat: remove Account Config DA from customize DA flow, add default va…
ocofaigh Oct 17, 2025
c7b9a97
RG update
ocofaigh Oct 17, 2025
d516ff8
Merge branch 'main' of github.com:terraform-ibm-modules/terraform-ibm…
ocofaigh Oct 20, 2025
a8fed75
bump deps
ocofaigh Oct 20, 2025
e2cb98d
bump app config
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
70 changes: 31 additions & 39 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,36 +51,6 @@
"install_type": "fullstack",
"dependency_version_2": true,
"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": "security_resource_group_name",
"version_input": "existing_resource_group_name"
},
{
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "provider_visibility",
"version_input": "provider_visibility",
"reference_version": true
}
],
"optional": true,
"on_by_default": false,
"version": "v3.0.23"
},
{
"name": "deploy-arch-ibm-apprapp",
"description": "Set up App Configuration to enable Cloud Security Posture Management (CSPM).",
Expand All @@ -89,7 +59,7 @@
],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"id": "045c1169-d15a-4046-ae81-aa3d3348421f-global",
"version": "v1.11.7",
"version": "v1.13.1",
"optional": false,
"input_mapping": [
{
Expand All @@ -102,6 +72,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "app_config_plan",
"version_input": "app_config_plan",
Expand Down Expand Up @@ -142,7 +117,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 @@ -151,6 +126,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 @@ -167,7 +147,7 @@
"name": "deploy-arch-ibm-cloud-monitoring",
"description": "Configure IBM Cloud Monitoring to collect platform metrics.",
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
"version": "v1.7.2",
"version": "v1.9.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -189,6 +169,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 @@ -200,7 +185,7 @@
"name": "deploy-arch-ibm-activity-tracker",
"description": "Configure Activity Tracker Event Routing to route the auditing events.",
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
"version": "v1.2.34",
"version": "v1.4.3",
"flavors": [
"fully-configurable"
],
Expand All @@ -213,6 +198,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 @@ -229,6 +219,10 @@
{
"key": "prefix",
"required": true,
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand Down Expand Up @@ -367,9 +361,7 @@
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources."
}
},
{
"key": "enterprise_id",
Expand Down Expand Up @@ -517,14 +509,14 @@
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Account Management services",
"notes": "[Optional] Required to deploy Cloud automation for account configuration which creates resource group and to create trusted profile for App Configuration aggregator."
"notes": "[Optional] Required to create trusted profile for App Configuration aggregator."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Identity and Access enabled services",
"notes": "[Optional] Required to deploy Cloud automation for account configuration which creates foundational IBM Cloud account resources, like resource group with account settings and to create trusted profile for App Configuration aggregator."
"notes": "[Optional] Required to create trusted profile for App Configuration aggregator."
},
{
"role_crns": [
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 @@ -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 "existing_monitoring_crn" {
Expand Down
19 changes: 18 additions & 1 deletion tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,28 @@ func TestAddonDefaultConfiguration(t *testing.T) {
"deploy-arch-ibm-scc-workload-protection",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"region": validRegions[rand.Intn(len(validRegions))],
},
)

options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{
// // Disable target / route creation to help prevent hitting quota in account
{
OfferingName: "deploy-arch-ibm-cloud-monitoring",
OfferingFlavor: "fully-configurable",
Inputs: map[string]interface{}{
"enable_metrics_routing_to_cloud_monitoring": false,
},
},
{
OfferingName: "deploy-arch-ibm-activity-tracker",
OfferingFlavor: "fully-configurable",
Inputs: map[string]interface{}{
"enable_activity_tracker_event_routing_to_cloud_logs": false,
},
},
}

err := options.RunAddonTest()
require.NoError(t, err)
}