Skip to content

feat: added add-ons config and added add-ons test #610

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+387 −52
Open

feat: added add-ons config and added add-ons test #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bfaa283
feat: added add-ons config
Aditya-ranjan-16 Jul 4, 2025
56b071f
Merge branch 'main' into add-ons
Aditya-ranjan-16 Jul 14, 2025
39645c7
updte tests
Aditya-ranjan-16 Jul 15, 2025
b46ffcd
updated tests
Aditya-ranjan-16 Jul 17, 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
210 changes: 206 additions & 4 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@
]
},
"iam_permissions": [
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Account Management services",
"notes": "[Optional] Required when setting up foundational IBM Cloud account components such as IAM settings, trusted profiles, access groups, and resource groups."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Viewer"
Expand All @@ -77,13 +84,15 @@
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "kms",
"notes": "[Optional] Editor access is required to create keys. It is only required when using Key Protect for encryption."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "hs-crypto",
Expand Down Expand Up @@ -376,7 +385,99 @@
{
"key": "existing_redis_instance_crn"
}
]
],
"dependencies": [
{
"name": "deploy-arch-ibm-account-infra-base",
"description": "Cloud automation for Account Configuration organizes your IBM Cloud account with a ready-made set of resource groups by default and when you enable the \"with Account Settings\" option, it also applies baseline security and governance settings. ",
"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_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_output": "workload_resource_group_name",
"version_input": "existing_resource_group_name"
}
],
"optional": true,
"on_by_default": false,
"version": "v3.0.7"
},
{
"name": "deploy-arch-ibm-kms",
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
"description": "Enable Cloud Automation for Key Protect when you want services to use your own managed encryption keys. If disabled, it will fall back on IBM Cloud's default service-managed encryption.",
"flavors": [
"fully-configurable"
],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"input_mapping": [
{
"dependency_output": "kms_instance_crn",
"version_input": "existing_kms_instance_crn"
},
{
"version_input": "kms_encryption_enabled",
"value": true
},
{
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
"reference_version": true
}
],
"optional": true,
"on_by_default": true,
"version": "v5.1.4"
},
{
"name": "deploy-arch-ibm-secrets-manager",
"description": "Enable to provisions and configures IBM Cloud Secrets Manager for securely storing service credentials.",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"flavors": ["fully-configurable"],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"default_flavor": "fully-configurable",
"input_mapping": [
{
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "service_plan",
"value": "standard"
},
{
"dependency_output": "secrets_manager_crn",
"version_input": "existing_secrets_manager_instance_crn"
},
{
"dependency_input": "region",
"version_input": "region",
"reference_version": true
}
],
"optional": true,
"on_by_default": true,
"version": "v2.6.1"
}
],
"dependency_version_2": true,
"terraform_version": "1.10.5"
},
{
"label": "Security-enforced",
Expand All @@ -394,6 +495,13 @@
]
},
"iam_permissions": [
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "All Account Management services",
"notes": "[Optional] Required when setting up foundational IBM Cloud account components such as IAM settings, trusted profiles, access groups, and resource groups."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Viewer"
Expand All @@ -407,15 +515,17 @@
],
"service_name": "databases-for-redis"
},
{
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "kms",
"notes": "[Optional] Editor access is required to create keys. It is required only if KMS encryption is enabled."
"notes": "[Optional] Editor access is required to create keys. It is only required when using Key Protect for encryption."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "hs-crypto",
Expand Down Expand Up @@ -640,7 +750,99 @@
{
"key": "existing_redis_instance_crn"
}
]
],
"dependencies": [
{
"name": "deploy-arch-ibm-account-infra-base",
"description": "Cloud automation for Account Configuration organizes your IBM Cloud account with a ready-made set of resource groups by default and when you enable the \"with Account Settings\" option, it also applies baseline security and governance settings. ",
"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_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_output": "workload_resource_group_name",
"version_input": "existing_resource_group_name"
}
],
"optional": true,
"on_by_default": false,
"version": "v3.0.7"
},
{
"name": "deploy-arch-ibm-kms",
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
"description": "Enable Cloud Automation for Key Protect when you want services to use your own managed encryption keys. If disabled, it will fall back on IBM Cloud's default service-managed encryption.",
"flavors": [
"fully-configurable"
],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"input_mapping": [
{
"dependency_output": "kms_instance_crn",
"version_input": "existing_kms_instance_crn"
},
{
"version_input": "kms_encryption_enabled",
"value": true
},
{
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "region",
"reference_version": true
}
],
"optional": true,
"on_by_default": true,
"version": "v5.1.4"
},
{
"name": "deploy-arch-ibm-secrets-manager",
"description": "Enable to provisions and configures IBM Cloud Secrets Manager for securely storing service credentials.",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"flavors": ["fully-configurable"],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"default_flavor": "fully-configurable",
"input_mapping": [
{
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "service_plan",
"value": "standard"
},
{
"dependency_output": "secrets_manager_crn",
"version_input": "existing_secrets_manager_instance_crn"
},
{
"dependency_input": "region",
"version_input": "region",
"reference_version": true
}
],
"optional": true,
"on_by_default": true,
"version": "v2.6.1"
}
],
"dependency_version_2": true,
"terraform_version": "1.10.5"
}
]
}
Expand Down
28 changes: 14 additions & 14 deletions tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ go 1.23.0
toolchain go1.24.3

require (
github.com/gruntwork-io/terratest v0.49.0
github.com/gruntwork-io/terratest v0.50.0
github.com/IBM/go-sdk-core/v5 v5.20.1
github.com/stretchr/testify v1.10.0
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.51.1
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.55.1
)

require (
dario.cat/mergo v1.0.0 // indirect
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.11.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.7.1 // indirect
github.com/IBM/go-sdk-core/v5 v5.19.1 // indirect
github.com/IBM/platform-services-go-sdk v0.82.0 // indirect
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
github.com/IBM/platform-services-go-sdk v0.83.2 // indirect
github.com/IBM/project-go-sdk v0.3.6 // indirect
github.com/IBM/schematics-go-sdk v0.4.0 // indirect
github.com/IBM/vpc-go-sdk v1.0.2 // indirect
Expand All @@ -30,11 +30,11 @@ require (
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.6.2 // indirect
github.com/go-git/go-git/v5 v5.16.0 // indirect
github.com/go-git/go-git/v5 v5.16.2 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.21.5 // indirect
Expand Down Expand Up @@ -84,17 +84,17 @@ require (
github.com/ulikunitz/xz v0.5.11 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
github.com/zclconf/go-cty v1.16.2 // indirect
go.mongodb.org/mongo-driver v1.17.2 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
go.opentelemetry.io/otel v1.29.0 // indirect
go.opentelemetry.io/otel/metric v1.29.0 // indirect
go.opentelemetry.io/otel/trace v1.29.0 // indirect
golang.org/x/crypto v0.38.0 // indirect
golang.org/x/mod v0.18.0 // indirect
golang.org/x/net v0.39.0 // indirect
golang.org/x/sync v0.14.0 // indirect
golang.org/x/crypto v0.39.0 // indirect
golang.org/x/mod v0.25.0 // indirect
golang.org/x/net v0.41.0 // indirect
golang.org/x/sync v0.15.0 // indirect
golang.org/x/sys v0.33.0 // indirect
golang.org/x/text v0.25.0 // indirect
golang.org/x/tools v0.22.0 // indirect
golang.org/x/text v0.26.0 // indirect
golang.org/x/tools v0.33.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading