diff --git a/ibm_catalog.json b/ibm_catalog.json index fbed93a..004bd42 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -67,6 +67,10 @@ { "key": "prefix", "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, "value_constraints": [ { "type": "regex", @@ -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" @@ -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": [ @@ -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.", @@ -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": [ @@ -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", @@ -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" ], @@ -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", @@ -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" ], @@ -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", @@ -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" ], @@ -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", @@ -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" ], @@ -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", diff --git a/solutions/fully-configurable/variables.tf b/solutions/fully-configurable/variables.tf index ec7d6b5..7a119e3 100644 --- a/solutions/fully-configurable/variables.tf +++ b/solutions/fully-configurable/variables.tf @@ -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" { diff --git a/tests/pr_test.go b/tests/pr_test.go index 4734004..059127b 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -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) } @@ -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",