fix: Align terraform input values with catalog manifest values and update tests (#367)

Author: ocofaigh

cra-config.yaml

@@ -5,7 +5,7 @@ CRA_TARGETS:
     CRA_IGNORE_RULES_FILE: "cra-tf-validate-ignore-rules.json"
     PROFILE_ID: "fe96bd4d-9b37-40f2-b39f-a62760e326a3"  # SCC profile ID (currently set to 'IBM Cloud Framework for Financial Services' '1.7.0' profile).
     CRA_ENVIRONMENT_VARIABLES:
-      TF_VAR_resource_group_name: "test"
+      TF_VAR_resource_group_name: "Default"
       TF_VAR_prefix: "test"
       TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
       TF_VAR_provider_visibility: "public"

ibm_catalog.json

@@ -119,7 +119,6 @@
               "key": "resource_group_name",
               "display_name": "resource_group",
               "required": false,
-              "default_value": "Default",
               "custom_config": {
                 "type": "resource_group",
                 "grouping": "deployment",
@@ -131,8 +130,7 @@
             },
             {
               "key": "use_existing_resource_group",
-              "hidden": true,
-              "default_value": true
+              "hidden": true
             },
             {
               "custom_config": {

solutions/instances/catalogValidationValues.json.template

@@ -1,6 +1,6 @@
 {
   "ibmcloud_api_key": $VALIDATION_APIKEY,
-  "resource_group_name": $PREFIX,
+  "resource_group_name": "geretain-test-observability-instances",
   "existing_kms_instance_crn": $HPCS_US_SOUTH_CRN,
   "region": "us-south",
   "prefix": $PREFIX,

solutions/instances/variables.tf

@@ -24,13 +24,14 @@ variable "ibmcloud_cos_api_key" {
 
 variable "use_existing_resource_group" {
   type        = bool
-  description = "Whether to use an existing resource group."
-  default     = false
+  description = "Whether to use an existing resource group. Use the `resource_group_name` input to define the group."
+  default     = true
 }
 
 variable "resource_group_name" {
   type        = string
-  description = "The name of a new or existing resource group to provision resources in."
+  description = "The name of the resource group to provision resources in."
+  default     = "Default"
 }
 
 variable "cos_resource_group_name" {

tests/pr_test.go

@@ -89,7 +89,7 @@ func TestInstancesInSchematics(t *testing.T) {
 
 	options.TerraformVars = []testschematic.TestSchematicTerraformVar{
 		{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
-		{Name: "resource_group_name", Value: options.Prefix, DataType: "string"},
+		{Name: "resource_group_name", Value: resourceGroup, DataType: "string"},
 		{Name: "existing_kms_instance_crn", Value: permanentResources["hpcs_south_crn"], DataType: "string"},
 		{Name: "cos_region", Value: region, DataType: "string"},
 		{Name: "cos_instance_tags", Value: options.Tags, DataType: "list(string)"},
@@ -123,7 +123,7 @@ func TestRunUpgradeSolutionInstances(t *testing.T) {
 
 	options.TerraformVars = map[string]interface{}{
 		"prefix":                              options.Prefix,
-		"resource_group_name":                 options.Prefix,
+		"resource_group_name":                 resourceGroup,
 		"cos_instance_access_tags":            permanentResources["accessTags"],
 		"existing_kms_instance_crn":           permanentResources["hpcs_south_crn"],
 		"kms_endpoint_type":                   "public",
@@ -313,7 +313,6 @@ func TestRunExistingResourcesInstancesSchematics(t *testing.T) {
 			{Name: "region", Value: region, DataType: "string"},
 			{Name: "cos_region", Value: region, DataType: "string"},
 			{Name: "resource_group_name", Value: terraform.Output(t, existingTerraformOptions, "resource_group_name"), DataType: "string"},
-			{Name: "use_existing_resource_group", Value: true, DataType: "bool"},
 			{Name: "existing_cloud_logs_data_bucket_crn", Value: terraform.Output(t, existingTerraformOptions, "data_bucket_crn"), DataType: "string"},
 			{Name: "existing_at_cos_target_bucket_name", Value: terraform.Output(t, existingTerraformOptions, "bucket_name_at"), DataType: "string"},
 			{Name: "existing_at_cos_target_bucket_endpoint", Value: terraform.Output(t, existingTerraformOptions, "bucket_endpoint_at"), DataType: "string"},
@@ -357,7 +356,6 @@ func TestRunExistingResourcesInstancesSchematics(t *testing.T) {
 			{Name: "cos_region", Value: region, DataType: "string"},
 			{Name: "prefix", Value: options2.Prefix, DataType: "string"},
 			{Name: "resource_group_name", Value: terraform.Output(t, existingTerraformOptions, "resource_group_name"), DataType: "string"},
-			{Name: "use_existing_resource_group", Value: true, DataType: "bool"},
 			{Name: "kms_endpoint_type", Value: "private", DataType: "string"},
 			{Name: "existing_cos_instance_crn", Value: terraform.Output(t, existingTerraformOptions, "cos_crn"), DataType: "string"},
 			{Name: "management_endpoint_type_for_bucket", Value: "private", DataType: "string"},