From 8c59dccbbed6573979e31305125cbe59fc5364b6 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Mon, 13 Oct 2025 13:46:16 +0100 Subject: [PATCH 1/2] remove account configuration dependencey --- ibm_catalog.json | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/ibm_catalog.json b/ibm_catalog.json index 6a526f8..8d1c2c5 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -229,13 +229,6 @@ } ], "iam_permissions": [ - { - "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:Viewer" @@ -248,7 +241,7 @@ "crn:v1:bluemix:public:iam::::role:Administrator" ], "service_name": "All Identity and Access enabled services", - "notes": "Required to create an IAM authorization policy between Metrics Router and Cloud Monitoring, and to set up new resource groups with account settings when enabling Account Configuration integration." + "notes": "Required to create an IAM authorization policy between Metrics Router and Cloud Monitoring." }, { "role_crns": [ @@ -277,34 +270,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.", - "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global", - "version": "v3.0.23", - "flavors": [ - "resource-group-only", - "resource-groups-with-account-settings" - ], - "default_flavor": "resource-group-only", - "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3", - "optional": true, - "on_by_default": false, - "input_mapping": [ - { - "dependency_input": "prefix", - "version_input": "prefix", - "reference_version": true - }, - { - "dependency_output": "observability_resource_group_name", - "version_input": "existing_resource_group_name" - } - ] - } - ], - "dependency_version_2": true, "terraform_version": "1.10.5" }, { From 403e980e7b247a330614df533c4c2e448727f6ee Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Mon, 13 Oct 2025 15:09:23 +0100 Subject: [PATCH 2/2] remove account config test --- tests/pr_test.go | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 258b72c..8937db9 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -5,11 +5,7 @@ import ( "math/rand" "testing" - "github.com/IBM/go-sdk-core/v5/core" "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo" - "github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testaddons" "github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper" "github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testschematic" ) @@ -137,37 +133,3 @@ func TestRunAccountSettingsDA(t *testing.T) { err := options.RunSchematicTest() assert.Nil(t, err, "This should not have errored") } - -// This DA has no "on-by-default" dependencies defined so hence testing with Account Config DA enabled -func TestAddonWithAccountConfig(t *testing.T) { - t.Parallel() - - options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{ - Testing: t, - Prefix: "icm-addon", - ResourceGroup: resourceGroup, - QuietMode: true, // Suppress logs except on failure - }) - - options.AddonConfig = cloudinfo.NewAddonConfigTerraform( - options.Prefix, - "deploy-arch-ibm-cloud-monitoring", - "fully-configurable", - map[string]interface{}{ - "prefix": options.Prefix, - "region": validRegions[rand.Intn(len(validRegions))], - }, - ) - - // Enable Account Config DA - options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{ - { - OfferingName: "deploy-arch-ibm-account-infra-base", - OfferingFlavor: "resource-groups-with-account-settings", - Enabled: core.BoolPtr(true), // explicitly enable this dependency - }, - } - - err := options.RunAddonTest() - require.NoError(t, err) -}