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

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

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
48d4ae7
feat: remove Account Config DA from customize DA flow, add default va…
ocofaigh Oct 17, 2025
d20caf8
test update
ocofaigh Oct 17, 2025
7620431
rg update
ocofaigh Oct 17, 2025
9e73191
update deps
ocofaigh Oct 17, 2025
3262992
Merge branch 'main' into acc
ocofaigh Oct 19, 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
77 changes: 37 additions & 40 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
{
"key": "prefix",
"required": true,
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand Down Expand Up @@ -191,9 +195,7 @@
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources."
}
},
{
"key": "app_config_name"
Expand Down Expand Up @@ -386,14 +388,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 to create trusted profile for App Configuration aggregator."
},
{
"role_crns": [
Expand Down Expand Up @@ -471,36 +473,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
},
{
"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-cloud-logs",
"description": "Configure IBM Cloud Logs to analyse the platform logs.",
Expand All @@ -509,7 +481,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 @@ -518,6 +490,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 @@ -534,7 +511,7 @@
"name": "deploy-arch-ibm-cloud-monitoring",
"description": "Configure IBM Cloud Monitoring to collect the platform metrics.",
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
"version": "v1.7.2",
"version": "v1.9.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -552,6 +529,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 @@ -563,7 +545,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.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -576,6 +558,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 @@ -587,7 +574,7 @@
"name": "deploy-arch-ibm-kms",
"description": "Enables managed encryption with your own keys via IBM Cloud Key Protect. If disabled, services will default to IBM-managed encryption.",
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
"version": "v5.1.27",
"version": "v5.4.0",
"flavors": [
"fully-configurable"
],
Expand Down Expand Up @@ -617,6 +604,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 @@ -628,7 +620,7 @@
"name": "deploy-arch-ibm-event-notifications",
"description": "Configure Event Notifications to notify any configuration change events.",
"id": "c7ac3ee6-4f48-4236-b974-b0cd8c624a46-global",
"version": "v2.7.2",
"version": "v2.10.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -653,6 +645,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
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 @@ -22,8 +22,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 "prefix" {
Expand Down
26 changes: 18 additions & 8 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,11 +260,28 @@ func TestAddonsDefaultConfiguration(t *testing.T) {
"deploy-arch-ibm-apprapp",
"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)
}
Expand All @@ -284,18 +301,11 @@ func TestAddonsWithDisabledDAs(t *testing.T) {
"deploy-arch-ibm-apprapp",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"region": validRegions[rand.Intn(len(validRegions))],
},
)

options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{
// Opt into Account Config DA
{
OfferingName: "deploy-arch-ibm-account-infra-base",
OfferingFlavor: "resource-groups-with-account-settings",
Enabled: core.BoolPtr(true),
},
// Disable AT, ICL, Mon, EN and KMS
{
OfferingName: "deploy-arch-ibm-activity-tracker",
Expand Down