VCDL-103 changing verbage of new check for trial org

hashicorp · Nov 13, 2023 · bb23463 · bb23463
1 parent 4459bf3
commit bb23463
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/instruqt-tracks/terraform-cloud-aws-v2/02-terraform-cloud-setup/check-workstation b/instruqt-tracks/terraform-cloud-aws-v2/02-terraform-cloud-setup/check-workstation
@@ -91,9 +91,7 @@ STATUS=$(curl \
     -w "%{response_code}" \
     -s \
     -o /tmp/.out.json \
-    https://app.terraform.io/api/v2/organizations/"${ORG}"/subscription 2>/dev/null) # originally TFC_ORG
-
-echo "Status = " $STATUS
+    https://app.terraform.io/api/v2/organizations/"${ORG}"/subscription 2>/dev/null)
 
 if [ "${STATUS}" != "200" ]; then
     echo "Failed to get organization subscription, status ${STATUS}"
@@ -107,15 +105,14 @@ if [ "${STATUS}" != "200" ]; then
 fi
 
 TRIAL=$(jq -r '.included[].attributes."identifier"' /tmp/.out.json 2>/dev/null)
-echo "############## Account identifier: " $TRIAL
 if [ -z "${TRIAL}" ]; then
-    echo ".included.[].attributes."identifier" was empty"
+    echo ".included[].attributes."identifier" was empty"
     fail-message "Unable to determine TFC Trial Status, please go back to the \"2- Terraform Cloud Trial Plan\" steps"
     exit 1
 fi
 
 if [ "${TRIAL}" != "trial" ]; then
-    echo ".data.attributes.versioned-policy-set-limit was '${TRIAL}' not 'true'"
+    echo ".included[].attributes."identifier" was '${TRIAL}' not 'trial'"
     fail-message "Your TFC Organization is not a trial one, please go back to the \"2- Terraform Cloud Trial Plan\" step"
     exit 1
 fi

diff --git a/instruqt-tracks/terraform-cloud-azure-v2/02-terraform-cloud-setup/check-workstation b/instruqt-tracks/terraform-cloud-azure-v2/02-terraform-cloud-setup/check-workstation
@@ -111,7 +111,7 @@ if [ -z "${TRIAL}" ]; then
 fi
 
 if [ "${TRIAL}" != "trial" ]; then
-    echo ".included[].attributes."identifier" was '${TRIAL}' not 'true'"
+    echo ".included[].attributes."identifier" was '${TRIAL}' not 'trial'"
     fail-message "Your TFC Organization is not a trial one, please go back to the \"2- Terraform Cloud Trial Plan\" step"
     exit 1
 fi

diff --git a/instruqt-tracks/terraform-cloud-gcp-v2/02-terraform-cloud-setup/check-workstation b/instruqt-tracks/terraform-cloud-gcp-v2/02-terraform-cloud-setup/check-workstation
@@ -114,7 +114,7 @@ if [ -z "${TRIAL}" ]; then
 fi
 
 if [ "${TRIAL}" != "trial" ]; then
-    echo ".included[].attributes."identifier" '${TRIAL}' not 'true'"
+    echo ".included[].attributes."identifier" was '${TRIAL}' not 'trial'"
     fail-message "Your TFC Organization is not a trial one, please go back to the \"2- Terraform Cloud Trial Plan\" step"
     exit 1
 fi