fix: bug fix catalog (#35)

* fix: bug fix catalog

* fix: bug fix catalog

* fix: bug fix catalog

* fix: bug fix catalog

Author: rajatagarwal-ibm

solutions/banking/catalogValidationValues.json.template

@@ -1 +1,3 @@
-{}
+{
+  "ibmcloud_api_key": $VALIDATION_APIKEY
+}

tests/pr_test.go

@@ -20,8 +20,6 @@ import (
 const bankingSolutionsDir = "solutions/banking"
 const region = "us-south" // Binding all the resources to the us-south location.
 
-const resourceGroup = "geretain-test-resources"
-
 func TestRunBankingSolutions(t *testing.T) {
 	t.Parallel()
 
@@ -42,9 +40,8 @@ func TestRunBankingSolutions(t *testing.T) {
 	existingTerraformOptions := terraform.WithDefaultRetryableErrors(t, &terraform.Options{
 		TerraformDir: tempTerraformDir,
 		Vars: map[string]interface{}{
-			"prefix":         prefix,
-			"region":         region,
-			"resource_group": resourceGroup,
+			"prefix": prefix,
+			"region": region,
 		},
 		// Set Upgrade to true to ensure latest version of providers and modules are used by terratest.
 		// This is the same as setting the -upgrade=true flag with terraform.
@@ -83,7 +80,7 @@ func TestRunBankingSolutions(t *testing.T) {
 				"watson_machine_learning_instance_resource_name": terraform.Output(t, existingTerraformOptions, "watson_machine_learning_instance_resource_name"),
 				"secrets_manager_guid":                           terraform.Output(t, existingTerraformOptions, "secrets_manager_guid"),
 				"secrets_manager_crn":                            terraform.Output(t, existingTerraformOptions, "secrets_manager_crn"),
-				"signing_key":                                    terraform.Output(t, existingTerraformOptions, "signing_key_payload"),
+				"signing_key":                                    terraform.Output(t, existingTerraformOptions, "signing_key"),
 			},
 		})
 

tests/resources/existing-resources/outputs.tf

@@ -58,7 +58,7 @@ output "secrets_manager_crn" {
   description = "CRN of the Secrets Manager instance."
 }
 
-output "signing_key_payload" {
+output "signing_key" {
   value       = local.signing_key_payload
   sensitive   = true
   description = "Signing key payload."

tests/scripts/pre-validation.sh

@@ -43,7 +43,7 @@ TF_VARS_FILE="terraform.tfvars"
   create_continuous_delivery_service_instance_var_name="create_continuous_delivery_service_instance"
   secrets_manager_guid_var_name="secrets_manager_guid"
   secrets_manager_crn_var_name="secrets_manager_crn"
-  signing_key_payload_var_name="signing_key_payload"
+  signing_key_var_name="signing_key"
 
   resource_group_name_value=$(terraform output -state=terraform.tfstate -raw resource_group_name)
   toolchain_resource_group_value=$(terraform output -state=terraform.tfstate -raw resource_group_name)
@@ -58,7 +58,7 @@ TF_VARS_FILE="terraform.tfvars"
   create_continuous_delivery_service_instance_value=false
   secrets_manager_guid_value=$(terraform output -state=terraform.tfstate -raw secrets_manager_guid)
   secrets_manager_crn_value=$(terraform output -state=terraform.tfstate -raw secrets_manager_crn)
-  signing_key_payload_value=$(terraform output -state=terraform.tfstate -raw signing_key_payload)
+  signing_key_value=$(terraform output -state=terraform.tfstate -raw signing_key)
 
   echo "Appending required input variable values to ${JSON_FILE}.."
 
@@ -97,8 +97,8 @@ TF_VARS_FILE="terraform.tfvars"
         --arg secrets_manager_crn_value "${secrets_manager_crn_value}" \
         --arg secrets_manager_guid_var_name "${secrets_manager_guid_var_name}" \
         --arg secrets_manager_guid_value "${secrets_manager_guid_value}" \
-        --arg signing_key_payload_var_name "${signing_key_payload_var_name}" \
-        --arg signing_key_payload_value "${signing_key_payload_value}" \
+        --arg signing_key_var_name "${signing_key_var_name}" \
+        --arg signing_key_value "${signing_key_value}" \
         '. + {($prefix_var_name): $prefix_value,
           ($resource_group_name_var_name): $resource_group_name_value,
           ($toolchain_region_var_name): $toolchain_region_value,
@@ -116,7 +116,7 @@ TF_VARS_FILE="terraform.tfvars"
           ($watson_machine_learning_instance_resource_name_var_name): $watson_machine_learning_instance_resource_name_value,
           ($secrets_manager_crn_var_name): $secrets_manager_crn_value,
           ($secrets_manager_guid_var_name): $secrets_manager_guid_value,
-          ($signing_key_payload_var_name): $signing_key_payload_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+          ($signing_key_var_name): $signing_key_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"
 )