fix: catalog id

Author: Jordan-Williams2

tests/pr_test.go

@@ -103,7 +103,7 @@ func TestRunStandardSolution(t *testing.T) {
 				"prefix":                       prefix,
 				"region":                       region,
 				"existing_cluster_name":        terraform.Output(t, existingTerraformOptions, "cluster_name"),
-				"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "cluster_resource_group_id"),
+				"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "cluster_resource_group_name"),
 				"cloud_pak_deployer_image":     "quay.io/cloud-pak-deployer/cloud-pak-deployer",
 				"cpd_admin_password":           GetRandomAdminPassword(t),
 				"cpd_entitlement_key":          *cpdEntitlementKey,
@@ -191,7 +191,7 @@ func TestRunStandardUpgradeSolution(t *testing.T) {
 				"prefix":                       prefix,
 				"region":                       region,
 				"existing_cluster_name":        terraform.Output(t, existingTerraformOptions, "cluster_name"),
-				"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "cluster_resource_group_id"),
+				"existing_resource_group_name": terraform.Output(t, existingTerraformOptions, "cluster_resource_group_name"),
 				"cloud_pak_deployer_image":     "quay.io/cloud-pak-deployer/cloud-pak-deployer",
 				"cpd_admin_password":           GetRandomAdminPassword(t),
 				"cpd_entitlement_key":          *cpdEntitlementKey,

tests/resources/outputs.tf

@@ -12,3 +12,8 @@ output "cluster_resource_group_id" {
   value       = module.ocp_base.resource_group_id
   description = "Cluster resource group ID."
 }
+
+output "cluster_resource_group_name" {
+  value       = module.resource_group.resource_group_name
+  description = "Cluster resource group name."
+}

tests/scripts/pre-validation-deploy-ocp-instances.sh

@@ -31,10 +31,10 @@ TF_VARS_FILE="terraform.tfvars"
   cpd_entitlement_key_var_name="cpd_entitlement_key"
   cluster_name_var_name="existing_cluster_name"
   cluster_name_value=$(terraform output -state=terraform.tfstate -raw cluster_name)
-  cluster_resource_group_id_var_name="existing_resource_group_name"
-  cluster_resource_group_id_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_id)
+  cluster_resource_group_name_var_name="existing_resource_group_name"
+  cluster_resource_group_name_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_name)
 
-  echo "Appending '${cpd_entitlement_key_var_name}', ${cluster_name_var_name}', '${cluster_resource_group_id_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
+  echo "Appending '${cpd_entitlement_key_var_name}', ${cluster_name_var_name}', '${cluster_resource_group_name_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
 
   cd "${cwd}"
   jq -r --arg region_var_name "${region_var_name}" \
@@ -43,9 +43,9 @@ TF_VARS_FILE="terraform.tfvars"
         --arg cpd_entitlement_key_var_value "${CPD_ENTITLEMENT_KEY}" \
         --arg cluster_name_var_name "${cluster_name_var_name}" \
         --arg cluster_name_value "${cluster_name_value}" \
-        --arg cluster_resource_group_id_var_name "${cluster_resource_group_id_var_name}" \
-        --arg cluster_resource_group_id_value "${cluster_resource_group_id_value}" \
-        '. + {($region_var_name): $region_var_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_var_value, ($cluster_name_var_name): $cluster_name_value, ($cluster_resource_group_id_var_name): $cluster_resource_group_id_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+        --arg cluster_resource_group_name_var_name "${cluster_resource_group_name_var_name}" \
+        --arg cluster_resource_group_name_value "${cluster_resource_group_name_value}" \
+        '. + {($region_var_name): $region_var_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_var_value, ($cluster_name_var_name): $cluster_name_value, ($cluster_resource_group_name_var_name): $cluster_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"
 )