X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fterraform.sh;h=5313b6254561b991357e4230b886af9729f99525;hp=929cdd87c83db9ee33e96a287db601e863245f58;hb=6de5c7fc4524c5121ed00dc2fa3ab34301d45215;hpb=13f4ec1dc98710d2cf226de3643dc5a0a6c5ac67

diff --git a/resources/libraries/bash/function/terraform.sh b/resources/libraries/bash/function/terraform.sh
index 929cdd87c8..5313b62545 100644
--- a/resources/libraries/bash/function/terraform.sh
+++ b/resources/libraries/bash/function/terraform.sh
@@ -34,7 +34,7 @@ function terraform_apply () {
     pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
     pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
     export TF_LOG=INFO
-    terraform apply -auto-approve  || die "Failed to run terraform apply!"
+    terraform apply -no-color -auto-approve  || die "Terraform apply failed!"
     popd || die "Popd failed!"
     popd || die "Popd failed!"
 }
@@ -57,7 +57,7 @@ function terraform_destroy () {
     pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
     pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
     export TF_LOG=INFO
-    terraform destroy -auto-approve || die "Failed to run terraform destroy!"
+    terraform destroy -auto-approve -no-color || die "Terraform destroy failed!"
     popd || die "Popd failed!"
     popd || die "Popd failed!"
 }
@@ -75,8 +75,10 @@ function terraform_init () {
     set -exuo pipefail
 
     if ! installed terraform; then
-        repo="deb [arch=amd64] https://apt.releases.hashicorp.com focal main"
-        echo "${repo}" >> "/etc/apt/sources.list" || die "Failed to add repo!"
+        curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+        os="$(lsb_release -cs)" || die "Failed to get OS release!"
+        repo="deb [arch=amd64] https://apt.releases.hashicorp.com ${os} main"
+        sudo apt-add-repository "${repo}" || die "Failed to add repo!"
         apt update -y
         apt install -y terraform
         #die "Please install terraform!"