fix: update code

Author: Jordan-Williams2

.catalog-onboard-pipeline.yaml

@@ -9,5 +9,5 @@ offerings:
       - name: fully-configurable
         mark_ready: true
         install_type: fullstack
-        pre_validation: "tests/scripts/pre-validation-deploy-slz-roks-and-logs-instances.sh"
-        post_validation: "tests/scripts/post-validation-destroy-slz-roks-and-logs-instances.sh"
+        pre_validation: "tests/scripts/pre-validation-deploy-ocp-and-logs-instances.sh"
+        post_validation: "tests/scripts/post-validation-destroy-ocp-and-logs-instances.sh"

common-dev-assets

@@ -67,10 +67,10 @@ func TestFullyConfigurableSolution(t *testing.T) {
 	var region = validRegions[rand.IntN(len(validRegions))]
 
 	// ------------------------------------------------------------------------------------------------------
-	// Deploy SLZ ROKS Cluster and Observability instances since it is needed to deploy Logs Agent
+	// Deploy OCP Cluster and Logs instance since it is needed to deploy Logs Agent
 	// ------------------------------------------------------------------------------------------------------
 
-	prefix := fmt.Sprintf("slz-%s", strings.ToLower(random.UniqueId()))
+	prefix := fmt.Sprintf("ocp-%s", strings.ToLower(random.UniqueId()))
 	realTerraformDir := "./resources"
 	tempTerraformDir, _ := files.CopyTerraformFolderToTemp(realTerraformDir, fmt.Sprintf(prefix+"-%s", strings.ToLower(random.UniqueId())))
 
@@ -96,7 +96,7 @@ func TestFullyConfigurableSolution(t *testing.T) {
 	_, existErr := terraform.InitAndApplyE(t, existingTerraformOptions)
 
 	if existErr != nil {
-		assert.True(t, existErr == nil, "Init and Apply of temp resources (SLZ-ROKS and Observability Instances) failed")
+		assert.True(t, existErr == nil, "Init and Apply of temp resources (OCP and Logs Instance) failed")
 	} else {
 
 		options := testschematic.TestSchematicOptionsDefault(&testschematic.TestSchematicOptions{
@@ -153,10 +153,10 @@ func TestFullyConfigurableUpgradeSolution(t *testing.T) {
 	var region = validRegions[rand.IntN(len(validRegions))]
 
 	// ------------------------------------------------------------------------------------------------------
-	// Deploy SLZ ROKS Cluster and Observability instances since it is needed to deploy Logs Agent
+	// Deploy OCP Cluster and Observability instances since it is needed to deploy Logs Agent
 	// ------------------------------------------------------------------------------------------------------
 
-	prefix := fmt.Sprintf("slz-%s", strings.ToLower(random.UniqueId()))
+	prefix := fmt.Sprintf("ocp-%s", strings.ToLower(random.UniqueId()))
 	realTerraformDir := "./resources"
 	tempTerraformDir, _ := files.CopyTerraformFolderToTemp(realTerraformDir, fmt.Sprintf(prefix+"-%s", strings.ToLower(random.UniqueId())))
 
@@ -182,7 +182,7 @@ func TestFullyConfigurableUpgradeSolution(t *testing.T) {
 	_, existErr := terraform.InitAndApplyE(t, existingTerraformOptions)
 
 	if existErr != nil {
-		assert.True(t, existErr == nil, "Init and Apply of temp resources (SLZ-ROKS and Observability Instances) failed")
+		assert.True(t, existErr == nil, "Init and Apply of temp resources (OCP and Logs Instances) failed")
 	} else {
 
 		options := testschematic.TestSchematicOptionsDefault(&testschematic.TestSchematicOptions{

tests/pr_test.go

@@ -4,7 +4,7 @@
 
 output "region" {
   value       = var.region
-  description = "Region where SLZ ROKS Cluster is deployed."
+  description = "Region where OCP Cluster is deployed."
 }
 
 output "prefix" {

tests/resources/outputs.tf

@@ -11,7 +11,7 @@ TF_VARS_FILE="terraform.tfvars"
 
 (
   cd ${TERRAFORM_SOURCE_DIR}
-  echo "Destroying prerequisite SLZ OCP Cluster and Logs instance.."
+  echo "Destroying prerequisite OCP Cluster and Logs instance.."
   terraform destroy -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1
   rm -f "${TF_VARS_FILE}"
 

tests/scripts/post-validation-deploy-slz-roks-and-logs-instances.sh

@@ -15,12 +15,12 @@ TF_VARS_FILE="terraform.tfvars"
 (
   cwd=$(pwd)
   cd ${TERRAFORM_SOURCE_DIR}
-  echo "Provisioning prerequisite SLZ ROKS CLUSTER and Logs Instance.."
+  echo "Provisioning prerequisite OCP Cluster and Logs Instance.."
   terraform init || exit 1
   # $VALIDATION_APIKEY is available in the catalog runtime
   {
     echo "ibmcloud_api_key=\"${VALIDATION_APIKEY}\""
-    echo "prefix=\"slz-$(openssl rand -hex 2)\""
+    echo "prefix=\"ocp-$(openssl rand -hex 2)\""
   } >> ${TF_VARS_FILE}
   terraform apply -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1