Skip to content

Remove Account configuration dependency #108

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 2 commits into from
Oct 13, 2025
Merged

Remove Account configuration dependency #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c59dcc
remove account configuration dependencey
daniel-butler-irl Oct 13, 2025
403e980
remove account config test
daniel-butler-irl Oct 13, 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
37 changes: 1 addition & 36 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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": [
Expand Down Expand Up @@ -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"
},
{
Expand Down
38 changes: 0 additions & 38 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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)
}