fix: package.py not found with -chdir option (#136)

terraform-aws-modules · Apr 13, 2021 · f8f1fb3 · f8f1fb3
1 parent f8887e2
commit f8f1fb3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.py b/package.py
@@ -670,6 +670,8 @@ def commands_step(path, commands):
                             # If path doesn't defined for a block with
                             # commands it will be set to Terraform's
                             # current working directory
+                            # NB: cwd may vary when using Terraform 0.14+ like:
+                            # `terraform -chdir=...`
                             path = query.paths.cwd
                         if batch:
                             step('sh', path, '\n'.join(batch))

diff --git a/package.tf b/package.tf
@@ -7,8 +7,7 @@ locals {
 data "external" "archive_prepare" {
   count = var.create && var.create_package ? 1 : 0
 
-  program     = [local.python, "${path.module}/package.py", "prepare"]
-  working_dir = path.cwd
+  program = [local.python, "${path.module}/package.py", "prepare"]
 
   query = {
     paths = jsonencode({
@@ -66,8 +65,7 @@ resource "null_resource" "archive" {
       local.python, "${path.module}/package.py", "build",
       "--timestamp", data.external.archive_prepare[0].result.timestamp
     ]
-    command     = data.external.archive_prepare[0].result.build_plan_filename
-    working_dir = path.cwd
+    command = data.external.archive_prepare[0].result.build_plan_filename
   }
 
   depends_on = [local_file.archive_plan]