Merge pull request #2376 from input-output-hk/fix-terraform-secrets

Fixing a deployment bug when pass is not available.
IntersectMBO · Oct 20, 2020 · 6ffb258 · 6ffb258
2 parents dc59ed5 + 266cbc4
commit 6ffb258
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/deployment/default.nix b/deployment/default.nix
@@ -69,16 +69,26 @@ let
       ln -s ${terraform-vars env region}/* $tmp_dir
       cd $tmp_dir
 
+      echo "read secrets"
+      TF_VAR_marlowe_github_client_id=$(pass ${env}/marlowe/githubClientId)
+      TF_VAR_marlowe_github_client_secret=$(pass ${env}/marlowe/githubClientSecret)
+      TF_VAR_marlowe_jwt_signature=$(pass ${env}/marlowe/jwtSignature)
+      TF_VAR_plutus_github_client_id=$(pass ${env}/plutus/githubClientId)
+      TF_VAR_plutus_github_client_secret=$(pass ${env}/plutus/githubClientSecret)
+      TF_VAR_plutus_jwt_signature=$(pass ${env}/plutus/jwtSignature)
+
+      export TF_VAR_marlowe_github_client_id
+      export TF_VAR_marlowe_github_client_secret
+      export TF_VAR_marlowe_jwt_signature
+      export TF_VAR_plutus_github_client_id
+      export TF_VAR_plutus_github_client_secret
+      export TF_VAR_plutus_jwt_signature
+
       echo "apply terraform"
-      export TF_VAR_marlowe_github_client_id=$(pass ${env}/marlowe/githubClientId)
-      export TF_VAR_marlowe_github_client_secret=$(pass ${env}/marlowe/githubClientSecret)
-      export TF_VAR_marlowe_jwt_signature=$(pass ${env}/marlowe/jwtSignature)
-      export TF_VAR_plutus_github_client_id=$(pass ${env}/plutus/githubClientId)
-      export TF_VAR_plutus_github_client_secret=$(pass ${env}/plutus/githubClientSecret)
-      export TF_VAR_plutus_jwt_signature=$(pass ${env}/plutus/jwtSignature)
       ${terraform}/bin/terraform init
       ${terraform}/bin/terraform workspace select ${env}
       ${terraform}/bin/terraform apply -var-file=${env}.tfvars
+
       marlowe_api_id=$(${terraform}/bin/terraform output marlowe_rest_api_id)
       plutus_api_id=$(${terraform}/bin/terraform output plutus_rest_api_id)
       region=$(${terraform}/bin/terraform output region)

diff --git a/shell.nix b/shell.nix
@@ -53,6 +53,7 @@ in haskell.packages.shellFor {
     pkgs.rPackages.plotly # for generating R plots locally
     pkgs.R
   ]);
+
   # we have a local passwords store that we use for deployments etc.
   PASSWORD_STORE_DIR = toString ./. + "/secrets";
 }