diff --git a/ibm_catalog.json b/ibm_catalog.json index 72eb1a52..dfa0648c 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -101,6 +101,10 @@ }, { "key": "prefix", + "default_value": "dev", + "random_string": { + "length": 4 + }, "value_constraints": [ { "type": "regex", @@ -133,9 +137,7 @@ "config_constraints": { "identifier": "rg_name" } - }, - "default_value": "Default", - "description": "The name of an existing resource group to provision the resources." + } }, { "key": "instance_name" @@ -298,6 +300,10 @@ { "key": "prefix", "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, "value_constraints": [ { "type": "regex", @@ -306,6 +312,21 @@ } ] }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources.", + "virtual": true + }, { "key": "cross_region_location", "required": true, @@ -590,6 +611,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] }, @@ -614,6 +640,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, @@ -645,6 +676,11 @@ "dependency_input": "enable_platform_metrics", "version_input": "enable_platform_metrics", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] } @@ -717,6 +753,10 @@ }, { "key": "prefix", + "default_value": "dev", + "random_string": { + "length": 4 + }, "required": true, "value_constraints": [ { @@ -726,6 +766,21 @@ } ] }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources.", + "virtual": true + }, { "key": "cross_region_location", "required": true, @@ -971,6 +1026,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] }, @@ -995,6 +1055,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, @@ -1026,6 +1091,11 @@ "dependency_input": "enable_platform_metrics", "version_input": "enable_platform_metrics", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] } @@ -1113,6 +1183,10 @@ }, { "key": "prefix", + "default_value": "dev", + "random_string": { + "length": 4 + }, "required": true, "value_constraints": [ { @@ -1122,6 +1196,21 @@ } ] }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources.", + "virtual": true + }, { "key": "region", "required": true, @@ -1439,6 +1528,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] }, @@ -1462,6 +1556,11 @@ "version_input": "kms_encryption_enabled", "value": true }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true + }, { "dependency_input": "kms_endpoint_type", "version_input": "kms_endpoint_type", @@ -1495,6 +1594,11 @@ "dependency_output": "cloud_monitoring_crn", "version_input": "monitoring_crn" }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true + }, { "dependency_input": "prefix", "version_input": "prefix", @@ -1576,6 +1680,10 @@ }, { "key": "prefix", + "default_value": "dev", + "random_string": { + "length": 4 + }, "required": true, "value_constraints": [ { @@ -1585,6 +1693,21 @@ } ] }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources.", + "virtual": true + }, { "key": "region", "required": true, @@ -1856,6 +1979,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] }, @@ -1880,6 +2008,11 @@ "dependency_input": "prefix", "version_input": "prefix", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ], "optional": true, @@ -1911,6 +2044,11 @@ "dependency_input": "enable_platform_metrics", "version_input": "enable_platform_metrics", "reference_version": true + }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true } ] } diff --git a/solutions/instance/main.tf b/solutions/instance/main.tf index 63287629..0aa601d8 100644 --- a/solutions/instance/main.tf +++ b/solutions/instance/main.tf @@ -4,7 +4,7 @@ module "resource_group" { source = "terraform-ibm-modules/resource-group/ibm" - version = "1.3.0" + version = "1.4.0" existing_resource_group_name = var.existing_resource_group_name } diff --git a/solutions/instance/variables.tf b/solutions/instance/variables.tf index 69b97c77..fef09216 100644 --- a/solutions/instance/variables.tf +++ b/solutions/instance/variables.tf @@ -33,8 +33,8 @@ variable "prefix" { 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." + default = "Default" } variable "instance_name" { diff --git a/tests/pr_test.go b/tests/pr_test.go index 62412bd5..c7caf96a 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -642,8 +642,8 @@ func TestRegionalBucketAddonDefault(t *testing.T) { "deploy-arch-ibm-cos", "regional-bucket-fully-configurable", map[string]interface{}{ - "prefix": options.Prefix, - "bucket_name": "test", + "bucket_name": "test", + "existing_resource_group_name": resourceGroup, }, ) @@ -666,8 +666,8 @@ func TestCrossRegionalBucketAddonDefault(t *testing.T) { "deploy-arch-ibm-cos", "cross-regional-bucket-fully-configurable", map[string]interface{}{ - "prefix": options.Prefix, - "bucket_name": "test", + "bucket_name": "test", + "existing_resource_group_name": resourceGroup, }, )