fix: Update to allow for usage in ephemeral environments (TFC/TFE) (#58)

* adding decompress_wrapper to handle decompress_destroy in ephemeral environments * repopulate cache on destroy for ephemeral environments Co-authored-by: Nick Culver <[email protected]>
terraform-google-modules · Jul 17, 2020 · e0595b0 · e0595b0
1 parent 08eb173
commit e0595b0
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/main.tf b/main.tf
@@ -39,6 +39,7 @@ locals {
   download_gcloud_command                      = "curl -sL -o ${local.cache_path}/google-cloud-sdk.tar.gz ${local.gcloud_download_url}"
   download_jq_command                          = "curl -sL -o ${local.cache_path}/jq ${local.jq_download_url} && chmod +x ${local.cache_path}/jq"
   decompress_command                           = "tar -xzf ${local.gcloud_tar_path} -C ${local.cache_path} && cp ${local.cache_path}/jq ${local.cache_path}/google-cloud-sdk/bin/"
+  decompress_wrapper                           = fileexists(local.gcloud_tar_path) ? local.decompress_command : "${local.prepare_cache_command} && ${local.download_gcloud_command} && ${local.download_jq_command} && ${local.decompress_command}"
   upgrade_command                              = "${local.gcloud} components update --quiet"
   additional_components_command                = "${path.module}/check_components.sh ${local.gcloud} ${local.components}"
   gcloud_auth_service_account_key_file_command = "${local.gcloud} auth activate-service-account --key-file ${var.service_account_key_file}"
@@ -301,11 +302,11 @@ resource "null_resource" "decompress_destroy" {
   depends_on = [null_resource.upgrade_destroy]
 
   triggers = {
-    decompress_command = local.decompress_command
+    decompress_wrapper = local.decompress_wrapper
   }
 
   provisioner "local-exec" {
     when    = destroy
-    command = self.triggers.decompress_command
+    command = self.triggers.decompress_wrapper
   }
 }