fix: files

Author: Jordan-Williams2

cra-config.yaml

@@ -13,5 +13,5 @@ CRA_TARGETS: [] # disable CRA since no SCC instance exists in the test account
   #   # SCC_INSTANCE_ID: "" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
   #   # SCC_REGION: "" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
   #   CRA_ENVIRONMENT_VARIABLES: # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
-  #     TF_VAR_prefix: "roks-cpd"
+  #     TF_VAR_prefix: "ocp-cpd"
   #     TF_VAR_region: "au-syd"

examples/basic/variables.tf

@@ -11,7 +11,7 @@ variable "ibmcloud_api_key" {
 variable "prefix" {
   description = "A unique identifier for resources that is prepended to resources that are provisioned. Must begin with a lowercase letter and end with a lowercase letter or number. Must be 13 or fewer characters."
   type        = string
-  default     = "lz-roks-cp4d"
+  default     = "ocp-cp4d"
 
   validation {
     error_message = "Prefix must begin with a letter and contain only lowercase letters, numbers, and - characters. Prefixes must end with a lowercase letter or number and be 16 or fewer characters."

solutions/fully-configurable/catalogValidationValues.json.template

@@ -1,5 +1,6 @@
 {
   "ibmcloud_api_key": $VALIDATION_APIKEY,
+  "cpd_entitlement_key": $SOFTWARE_ENTITLEMENT_KEY,
   "prefix": $PREFIX,
   "region": "us-south"
 }

tests/pr_test.go

@@ -81,7 +81,7 @@ func TestRunStandardSolution(t *testing.T) {
 		assert.True(t, existErr == nil, "Init and Apply of temp existing resource failed")
 	} else {
 		// ------------------------------------------------------------------------------------
-		// Deploy WatsonX Self Managed OCP DA passing using existing ROKS instance
+		// Deploy WatsonX Self Managed OCP DA passing using existing OCP instance
 		// ------------------------------------------------------------------------------------
 		cpdEntitlementKey, cpdEntitlementKeyErr := GetSecretsManagerKey(
 			permanentResources["secretsManagerGuid"].(string),
@@ -169,7 +169,7 @@ func TestRunStandardUpgradeSolution(t *testing.T) {
 		assert.True(t, existErr == nil, "Init and Apply of temp existing resource failed")
 	} else {
 		// ------------------------------------------------------------------------------------
-		// Deploy WatsonX Self Managed OCP DA passing using existing ROKS instance
+		// Deploy WatsonX Self Managed OCP DA passing using existing OCP instance
 		// ------------------------------------------------------------------------------------
 		cpdEntitlementKey, cpdEntitlementKeyErr := GetSecretsManagerKey(
 			permanentResources["secretsManagerGuid"].(string),

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

@@ -27,21 +27,25 @@ TF_VARS_FILE="terraform.tfvars"
   terraform apply -input=false -auto-approve -var-file=${TF_VARS_FILE} || exit 1
 
   region_var_name="region"
+  cpd_entitlement_key_var_name="cpd_entitlement_key"
+  cpd_entitlement_key_value="${SOFTWARE_ENTITLEMENT_KEY}"
   existing_cluster_name_var_name="existing_cluster_name"
   existing_cluster_name_value=$(terraform output -state=terraform.tfstate -raw cluster_name)
   existing_resource_group_name_var_name="existing_resource_group_name"
   existing_resource_group_name_value=$(terraform output -state=terraform.tfstate -raw cluster_resource_group_name)
 
-  echo "Appending '${existing_cluster_name_var_name}', '${existing_resource_group_name_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
+  echo "Appending '${existing_cluster_name_var_name}', '${existing_resource_group_name_var_name}', '${cpd_entitlement_key_var_name}', and '${region_var_name}' input variable values to ${JSON_FILE}.."
 
   cd "${cwd}"
   jq -r --arg region_var_name "${region_var_name}" \
         --arg region_var_value "${REGION}" \
+        --arg cpd_entitlement_key_var_name "${existing_cluster_name_var_name}" \
+        --arg cpd_entitlement_key_value "${existing_cluster_name_value}" \
         --arg existing_cluster_name_var_name "${existing_cluster_name_var_name}" \
         --arg existing_cluster_name_value "${existing_cluster_name_value}" \
         --arg existing_resource_group_name_var_name "${existing_resource_group_name_var_name}" \
         --arg existing_resource_group_name_value "${existing_resource_group_name_value}" \
-        '. + {($region_var_name): $region_var_value, ($existing_cluster_name_var_name): $existing_cluster_name_value, ($existing_resource_group_name_var_name): $existing_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
+        '. + {($region_var_name): $region_var_value, ($cpd_entitlement_key_var_name): $cpd_entitlement_key_value, ($existing_cluster_name_var_name): $existing_cluster_name_value, ($existing_resource_group_name_var_name): $existing_resource_group_name_value}' "${JSON_FILE}" > tmpfile && mv tmpfile "${JSON_FILE}" || exit 1
 
   echo "Pre-validation complete successfully"
 )