Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/scheduler/adapters/terraform.go
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,7 @@ func (o *terraformOutput) finishNode(node *dependency.Node, result TerraformExec
}
o.groupMu.Lock()
defer o.groupMu.Unlock()
label := terraformNodeLabel(node)
label := ioLayer.MaskString(terraformNodeLabel(node))
status := "succeeded"
if execErr != nil {
status = "failed"
Expand All @@ -1913,8 +1913,12 @@ func (o *terraformOutput) finishNode(node *dependency.Node, result TerraformExec
command = terraformDefaultCommand
}
writeGroupedOutputMarker(stderr, "\n["+label+"] "+command+" output "+status+"\n")
replayGroupedOutput(ioLayer.MaskWriter(os.Stdout), result.Stdout)
replayGroupedOutput(stderr, result.Stderr)
stdout := ioLayer.NewLinePrefixWriter(label, ioLayer.MaskWriter(os.Stdout), &o.outputMu)
replayGroupedOutput(ioLayer.MaskWriter(stdout), result.Stdout)
_ = stdout.Flush()
stderrOutput := ioLayer.NewLinePrefixWriter(label, stderr, &o.outputMu)
replayGroupedOutput(ioLayer.MaskWriter(stderrOutput), result.Stderr)
_ = stderrOutput.Flush()
writeGroupedOutputMarker(stderr, "["+label+"] end "+command+" output\n")
}

Expand Down
38 changes: 32 additions & 6 deletions pkg/scheduler/adapters/terraform_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ import (
"github.com/stretchr/testify/require"

errUtils "github.com/cloudposse/atmos/errors"
"github.com/cloudposse/atmos/pkg/asciicast"
cfg "github.com/cloudposse/atmos/pkg/config"
"github.com/cloudposse/atmos/pkg/dependency"
ioLayer "github.com/cloudposse/atmos/pkg/io"
provWorkdir "github.com/cloudposse/atmos/pkg/provisioner/workdir"
"github.com/cloudposse/atmos/pkg/scheduler"
"github.com/cloudposse/atmos/pkg/schema"
Expand Down Expand Up @@ -2279,10 +2281,18 @@ func TestTerraformOutputFinishNodeGroupedOutput(t *testing.T) {
os.Stderr = oldStderr
}()

castPath := filepath.Join(t.TempDir(), "grouped.cast")
recorder, err := asciicast.Start(&asciicast.Options{Path: castPath})
require.NoError(t, err)
t.Cleanup(func() { require.NoError(t, recorder.Discard()) })
t.Cleanup(ioLayer.SetRecorder(recorder))
require.NoError(t, ioLayer.RegisterPattern(`\[dev/app\] grouped-prefix-context-secret`))

output := &terraformOutput{command: "plan", logOrder: terraformLogOrderGrouped}
token := "ghp_" + strings.Repeat("a", 36)
output.finishNode(&dependency.Node{Component: "app", Stack: "dev"}, TerraformExecutionResult{
Stdout: "stdout",
Stderr: "stderr",
Stdout: "stdout\n\n\x1b[32mlast stdout\x1b[0m\n" + token + "\ngrouped-prefix-context-secret",
Stderr: "stderr\rprogress\r\nlast stderr\n" + token + "\ngrouped-prefix-context-secret",
}, nil)

require.NoError(t, stdoutWriter.Close())
Expand All @@ -2292,10 +2302,26 @@ func TestTerraformOutputFinishNodeGroupedOutput(t *testing.T) {
stderrBytes, err := io.ReadAll(stderrReader)
require.NoError(t, err)

require.Contains(t, string(stdoutBytes), "stdout")
require.Contains(t, string(stderrBytes), "plan output succeeded")
require.Contains(t, string(stderrBytes), "stderr")
require.Contains(t, string(stderrBytes), "end plan output")
require.Equal(t, "[dev/app] stdout\n[dev/app] \n[dev/app] \x1b[32mlast stdout\x1b[0m\n"+
"[dev/app] <MASKED>\n<MASKED>\n", string(stdoutBytes))
require.Equal(t, "\n[dev/app] plan output succeeded\n"+
"[dev/app] stderr\n[dev/app] progress\n[dev/app] last stderr\n[dev/app] <MASKED>\n<MASKED>\n"+
"[dev/app] end plan output\n", string(stderrBytes))

require.NoError(t, recorder.Close())
castBytes, err := os.ReadFile(castPath)
require.NoError(t, err)
recorded := map[string]string{}
for _, line := range bytes.Split(bytes.TrimSpace(castBytes), []byte("\n"))[1:] {
var event [3]json.RawMessage
require.NoError(t, json.Unmarshal(line, &event))
var stream, content string
require.NoError(t, json.Unmarshal(event[1], &stream))
require.NoError(t, json.Unmarshal(event[2], &content))
recorded[stream] += content
}
require.Equal(t, string(stdoutBytes), recorded["o"])
require.Equal(t, string(stderrBytes), recorded["e"])
}

func TestTerraformOutputFinishNodeSkipsNoChangesWhenHidden(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/cli/commands/terraform/terraform-apply.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ atmos terraform apply vpc -s dev

Supported values:
- `stream` *(default)* — print log lines as they arrive, interleaved across components
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes, prefixing every stdout and stderr line with `[stack/component]`. Saved per-component log files remain unprefixed.

**Environment variable:** `ATMOS_TERRAFORM_APPLY_LOG_ORDER`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/cli/commands/terraform/terraform-deploy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ atmos terraform deploy test/test-component-override-3 -s tenant1-ue2-dev

Supported values:
- `stream` *(default)* — print log lines as they arrive, interleaved across components
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes, prefixing every stdout and stderr line with `[stack/component]`. Saved per-component log files remain unprefixed.

**Environment variable:** `ATMOS_TERRAFORM_DEPLOY_LOG_ORDER`

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Keep the previous backend, workspace, inputs, and required sources available for

Supported values:
- `stream` *(default)* — print log lines as they arrive, interleaved across components
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes, prefixing every stdout and stderr line with `[stack/component]`. Saved per-component log files remain unprefixed.

**Environment variable:** `ATMOS_TERRAFORM_DESTROY_LOG_ORDER`

Expand Down
2 changes: 1 addition & 1 deletion website/docs/cli/commands/terraform/terraform-init.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ Atmos will:

Supported values:
- `stream` *(default)* — print log lines as they arrive, interleaved across components
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes
- `grouped` — buffer each component's output and print it as a contiguous block after the component finishes, prefixing every stdout and stderr line with `[stack/component]`. Saved per-component log files remain unprefixed.

**Environment variable:** `ATMOS_TERRAFORM_INIT_LOG_ORDER`

Expand Down
2 changes: 2 additions & 0 deletions website/docs/cli/commands/terraform/terraform-plan.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ atmos terraform plan --all -s dev --max-concurrency 4

Concurrent plan output is isolated per component. Use `--log-order grouped` to print each component's logs together after it finishes, or keep the default `stream` mode to see logs as they arrive. To reduce noise from unchanged components, use `--hide=no-changes`.

Grouped output prefixes every stdout and stderr line with `[stack/component]`, just like stream mode, so the originating component stays visible while scrolling. Saved per-component log files remain unprefixed.

```shell
atmos terraform plan --all -s dev \
--max-concurrency 4 \
Expand Down
Loading