fix: adjusting the ci

appvia · Aug 27, 2024 · f3e0afc · f3e0afc
1 parent fedb8db
commit f3e0afc
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/test/e2e/integration/infracost.bats b/test/e2e/integration/infracost.bats
@@ -26,44 +26,44 @@ teardown() {
 }
 
 @test "We should skip infracost when not running on aws cloud" {
-  [[ -z "${INFRACOST_API_KEY}" ]] && touch ${BATS_PARENT_TMPNAME}.skip
-  [[ "${CLOUD}" == "aws" ]] || touch ${BATS_PARENT_TMPNAME}.skip
+  [[ -z ${INFRACOST_API_KEY}   ]] && touch ${BATS_PARENT_TMPNAME}.skip
+  [[ ${CLOUD} == "aws"   ]] || touch ${BATS_PARENT_TMPNAME}.skip
 }
 
 @test "We should have a job created in the terraform-system running the plan" {
   labels="terraform.appvia.io/configuration=compute,terraform.appvia.io/stage=plan"
 
   runit "kubectl -n ${NAMESPACE} get job -l ${labels}"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should see the terraform plan complete successfully" {
   labels="terraform.appvia.io/configuration=compute,terraform.appvia.io/stage=plan"
 
-  retry 50 "kubectl -n ${NAMESPACE} get job -l ${labels} -o json" "jq -r '.items[0].status.conditions[0].type' | grep -q Complete"
-  [[ "$status" -eq 0 ]]
+  retry 50 "kubectl -n ${NAMESPACE} get job -l ${labels} -o json" "jq -r '.items[0].status.conditions[0].type' | egrep -q '(Complete|SuccessCriteriaMet)'"
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${NAMESPACE} get job -l ${labels} -o json" "jq -r '.items[0].status.conditions[0].status' | grep -q True"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should the predicted costs available on the status" {
   runit "kubectl -n ${APP_NAMESPACE} get configuration compute -o json" "jq -r '.status.costs.enabled' | grep -q 'true'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${APP_NAMESPACE} get configuration compute -o json" "jq -r '.status.costs.monthly' | grep -q '^\$[0-9\.]*'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should see infracost breakdown in the watcher logs" {
   POD=$(kubectl -n ${APP_NAMESPACE} get pod -l terraform.appvia.io/configuration=${RESOURCE_NAME} -l terraform.appvia.io/stage=plan -o json | jq -r '.items[0].metadata.name')
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 
   runit "kubectl -n ${APP_NAMESPACE} logs ${POD} 2>&1" "grep -q 'EVALUATING THE COSTS'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${APP_NAMESPACE} logs ${POD} 2>&1" "grep -q 'OVERALL TOTAL'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should be able to destroy the aws configuration for costs" {
   runit "kubectl -n ${APP_NAMESPACE} delete -f ${BATS_TMPDIR}/resource.yml"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
diff --git a/test/e2e/integration/plan.bats b/test/e2e/integration/plan.bats
@@ -107,41 +107,41 @@ teardown() {
 }
 
 @test "We should have a secret in the terraform namespace containing the report" {
-  [[ "${INFRACOST_API_KEY}" == "" ]] && skip "INFRACOST_API_KEY is not set"
+  [[ ${INFRACOST_API_KEY} == ""   ]] && skip "INFRACOST_API_KEY is not set"
 
   UUID=$(kubectl -n ${APP_NAMESPACE} get configuration ${RESOURCE_NAME} -o json | jq -r '.metadata.uid')
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 
   runit "kubectl -n ${NAMESPACE} get secret costs-${UUID}"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${NAMESPACE} get secret costs-${UUID} -o json" "jq -r '.data[\"costs.json\"]'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should see the cost integration is enabled" {
-  [[ "${INFRACOST_API_KEY}" == "" ]] && skip "INFRACOST_API_KEY is not set"
+  [[ ${INFRACOST_API_KEY} == ""   ]] && skip "INFRACOST_API_KEY is not set"
 
   runit "kubectl -n ${APP_NAMESPACE} get configuration ${RESOURCE_NAME} -o json" "jq -r '.status.costs.enabled' | grep -q true"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should see the cost associated to the configuration" {
-  [[ "${INFRACOST_API_KEY}" == "" ]] && skip "INFRACOST_API_KEY is not set"
+  [[ ${INFRACOST_API_KEY} == ""   ]] && skip "INFRACOST_API_KEY is not set"
 
   runit "kubectl -n ${APP_NAMESPACE} get configuration ${RESOURCE_NAME} -o json" "jq -r '.status.costs.monthly' | grep -q '\$0'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${APP_NAMESPACE} get configuration ${RESOURCE_NAME} -o json" "jq -r '.status.costs.hourly' | grep -q '\$0'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
 
 @test "We should have a copy of the infracost report in the configuration namespace" {
-  [[ "${INFRACOST_API_KEY}" == "" ]] && skip "INFRACOST_API_KEY is not set"
+  [[ ${INFRACOST_API_KEY} == ""   ]] && skip "INFRACOST_API_KEY is not set"
 
   UUID=$(kubectl -n ${APP_NAMESPACE} get configuration ${RESOURCE_NAME} -o json | jq -r '.metadata.uid')
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 
   runit "kubectl -n ${APP_NAMESPACE} get secret costs-${UUID}"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${APP_NAMESPACE} get secret costs-${UUID} -o json" "jq -r '.data[\"costs.json\"]'"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }
diff --git a/test/e2e/integration/setup.bats b/test/e2e/integration/setup.bats
@@ -120,14 +120,14 @@ EOF
 }
 
 @test "We should be able to provision a secret with infracost api token" {
-  [[ "${INFRACOST_API_KEY}" == "" ]] && skip "INFRACOST_API_KEY is not set"
+  [[ ${INFRACOST_API_KEY} == ""   ]] && skip "INFRACOST_API_KEY is not set"
 
   if kubectl -n ${NAMESPACE} get secret infracost-api; then
     skip "infracost token already exists"
   fi
 
   runit "kubectl -n ${NAMESPACE} create secret generic infracost-api --from-literal=INFRACOST_API_KEY=${INFRACOST_API_KEY}"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
   runit "kubectl -n ${NAMESPACE} get secret infracost-api"
-  [[ "$status" -eq 0 ]]
+  [[ $status -eq 0   ]]
 }