Fix plan output relative

Author: james03160927

configstack/module.go

@@ -134,7 +134,12 @@ func (module *TerraformModule) getPlanFilePath(l log.Logger, opts *options.Terra
 		return ""
 	}
 
-	path, _ := filepath.Rel(opts.WorkingDir, module.Path)
+	// module path will be an absolute path so working dir should absolute too so that Rel() can work
+	wdir, err := filepath.Abs(opts.WorkingDir)
+	if err != nil {
+		wdir = opts.WorkingDir
+	}
+	path, _ := filepath.Rel(wdir, module.Path)
 	dir := filepath.Join(outputFolder, path)
 
 	if !filepath.IsAbs(dir) {

test/fixtures/plan-output/private-dns-zone/main.tf

@@ -0,0 +1,5 @@
+variable "terragrunt_dir" {}
+
+output "terragrunt_dir" {
+  value = var.terragrunt_dir
+}

test/fixtures/plan-output/private-dns-zone/terragrunt.hcl

@@ -0,0 +1,7 @@
+terraform {
+  source = "."
+}
+
+inputs = {
+  terragrunt_dir = "."
+}

test/fixtures/plan-output/resource-group/main.tf

@@ -0,0 +1,5 @@
+variable "terragrunt_dir" {}
+
+output "terragrunt_dir" {
+  value = var.terragrunt_dir
+}

test/fixtures/plan-output/resource-group/terragrunt.hcl

@@ -0,0 +1,7 @@
+terraform {
+  source = "."
+}
+
+inputs = {
+  terragrunt_dir = "."
+}

test/fixtures/plan-output/vnet/main.tf

@@ -0,0 +1,5 @@
+variable "terragrunt_dir" {}
+
+output "terragrunt_dir" {
+  value = var.terragrunt_dir
+}

test/fixtures/plan-output/vnet/terragrunt.hcl

@@ -0,0 +1,7 @@
+terraform {
+  source = "."
+}
+
+inputs = {
+  terragrunt_dir = "."
+}

test/integration_test.go

@@ -92,6 +92,7 @@ const (
 	testFixtureParallelism                    = "fixtures/parallelism"
 	testFixturePath                           = "fixtures/terragrunt/"
 	testFixturePlanfileOrder                  = "fixtures/planfile-order-test"
+	testFixturePlanOutput                     = "fixtures/plan-output"
 	testFixtureProviderCacheDirect            = "fixtures/provider-cache/direct"
 	testFixtureProviderCacheFilesystemMirror  = "fixtures/provider-cache/filesystem-mirror"
 	testFixtureProviderCacheMultiplePlatforms = "fixtures/provider-cache/multiple-platforms"
@@ -4186,3 +4187,38 @@ func TestVersionIsInvokedInDifferentDirectory(t *testing.T) {
 	assert.Len(t, matches, 2, "Expected exactly one occurrence of '-version' command, found %d", len(matches))
 	assert.Contains(t, stderr, "prefix=dependency-with-custom-version msg=Running command: "+wrappedBinary()+" -version")
 }
+
+func TestTerragruntPlanAllOutput(t *testing.T) {
+	t.Parallel()
+
+	helpers.CleanupTerraformFolder(t, testFixturePlanOutput)
+	tmpEnvPath := helpers.CopyEnvironment(t, testFixturePlanOutput)
+
+	outDir := filepath.Join(tmpEnvPath, "plans")
+	pwd := filepath.Join(tmpEnvPath, testFixturePlanOutput)
+	{
+		originalDir, err := os.Getwd()
+		require.NoError(t, err)
+		t.Cleanup(func() {
+			require.NoError(t, os.Chdir(originalDir))
+		})
+		require.NoError(t, os.Chdir(pwd))
+	}
+
+	cmd := fmt.Sprintf("terragrunt plan --all --non-interactive --out-dir %s --working-dir %s ", outDir, ".")
+	var (
+		stdout bytes.Buffer
+		stderr bytes.Buffer
+	)
+	// Call helpers.RunTerragruntCommand directly because this command contains failures (which causes helpers.RunTerragruntRedirectOutput to abort) but we don't care.
+	err := helpers.RunTerragruntCommand(t, cmd, &stdout, &stderr)
+	require.NoError(t, err)
+
+	output := stdout.String()
+	errOutput := stderr.String()
+	fmt.Printf("STDERR is %s.\n STDOUT is %s", errOutput, output)
+
+	assert.FileExists(t, filepath.Join(outDir, "vnet", "tfplan.tfplan"))
+	assert.FileExists(t, filepath.Join(outDir, "resource-group", "tfplan.tfplan"))
+	assert.FileExists(t, filepath.Join(outDir, "private-dns-zone", "tfplan.tfplan"))
+}