From 9d435e3961abdc5c692171899f5bf6da9ba93677 Mon Sep 17 00:00:00 2001
From: Pierre Mavro <pmavro@qovery.com>
Date: Thu, 2 Sep 2021 22:35:11 +0200
Subject: [PATCH] fix: test path for tf plugin cache

---
 .github/workflows/tests.yml | 3 ++-
 src/cmd/terraform.rs        | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 526d3672..adc3de0a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -29,7 +29,8 @@ jobs:
           export PATH=$GITHUB_WORKSPACE/bin:$PATH
           export RUSTC_WRAPPER=$GITHUB_WORKSPACE/bin/sccache
           export SCCACHE_REDIS=${{ secrets.SCCACHE_REDIS }}
-          mkdir -p $GITHUB_WORKSPACE/bin $GITHUB_WORKSPACE/.terraform.d/plugin-cache
+          export TF_PLUGIN_CACHE_DIR=$HOME/.terraform.d/plugin-cache
+          mkdir -p $GITHUB_WORKSPACE/bin $HOME/.terraform.d/plugin-cache
           sccache_release=$(curl --silent "https://github.com/Qovery/sccache-bin/releases/latest" | sed -r 's/^.+tag\/(.+)">.+/\1/')
           curl -sLo $GITHUB_WORKSPACE/bin/sccache https://github.com/Qovery/sccache-bin/releases/download/${sccache_release}/sccache
           chmod 755 $GITHUB_WORKSPACE/bin/sccache
diff --git a/src/cmd/terraform.rs b/src/cmd/terraform.rs
index 949f74f7..d4209fa7 100644
--- a/src/cmd/terraform.rs
+++ b/src/cmd/terraform.rs
@@ -23,10 +23,9 @@ fn terraform_init_validate(root_dir: &str) -> Result<(), SimpleError> {
                 // https://github.com/hashicorp/terraform/issues/28041
                 debug!("{:?}", err);
                 if err.message.is_some() {
-                    let message = err.message.clone();
-                    if message
-                        .unwrap()
-                        .contains("Failed to install provider from shared cache")
+                    let message = err.message.clone().unwrap();
+                    if message.contains("Failed to install provider from shared cache")
+                        || message.contains("Failed to install provider")
                     {
                         let sleep_time_int = rand::thread_rng().gen_range(20..45);
                         let sleep_time = time::Duration::from_secs(sleep_time_int);