Skip to content

fix(steps): resolve relative paths against step.WorkingDirectory - #2880

Merged
Andriy Knysh (aknysh) merged 17 commits into
mainfrom
osterman/fix-archive-step-workdir
Aug 10, 2026
Merged

Andriy Knysh (aknysh) merged 17 commits into
mainfrom
osterman/fix-archive-step-workdir

Conversation

@osterman

@osterman Erik Osterman (Cloud Posse) (osterman) commented Aug 5, 2026 •

Copy link
Copy Markdown
Member

what

  • Fix type: archive, file, workdir, junit, and container build step handlers to resolve relative source/destination/path/files/context/dockerfile fields against step.WorkingDirectory instead of the Atmos process's own cwd.
  • Add a shared BaseHandler.ResolveInWorkingDirectory helper (pkg/runner/step/handler_base.go) used by all five handlers; container build additionally anchors Dockerfile to the resolved Context, matching Docker's own convention.
  • Add regression tests for each fixed handler plus a hooks-integration test (TestStepEngineRunsArchiveTypeWithRelativeWorkingDirectory) reproducing the original bug end-to-end.
  • Update two pre-existing container tests that had hardcoded the old (buggy) relative-path behavior to assert the corrected absolute-path behavior.

why

  • type: archive steps run as component lifecycle hooks ignored step.WorkingDirectory, even though the hooks engine (pkg/hooks/step_engine.go) already correctly computes and sets it to the resolved component path before dispatch — the field was just never read back out by the handler.
  • Auditing for the same defect class turned up four more handlers (file, workdir, junit, container build) with the identical bug: relative paths resolved via template substitution only, then silently anchored to process cwd instead of the step's configured working directory.

references

The archive, file, workdir, junit, and container build step handlers
resolved relative source/destination/path/glob/context fields via
template substitution only, then let filesystem calls resolve them
against the Atmos process's own cwd instead of step.WorkingDirectory.
This surfaced most visibly for `type: archive` hooks, since the hooks
engine correctly defaults working_directory to the component path but
the handler never read it back.

Add a shared BaseHandler.ResolveInWorkingDirectory helper that anchors
a relative resolved value to step.WorkingDirectory (falling back to
process cwd when unset, matching prior behavior), and apply it across
the five affected handlers. container_build.go additionally anchors
Dockerfile to the resolved Context rather than WorkingDirectory
directly, matching Docker's own convention.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@atmos-pro

atmos-pro Bot commented Aug 5, 2026 •

Copy link
Copy Markdown
Contributor

Tip

Atmos Pro  

No affected stacks workflow was detected for this pull request.
If this is expected, no action is needed.
Learn More. Ask AI.

@osterman Erik Osterman (Cloud Posse) (osterman) added the patch A minor, backward compatible change label Aug 5, 2026
@coderabbitai

coderabbitai Bot commented Aug 5, 2026 •

Copy link
Copy Markdown
Contributor

Review Change Stack

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review
📝 Walkthrough

Walkthrough

Step handlers now resolve relative filesystem paths against step.WorkingDirectory. The shared resolver supports templates, absolute paths, component-relative paths, dot-relative paths, tilde expansion, and process-CWD fallback. Workflow errors preserve nested context.

Changes

Working-directory path resolution

Layer / File(s) Summary
Shared resolver and hook context
pkg/runner/step/handler_base.go, pkg/runner/step/variables.go, pkg/hooks/step_engine.go, pkg/hooks/step_engine_test.go
Added shared path resolution with component-directory and process-CWD rules. Hook execution now supplies component context.
Filesystem handler integration
pkg/runner/step/archive.go, pkg/runner/step/file.go, pkg/runner/step/workdir.go, pkg/runner/step/junit.go, pkg/runner/step/*_test.go, pkg/hooks/step_engine_test.go
Archive, file, workdir, and JUnit handlers use the shared resolver. Tests cover relative paths and template-error sentinels.
Container build integration
pkg/runner/step/container_build.go, pkg/runner/step/container_actions_extra_test.go, pkg/runner/step/container_runtime_fake_test.go, pkg/runner/step/container_test.go
Build contexts, Dockerfiles, Bake files, and local cache paths resolve against WorkingDirectory.
Workflow execution and error context
internal/exec/workflow_utils.go, pkg/provisioner/source/vendor.go, internal/exec/workflow_step_error_test.go, internal/exec/workflow_utils_test.go
Extended steps inherit workflow working directories. Local sources accept a base directory. Workflow errors preserve hints, context, sentinel matching, and exit codes.
Documentation and link-check configuration
agent-skills/skills/*, website/docs/..., docs/fixes/*, lychee.toml, website/package.json
Documentation records path-resolution rules and validation. Lychee excludes reproducible-builds.org URLs. Website dependency overrides are updated.

Estimated code review effort: 4 (Complex) | ~45 minutes

Possibly related PRs

Suggested reviewers: aknysh, sgtoj, zack-is-cool

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 43.33% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: resolving relative step paths against step.WorkingDirectory.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch osterman/fix-archive-step-workdir

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the size/m Medium size PR label Aug 5, 2026
@github-actions

github-actions Bot commented Aug 5, 2026 •

Copy link
Copy Markdown

Dependency Review

✅ No vulnerabilities or license issues found.

Scanned Files

  • website/pnpm-lock.yaml

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@github-actions

github-actions Bot commented Aug 5, 2026

Copy link
Copy Markdown

Resource Changes Found for bucket in test

Atmos CI

create

Plan: 4 to add, 0 to change, 0 to destroy.
To reproduce this locally, run:

atmos terraform plan bucket -s test

Create

+ aws_s3_bucket.checkov_target
+ aws_s3_bucket.this
+ aws_s3_bucket.trivy_target
+ aws_s3_bucket_public_access_block.trivy_target
Terraform Plan Summary
  # aws_s3_bucket.checkov_target will be created
  + resource "aws_s3_bucket" "checkov_target" {
      + acceleration_status         = (known after apply)
      + acl                         = (known after apply)
      + arn                         = (known after apply)
      + bucket                      = "atmos-native-ci-e2e-checkov-test"
      + bucket_domain_name          = (known after apply)
      + bucket_prefix               = (known after apply)
      + bucket_regional_domain_name = (known after apply)
      + force_destroy               = false
      + hosted_zone_id              = (known after apply)
      + id                          = (known after apply)
      + object_lock_enabled         = (known after apply)
      + policy                      = (known after apply)
      + region                      = (known after apply)
      + request_payer               = (known after apply)
      + tags_all                    = (known after apply)
      + website_domain              = (known after apply)
      + website_endpoint            = (known after apply)

      + cors_rule (known after apply)

      + grant (known after apply)

      + lifecycle_rule (known after apply)

      + logging (known after apply)

      + object_lock_configuration (known after apply)

      + replication_configuration (known after apply)

      + server_side_encryption_configuration (known after apply)

      + versioning (known after apply)

      + website (known after apply)
    }

  # aws_s3_bucket.this will be created
  + resource "aws_s3_bucket" "this" {
      + acceleration_status         = (known after apply)
      + acl                         = (known after apply)
      + arn                         = (known after apply)
      + bucket                      = "atmos-native-ci-e2e-test"
      + bucket_domain_name          = (known after apply)
      + bucket_prefix               = (known after apply)
      + bucket_regional_domain_name = (known after apply)
      + force_destroy               = false
      + hosted_zone_id              = (known after apply)
      + id                          = (known after apply)
      + object_lock_enabled         = (known after apply)
      + policy                      = (known after apply)
      + region                      = (known after apply)
      + request_payer               = (known after apply)
      + tags                        = {
          + "AtmosFixture" = "native-ci-e2e"
          + "Stage"        = "test"
        }
      + tags_all                    = {
          + "AtmosFixture" = "native-ci-e2e"
          + "Stage"        = "test"
        }
      + website_domain              = (known after apply)
      + website_endpoint            = (known after apply)

      + cors_rule (known after apply)

      + grant (known after apply)

      + lifecycle_rule (known after apply)

      + logging (known after apply)

      + object_lock_configuration (known after apply)

      + replication_configuration (known after apply)

      + server_side_encryption_configuration (known after apply)

      + versioning (known after apply)

      + website (known after apply)
    }

  # aws_s3_bucket.trivy_target will be created
  + resource "aws_s3_bucket" "trivy_target" {
      + acceleration_status         = (known after apply)
      + acl                         = (known after apply)
      + arn                         = (known after apply)
      + bucket                      = "atmos-native-ci-e2e-trivy-test"
      + bucket_domain_name          = (known after apply)
      + bucket_prefix               = (known after apply)
      + bucket_regional_domain_name = (known after apply)
      + force_destroy               = false
      + hosted_zone_id              = (known after apply)
      + id                          = (known after apply)
      + object_lock_enabled         = (known after apply)
      + policy                      = (known after apply)
      + region                      = (known after apply)
      + request_payer               = (known after apply)
      + tags_all                    = (known after apply)
      + website_domain              = (known after apply)
      + website_endpoint            = (known after apply)

      + cors_rule (known after apply)

      + grant (known after apply)

      + lifecycle_rule (known after apply)

      + logging (known after apply)

      + object_lock_configuration (known after apply)

      + replication_configuration (known after apply)

      + server_side_encryption_configuration (known after apply)

      + versioning (known after apply)

      + website (known after apply)
    }

  # aws_s3_bucket_public_access_block.trivy_target will be created
  + resource "aws_s3_bucket_public_access_block" "trivy_target" {
      + block_public_acls       = true
      + block_public_policy     = true
      + bucket                  = (known after apply)
      + id                      = (known after apply)
      + ignore_public_acls      = true
      + restrict_public_buckets = true
    }

Plan: 4 to add, 0 to change, 0 to destroy.

Changes to Outputs:
  + bucket_name = "atmos-native-ci-e2e-test"

@codecov

codecov Bot commented Aug 5, 2026 •

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 84.44444% with 21 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.77%. Comparing base (4aec494) to head (9a4d3d0).

Files with missing lines Patch % Lines
pkg/runner/step/handler_base.go 71.64% 15 Missing and 4 partials ⚠️
pkg/runner/step/workdir.go 66.66% 1 Missing and 1 partial ⚠️

❌ Your patch check has failed because the patch coverage (84.44%) is below the target coverage (85.00%). You can increase the patch coverage or adjust the target coverage.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2880      +/-   ##
==========================================
- Coverage   82.79%   82.77%   -0.02%     
==========================================
  Files        1863     1863              
  Lines      180652   180749      +97     
==========================================
+ Hits       149568   149620      +52     
- Misses      23293    23333      +40     
- Partials     7791     7796       +5     
Flag Coverage Δ
unittests 82.77% <84.44%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
internal/exec/workflow_utils.go 76.02% <100.00%> (+0.09%) ⬆️
pkg/hooks/step_engine.go 87.35% <100.00%> (+0.05%) ⬆️
pkg/provisioner/source/vendor.go 70.26% <100.00%> (+0.79%) ⬆️
pkg/runner/step/archive.go 100.00% <100.00%> (ø)
pkg/runner/step/container_build.go 89.61% <100.00%> (+1.71%) ⬆️
pkg/runner/step/file.go 51.11% <100.00%> (-1.96%) ⬇️
pkg/runner/step/junit.go 88.11% <100.00%> (+1.98%) ⬆️
pkg/runner/step/variables.go 95.22% <100.00%> (+0.04%) ⬆️
pkg/runner/step/workdir.go 97.64% <66.66%> (-0.06%) ⬇️
pkg/runner/step/handler_base.go 88.41% <71.64%> (-11.59%) ⬇️

... and 8 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

…nd loadReport

Codecov flagged handler_base.go and junit.go below the 85% patch-coverage
threshold. Add a case that exercises the relative (non-template)
WorkingDirectory branch in resolveWorkingDirectory, and a junit test that
triggers a WorkingDirectory template-resolution error from inside
loadReport's per-pattern loop, distinct from the already-covered `files`
template error path.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md`:
- Around line 7-10: Update the sentence in the documentation to add “that” after
“type: archive steps,” making the subject grammatically complete while
preserving the rest of the explanation.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 1e889ec1-4f4c-4cc3-aeaa-28caf4c91da5

📥 Commits

Reviewing files that changed from the base of the PR and between d2b8e81 and 4142228.

📒 Files selected for processing (16)
  • docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md
  • pkg/hooks/step_engine_test.go
  • pkg/runner/step/archive.go
  • pkg/runner/step/archive_test.go
  • pkg/runner/step/container_actions_extra_test.go
  • pkg/runner/step/container_build.go
  • pkg/runner/step/container_runtime_fake_test.go
  • pkg/runner/step/container_test.go
  • pkg/runner/step/file.go
  • pkg/runner/step/file_test.go
  • pkg/runner/step/handler_base.go
  • pkg/runner/step/handler_base_test.go
  • pkg/runner/step/junit.go
  • pkg/runner/step/junit_test.go
  • pkg/runner/step/workdir.go
  • pkg/runner/step/workdir_test.go

Comment thread docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md Outdated
…rror context

A field test of the WorkingDirectory fix found the container_build.go handler
was only partially fixed: build.bake.file/bake.files and cache.from/cache.to
type: local src/dest still resolved against the Atmos process's own cwd
instead of step.WorkingDirectory, reproduced live as a silent build against
the wrong bake file. Both now route through ResolveInWorkingDirectory like
context/dockerfile already do.

Also root-caused and fixed a separate defect surfaced while verifying error
output: buildWorkflowStepError dual-wrapped step errors with fmt.Errorf before
building the final error, and cockroachdb/errors treats that Go 1.20
multi-error shape as an opaque leaf node, silently dropping any hints/context
a handler attached deeper in the chain. Switched to WithCause, which extracts
them eagerly.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 2

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
pkg/runner/step/container_build.go (1)

98-108: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Preserve Buildx remote inputs before filesystem anchoring.

build.context, build.dockerfile, and build.bake.file can be remote references such as https://github.com/org/repo.git, while build.bake.files can be multiple remote definitions. These values are not absolute filesystem paths, but filepath.IsAbs treats them as relative and anchors them under ContextDir/WorkingDirectory, changing supported Docker Buildx inputs into invalid paths. Classify supported remote forms after template resolution and bypass working-directory anchoring for them; add regression cases covering remote context, Dockerfile, and Bake definitions.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/runner/step/container_build.go` around lines 98 - 108, Update the
path-resolution flow in the container build handling around
ResolveInWorkingDirectory, resolveOptional, and the build.bake file resolution
so supported remote references such as HTTPS Git URLs remain unchanged after
template resolution instead of being anchored to ContextDir or WorkingDirectory.
Apply the same remote classification to build.context, build.dockerfile,
build.bake.file, and each entry in build.bake.files, while preserving filesystem
anchoring for local paths; add regression coverage for remote context,
Dockerfile, and Bake definitions.
🧹 Nitpick comments (1)
pkg/runner/step/container_actions_extra_test.go (1)

209-284: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Use tables for the scenario variants.

Both tests enumerate multiple input and expected-output scenarios in separate t.Run blocks. Convert each set to a table and loop over the cases. This keeps future path variants consistent.

As per coding guidelines, “Use table-driven tests for testing multiple scenarios in Go.”

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@pkg/runner/step/container_actions_extra_test.go` around lines 209 - 284, The
tests covering bake path resolution and build-cache path resolution should use
table-driven scenarios instead of separate t.Run blocks. Refactor the cases in
the relevant test functions around buildBuildConfig and resolveBuildCache into
case tables containing inputs and expected outputs, then iterate over each table
entry with t.Run while preserving the existing assertions and distinct behavior
for relative, absolute, local, and non-local paths.

Source: Coding guidelines

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md`:
- Line 138: Remove the host-specific `/tmp/atmos-field-test/` reference from the
field-test repro note, replacing it with a relative fixture identifier or a
worktree-local reference while preserving the `container-bake-print` context.

In `@internal/exec/workflow_utils_test.go`:
- Around line 661-701: Move TestBuildWorkflowStepError and
TestBuildWorkflowStepErrorPreservesInnerHintsAndContext from
workflow_utils_test.go into a focused workflow-step-error test file, preserving
their setup and assertions. Keep related workflow-step-error tests together and
ensure workflow_utils_test.go remains below 600 lines.

---

Outside diff comments:
In `@pkg/runner/step/container_build.go`:
- Around line 98-108: Update the path-resolution flow in the container build
handling around ResolveInWorkingDirectory, resolveOptional, and the build.bake
file resolution so supported remote references such as HTTPS Git URLs remain
unchanged after template resolution instead of being anchored to ContextDir or
WorkingDirectory. Apply the same remote classification to build.context,
build.dockerfile, build.bake.file, and each entry in build.bake.files, while
preserving filesystem anchoring for local paths; add regression coverage for
remote context, Dockerfile, and Bake definitions.

---

Nitpick comments:
In `@pkg/runner/step/container_actions_extra_test.go`:
- Around line 209-284: The tests covering bake path resolution and build-cache
path resolution should use table-driven scenarios instead of separate t.Run
blocks. Refactor the cases in the relevant test functions around
buildBuildConfig and resolveBuildCache into case tables containing inputs and
expected outputs, then iterate over each table entry with t.Run while preserving
the existing assertions and distinct behavior for relative, absolute, local, and
non-local paths.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: f96657a1-4197-4134-9bba-e825b0523697

📥 Commits

Reviewing files that changed from the base of the PR and between 4142228 and 1f72f48.

📒 Files selected for processing (6)
  • docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md
  • internal/exec/workflow_utils.go
  • internal/exec/workflow_utils_test.go
  • pkg/runner/step/container_actions_extra_test.go
  • pkg/runner/step/container_build.go
  • pkg/runner/step/container_test.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • pkg/runner/step/container_test.go

Comment thread docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md Outdated
Comment thread internal/exec/workflow_utils_test.go Outdated
…rror context

Address CodeRabbit findings on PR #2880:
- Remove the host-specific /tmp/atmos-field-test/ path from the fix doc,
  replacing it with a worktree-relative fixture reference.
- Split TestBuildWorkflowStepError and TestBuildWorkflowStepErrorPreservesInnerHintsAndContext
  out of workflow_utils_test.go into a focused workflow_step_error_test.go,
  keeping step-error tests co-located and out of the oversized (pre-existing)
  workflow_utils_test.go file.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@github-actions github-actions Bot added size/l Large size PR and removed size/m Medium size PR labels Aug 6, 2026
coderabbitai[bot]
coderabbitai Bot previously approved these changes Aug 6, 2026
…ache anchoring

Codecov flagged container_build.go's patch coverage below 85% after the
bake/cache anchoring follow-up. Add regression tests for the three
previously-uncovered error branches: resolveBakeFiles propagating a
per-entry template failure, anchorCacheLocalPaths' own resolve failure, and
that failure propagating out through resolveBuildCache. handler_base.go's
remaining gap (os.Getwd/filepath.Abs failing inside resolveWorkingDirectory)
is left uncovered deliberately -- it requires corrupting the process's own
working directory to reach, has no DI seam, and matches this repo's existing
untested pattern for the identical os.Getwd/filepath.Abs fallback in
container_run.go.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@internal/exec/workflow_step_error_test.go`:
- Around line 27-28: Update all table cases in the workflow path tests to create
an absolute root with t.TempDir(), then construct WorkflowPath and
WorkflowBasePath using filepath.Join instead of hard-coded Unix paths. Normalize
any expected nested-path suffix used in assertions with filepath.ToSlash,
applying the same construction consistently across every listed case.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: fa40af1a-ee6d-4358-ae85-02a453f6f776

📥 Commits

Reviewing files that changed from the base of the PR and between 1f72f48 and 7aabbc2.

📒 Files selected for processing (4)
  • docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md
  • internal/exec/workflow_step_error_test.go
  • internal/exec/workflow_utils_test.go
  • pkg/runner/step/container_actions_extra_test.go
💤 Files with no reviewable changes (1)
  • internal/exec/workflow_utils_test.go
🚧 Files skipped from review as they are similar to previous changes (2)
  • docs/fixes/2026-08-05-step-handlers-ignore-working-directory.md
  • pkg/runner/step/container_actions_extra_test.go

Comment thread internal/exec/workflow_step_error_test.go
…nection refused)

CI's Check Markdown Links job failed on docs/prd/archive-step.md's citation
of the SOURCE_DATE_EPOCH origin -- the CI runner's outbound request was
refused while the page returns 200 OK outside CI. Follows the repo's
existing precedent for excluding CI-hostile hosts (docs.docker.com,
otelic.com, taskfile.dev, etc.) in lychee.toml.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
coderabbitai[bot]
coderabbitai Bot previously approved these changes Aug 7, 2026
An explicit working_directory: on a kind: step/kind: steps hook was always
resolved against the Atmos process's own cwd, regardless of shape. Following
docs/prd/base-path-resolution-semantics.md's existing Dot/Bare convention: a
dot-prefixed value (., .., ./x, ../x) keeps resolving against the process
cwd; a bare relative value (x, x/y) now resolves against the component's
own working directory instead -- the same directory ComponentPath(ctx)
already computes for the unset-default case, so this stays compatible with
provisioned working directories and metadata.component aliasing for free.
Workflows and custom commands are unaffected -- they have no "current
component" concept, so bare-relative values there still resolve against the
process cwd exactly as before.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
@aknysh
Andriy Knysh (aknysh) added this pull request to the merge queue Aug 8, 2026
@atmos-pro

atmos-pro Bot commented Aug 8, 2026 •

Copy link
Copy Markdown
Contributor

Tip

Atmos Pro  

No affected stacks workflow was detected for this pull request.
If this is expected, no action is needed.
Learn More. Ask AI.

@github-merge-queue
github-merge-queue Bot removed this pull request from the merge queue due to failed status checks Aug 8, 2026
…_EVENT_PATH

TestSetDescribeAffectedFlagValueInCliArgs_BaseResolution's merge_group
subtest only overrode GITHUB_ACTIONS/GITHUB_EVENT_NAME/GITHUB_BASE_REF,
so it depended on $GITHUB_EVENT_PATH being unset in the ambient
environment. That's true for local/regular CI runs, but not when the
test itself runs inside a real GitHub Actions merge_group job (i.e.
the merge queue): the real event payload's merge_group.base_sha then
takes precedence over the simulated GITHUB_BASE_REF, resolving to a
SHA instead of the "refs/remotes/origin/main" ref the test asserts.

This was failing the merge queue for this PR and, independently, for
#2900 and #2903 as well -- confirmed pre-existing and unrelated to any
of their changes. Fixed by explicitly forcing GITHUB_EVENT_PATH="" so
the subtest deterministically exercises the fallback path it's meant
to test, regardless of the real job's event context.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
- github.com/go-git/go-git/v5: v5.19.1 -> v5.19.2, fixing GHSA-hc8v-wwc9-vgxm
  (symlink traversal in worktree operations) and the companion malicious
  reference-name advisory (#270, #271). Patch-level bump, no API changes.
- website: dompurify pnpm override ^3.4.12 -> ^3.4.13, fixing an IN_PLACE
  hook removal XSS (#272).
- website: nanoid pnpm overrides bumped to ^3.3.17 (added a second
  selector, nanoid@^3.3.16, to also catch postcss's own nanoid range,
  which the existing nanoid@3.3.3 selector didn't match), fixing two
  indefinite-loop DoS advisories (#273, #274). The nanoid 5.x line was
  already patched by the existing override.
- NOTICE regenerated for the go-git/dompurify/nanoid version bumps.

Not fixed: image-size (#275, #276, both DoS via infinite loop) has no
patched release yet as of this commit -- GitHub's advisories list
"<= 2.0.2" as vulnerable with no first_patched_version. Left as-is
pending an upstream fix.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…step-workdir

# Conflicts:
#	internal/exec/describe_affected_test.go
#	website/package.json
#	website/pnpm-lock.yaml
@aknysh
Andriy Knysh (aknysh) added this pull request to the merge queue Aug 10, 2026
@atmos-pro

atmos-pro Bot commented Aug 10, 2026 •

Copy link
Copy Markdown
Contributor

Tip

Atmos Pro  

No affected stacks workflow was detected for this pull request.
If this is expected, no action is needed.
Learn More. Ask AI.

Merged via the queue into main with commit ee9769f Aug 10, 2026
172 of 175 checks passed
@aknysh
Andriy Knysh (aknysh) deleted the osterman/fix-archive-step-workdir branch August 10, 2026 21:55
@atmos-pro

atmos-pro Bot commented Aug 10, 2026 •

Copy link
Copy Markdown
Contributor

Tip

Atmos Pro  

No affected stacks workflow was detected for this pull request.
If this is expected, no action is needed.
Learn More. Ask AI.

@github-actions

Copy link
Copy Markdown

These changes were released in v1.226.0-rc.4.

Erik Osterman (Cloud Posse) (osterman) added a commit that referenced this pull request Aug 12, 2026
TestCustomCommandContainerBuildPassesWithBlockToDocker asserted the
buildx argv contained bare "Dockerfile" and "app" strings. Since
main's #2880 (resolve relative paths against step.WorkingDirectory),
context: and dockerfile: values in a with: block are correctly
resolved to absolute paths before reaching docker, so the argv now
contains the full resolved paths instead of the bare relative
strings. Docker still receives the same file -- update the
assertions to check for the resolved absolute paths.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Michael Pursifull (arcaven) pushed a commit to arcaven/atmos that referenced this pull request Aug 19, 2026
…cloudposse#2879)

* test(container): cover combined buildx driver/cache/tags/context args

Strengthens pkg/container's pure arg-building test with a case combining
engine, driver, cache, custom dockerfile/context, and tags in a single
config, closing the one remaining gap versus per-field-only coverage.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(git): tolerate config errors for CI git-clone bootstrap pre-Cobra

atmos git clone in a fresh CI workspace (no atmos.yaml yet, e.g. a profile
referenced by CI config) failed with "profile not found" before ever
attempting the clone, and ATMOS_CI=true had no effect. Execute() runs an
initial cfg.InitCliConfig before Cobra resolves any command; only the
second, PersistentPreRun-scoped InitCliConfig call knew how to tolerate
the CI bootstrap clone's expected missing config (applyCIGitCloneBootstrap),
so the first call's error aborted the process before that check could run.

Add isCIGitCloneBootstrapArgs, an os.Args-based equivalent of the existing
cmd-aware bootstrap check, so the pre-Cobra handler recognizes the same
no-argument `atmos git clone` shape and defers to the same
ATMOS_CI/CI-provider resolution (via the new exported
CIGitCloneModeRequestedFromEnv) before Cobra ever parses the command.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): record CI git-clone bootstrap profile fix

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(git): parse CI bootstrap flags with real pflag arity, not a heuristic

The pre-Cobra CI git-clone bootstrap check (added in the prior commit)
disqualified the bootstrap on any bare, non-"-"-prefixed token, including a
space-separated flag value like the "0" in `--depth 0`. That misread a
value-taking flag's argument as a positional repo name/URI, so the exact
reported reproduction (`atmos git clone --ci --depth 0` in a fresh CI
workspace) still failed on "profile not found".

Replace the heuristic with CIGitCloneBootstrapRequestedFromRawArgs, which
parses the clone-specific args against a throwaway command carrying the
real clone flag set (a fresh newCloneParser() instance, never the shared
singleton) via actual pflag parsing, then defers to the existing
CICloneBootstrapRequested. This also lets an explicit --ci/--ci=false in
the raw args be honored before Cobra resolves the command, which the
removed env-only CIGitCloneModeRequestedFromEnv could not do.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): update CI git-clone bootstrap fix record for pflag rewrite

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(schema): decode with: into Build/Run/Push/Inspect for custom commands

Fixes cloudposse#2876. A custom command's `type: container` step with
a `with:` block (engine, driver, cache, tags, etc.) silently dropped
everything, falling back to a bare `docker build -f Dockerfile .`, when
loaded from a commands.yaml merged into atmos.yaml's Viper config tree.

Root cause: `with:` is polymorphic -- decoded into Build/Run/Push/Inspect
for `type: container` steps, or the generic With map otherwise -- but that
promotion lives entirely in Task.UnmarshalYAML/WorkflowStep.UnmarshalYAML
(go-yaml's yaml.Unmarshaler interface), invoked only when something calls
yaml.Node.Decode directly (e.g. standalone workflows/*.yaml files via
pkg/utils.UnmarshalYAMLFromFile). Custom commands merged into atmos.yaml
decode via Viper's mapstructure pipeline (TasksDecodeHook ->
decodeTaskFromMap), which never invokes yaml.Unmarshaler and had no
equivalent promotion, so `with:` only ever reached the raw generic map.

decodeTaskFromMap now pulls `with:` out before the mapstructure decode and
replays the same polymorphic decode via decodeStepWith, round-tripping the
value through YAML so both code paths share one implementation and can't
drift apart.

Reproduced through the real production paths per the bug report's request:
config loaded via InitCliConfig (pkg/config), and the full custom command
executed via RootCmd through a fake logging docker executable (cmd/) --
not by manually constructing schema.Task/WorkflowStep/ContainerBuildStep
literals, which would have bypassed the actual decode bug. Added a
complementary test proving workflow-file and custom-command steps decode
with: identically, per the report's public-contract requirement.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir): sanitize nested component names in BuildPath

A component name containing "/" (e.g. a nested layout like ecs/cluster)
made workdir.BuildPath produce a real extra subdirectory instead of a
single path segment, since the name was interpolated into "<stack>-<name>"
without escaping and then filepath.Join'd. That put the nested component's
workdir one level deeper than a flat component's at the same stack.

Any path computed relative to the workdir -- most visibly a relative
`backend.local.path` template like `../../../.context/tfstate/...` --
therefore climbed to a different real ancestor for the nested component
than for the flat one, silently writing state under a different root
(<repo>/.workdir/.context/... instead of <repo>/.context/...) even though
both components used the identical backend config.

Sanitize the component name the same way internal/exec/terraform_generate_
backends.go already does for backend template context: replace "/" with
"-" before building the workdir directory name. BuildPath is the single
formula reused by the source provisioner and by internal/terraform_backend's
JIT-workdir state lookup, so both pick up the fix.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): record custom-command with: and workdir path-depth fixes

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(terraform/output): retarget containment-guard test at stack traversal; surface cached output lookups

BuildPath now sanitizes "/" out of component names, so the containment
guard test's traversal-via-component vector no longer escapes BasePath.
Retarget it at the stack argument, which isn't sanitized the same way and
still needs the guard. Also make cache-hit output lookups emit the same
visible "Fetching ..." notification a real fetch would, instead of only a
Debug-level log, so a second output lookup on an already-cached component
isn't silently invisible.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(terraform/output): strip ANSI before asserting cache-hit visibility; correct fix-log formatter name

CI forces color output (CI=true), which makes the markdown-based UI
renderer split "Fetching vpc_id ..." into multiple ANSI-styled runs right
at the literal underscore, without dropping or reordering any visible
characters. Strip ANSI before the assert.Contains checks, matching the
ansi.Strip convention already used elsewhere in the test suite.

Also correct the fix-log's "gofmt" validation bullet to "gofumpt", the
formatter this repo actually mandates and runs.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* chore(claude): deny gofmt in Claude Code permissions

Repo mandates gofumpt, not gofmt (CLAUDE.md, .golangci.yml). Denying the
raw command prevents Claude Code from running gofmt directly.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test: close Codecov patch-coverage gaps on PR cloudposse#2879

Adds behavior-focused tests for the 5 lines Codecov flagged as uncovered
on this branch's added code: isCIGitCloneBootstrapArgs's len(args) < 1
guard, decodeTaskFromMap/decodeStepWithFromMapValue's three error-wrap
branches (invalid container action, yaml.Marshal failure via a
yaml.Marshaler that errors, yaml.Unmarshal failure via a dangling YAML
alias), and resolveOutputFromCache's cache-miss and getOutputVariable-
error branches. No production code changes; no assertions weakened.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): record terraform/output CI fixes; correct gofmt->gofumpt typo

Two fixes from this branch (cache-hit output lookups now visible;
containment-guard test retargeted at the still-open stack-traversal
vector after the workdir fix closed the component-name one) had no
docs/fixes/ record. Also corrects a stale "gofmt" mention in the
git-clone-ci-bootstrap doc to "gofumpt", matching the correction already
applied to the container with-block doc.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test(registry): widen timing margin in provider-mirror concurrency test

Fixes a flaky Windows Acceptance Tests failure: resolving 10 platforms
took 784ms against a 750ms threshold, even though that's nowhere near the
1.5s serial floor the test guards against. Raises the bound to 4/5 of the
serial floor (1200ms) for headroom against normal CI timing variance,
Windows runners especially. No production code changed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir): sanitize nested component names in createWorkdirDirectory

createWorkdirDirectory duplicated the unsanitized stack-componentName
formula that BuildPath was already fixed to sanitize, so a local
(non-source) component with provision.workdir.enabled: true and a
nested name still got a workdir one level deeper than a flat sibling,
silently shifting where relative backend.local.path state resolves.
Now delegates to BuildPath so both formulas can't drift apart again.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(provisioner): guard path traversal in source-vendoring fallback

DetermineTargetDirectory's non-workdir fallback (the default vendoring
path when provision.workdir.enabled is unset) joined the component
base path with the raw component name with no containment check, so a
component named with ../ segments could vendor outside
components/terraform/. Adds the same absolutize-and-prefix containment
guard already used by the two other BuildPath-derived callers.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cli): decode and execute custom-command step-level container: overrides

Sibling gap to the with: block fix (docs/fixes/2026-08-05-custom-
command-container-with-block-dropped.md): a custom command step's
container: override went through three independent failures. The
bare boolean opt-out (container: false) broke InitCliConfig for the
whole atmos.yaml because decodeTaskFromMap never round-tripped
container: through YAML the way with: now does. The mapping form
decoded fine but was never consulted at execution time -- the
custom-command step loop always ran type: shell steps on the host.
And once both of those were fixed, container: false still ran the
step inside a container because cloneCommand's JSON round-trip
silently dropped WorkflowContainer.Enabled (json:"-"), inverting the
opt-out.

Fixes all three: decodeTaskContainerFromMapValue mirrors the with:
fix's round-trip for container:, cmd/cmd_utils.go's step loop now
reuses the same pkg/workflow/container.go session logic the
workflow-file path already uses, and WorkflowContainer gained
MarshalJSON/UnmarshalJSON so Enabled survives a JSON round-trip.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(container): pass restart/healthcheck through to ephemeral run steps

ContainerRunStep.Restart/.HealthCheck decoded fine but EphemeralConfig
(the runtime config for type: container, action: run steps) had no
such fields, and buildRunConfig never populated them -- unlike the
persistent-component path, which already wires the same settings.
Adds the fields to EphemeralConfig and populates them via the
existing (previously unused for this path) RestartPolicyFromStep/
HealthCheckFromStep helpers, so --restart/--health-* flags now reach
the real docker/podman invocation for step-based container runs.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(config): surface swallowed import errors and hide-nothing validation

Two DX gaps where already-computed diagnostic detail never reached
the default log level: a YAML syntax error in an import:-loaded
commands file was silently swallowed (Debug-only), leaving only a
generic "Unknown command" with no hint a config file failed to parse;
and container-step validation (missing required field, invalid pull:
value) already computed the field/step/type and the bad value but
only exposed them via --verbose or dropped them entirely.

LocalAdapter now pairs its existing log.Debug with a ui.Warning
naming the file and parse error. ValidateRequired's default message
now names the field; invalidContainerField now echoes the actual
invalid value typed.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(security): remediate 7 Dependabot alerts in website dependencies

Bumps three pnpm.overrides pins to their patched releases, all within
the major-version line dependabot.yml's ignore policy allows:

- js-yaml 3.15.0 -> 3.15.1 (GHSA-5p4m-2wfm-xmqj, alert cloudposse#269)
- js-yaml 4.3.0 -> 4.3.1 (GHSA-5p4m-2wfm-xmqj, alert cloudposse#268)
- mermaid 11.16.0 -> 11.16.1 (GHSA-rhh3-jpg6-66xh cloudposse#267,
  GHSA-c4c3-pg64-4m4v cloudposse#266, GHSA-6x64-9x62-f2gx cloudposse#265,
  GHSA-3rrr-jr9j-h3q3 cloudposse#264, GHSA-2v8p-3f2j-5mp7 cloudposse#263)

Verified via `pnpm run build` in website/; NOTICE unchanged (no
license changes from these patch bumps).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(schema): reject unknown fields in container step with:/driver: blocks

The JSON Schema for a container step's with: block already documented
it as "validated by the step handler at run time," but nothing
fulfilled that promise for unknown keys -- yaml.Node.Decode (used by
both the workflow-file and custom-command loading paths) has no
strict/KnownFields mode, so a typo'd field like `platforms:` was
silently dropped with no error. This masked a real pre-existing test
bug: TestWorkflowStep_DecodeWith's push-action case used `tag: v1`
instead of the actual `tags: []string` field and passed anyway.

decodeYAMLInto and ContainerDriverConfig.UnmarshalYAML now decode
through a stream-level yaml.Decoder with KnownFields(true) (the only
place go-yaml exposes strict decoding) instead of plain node.Decode,
scoped narrowly to the typed container structs -- the generic with:
map[string]any fallback other step types use is untouched.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(security): remediate 5 Dependabot alerts, 2 unpatched and deferred

- github.com/go-git/go-git/v5 5.19.1 -> 5.19.2 (GHSA-hc8v-wwc9-vgxm
  cloudposse#270, GHSA-qgq7-7hm3-q39j cloudposse#271), pulling in patch bumps to
  golang.org/x/{mod,net,text,tools} via go mod tidy
- nanoid pnpm override widened from a pinned 3.3.3->^3.3.15 mapping to
  a ^3->^3.3.17 range so every 3.x requester resolves past both
  vulnerable versions (GHSA-28wg-ghj8-5hjv cloudposse#274, GHSA-2v37-7h3g-55p8
  cloudposse#273); previously two different 3.x versions were resolving
  simultaneously because the override only matched exact-version
  requests
- dompurify pnpm override 3.4.12 -> 3.4.13 (GHSA-55q2-fjhq-7xh7 cloudposse#272)

image-size alerts cloudposse#275/cloudposse#276 (GHSA-5p2g-fcmc-qvqq, GHSA-w3rx-r6r6-pgpr)
have no first_patched_version yet in any release line -- left open,
nothing to bump to.

Verified via `go build ./...`, targeted go-git-consumer package tests,
and `pnpm run build`; NOTICE regenerated (version-string changes only,
no license changes).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd): update stale path assertions in container build argv test

TestCustomCommandContainerBuildPassesWithBlockToDocker asserted the
buildx argv contained bare "Dockerfile" and "app" strings. Since
main's cloudposse#2880 (resolve relative paths against step.WorkingDirectory),
context: and dockerfile: values in a with: block are correctly
resolved to absolute paths before reaching docker, so the argv now
contains the full resolved paths instead of the bare relative
strings. Docker still receives the same file -- update the
assertions to check for the resolved absolute paths.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(provisioner): pass OutputWriters in nested-workdir Provision test

Merging origin/main's fix(terraform): prevent concurrent output
corruption (cloudposse#2898) added a fourth provisioner.OutputWriters parameter
to (*Service).Provision. Every call site main's own history knew
about was updated by that commit, but this branch's own
TestServiceProvision_NestedComponentName_SanitizesLikeBuildPath
(added by an earlier, unrelated fix on this branch) didn't exist in
main's history, so git's auto-merge had nothing to reconcile it
against and left the stale three-argument call in place -- a compile
failure only visible once this branch actually merges main, which is
exactly what GitHub Actions' implicit PR-merge checkout does on every
CI run regardless of whether this branch has locally merged yet.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test(cmd): assert cache/driver flag values, not just presence

TestCustomCommandContainerBuildPassesWithBlockToDocker only checked
that --cache-from/--cache-to/--builder appeared somewhere in the
argv, not that they carried the configured registry ref, mode=max, or
driver. The driver: block also provisions a real Buildx builder via a
separate `docker buildx create` invocation (pkg/container/docker.go's
ensureBuilder) that the fake runtime already recorded but the test
never inspected. Adds table-driven flag-value assertions covering
both the create and build invocations.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd): normalize marker path for cross-platform shell command

markerPath comes from t.TempDir(), which contains backslashes on
Windows. The step command string goes through Atmos's mvdan/sh
interpreter, which treats \ as an escape character, so the
redirection target would resolve to a mangled path. Convert to
slashes and quote the path.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(provisioner): sanitize backslash in workdir component names

BuildPath sanitized "/" in a component name to prevent it from
adding a real directory level, but not "\", which is Windows' actual
path separator. A crafted or copy-pasted component name containing
"\" (e.g. "..\\..\\evil") would let filepath.Join/Clean treat it as
real ".."-traversal segments on that platform, escaping the intended
workdir root. Sanitize "\" identically and unconditionally on every
platform, matching the existing "/" handling, so a given component
name's workdir path also stays identical across OSes.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test(runner): make step-name assertion independent, cover empty type

The default-message test used step name "run" and field "run.image",
so the step-name assertion could pass even if ValidateRequired
dropped the step name entirely, since "run.image" also contains
"run". Converted to a table with a distinct step name/field per case
and no shared substrings, and added a step.Type == "" case to cover
the previously-untested branch that omits the "(type ...)" clause.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(schema): reject unknown fields in container: override blocks

WorkflowContainer.UnmarshalYAML's mapping branch used plain
value.Decode, so a typo'd field (e.g. `imgae` instead of `image`) in
a workflow-level or step-level container: block was silently
discarded rather than rejected -- the same class of gap already fixed
for with: blocks in decodeYAMLInto. Use the existing
decodeYAMLKnownFields helper instead, and add regression coverage for
both the workflow-file (yaml.Unmarshal) and custom-command
(mapstructure + TasksDecodeHook) decode paths.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixtures): sync workdir-nested fixture with path-safety fixes

The README still documented the pre-fix behavior for the
app/local-nested "known bug" scenario and the ../escape-test-nowd
path-traversal probe, which are both now fixed on this branch.
Re-verified both scenarios for real (atmos terraform apply/source
pull against the fixture) and updated the manual-testing steps and
expected output to match: the nested local component now sanitizes
to a sibling workdir, and the unguarded probe now fails with
ErrPathTraversal instead of vendoring outside components/terraform/.
Updated the .gitignore comment on the now-defensive-only
escape-test-nowd entry accordingly.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): correct formatter name, markdown syntax, typos, spelling

- gofmt -> gofumpt (the repository-required formatter)
- double-backtick delimiter for a code span containing a literal
  backtick, which single backticks can't escape in Markdown
- add `text` language identifiers to unlabeled fenced output blocks
- "on a already-parsed" -> "on an already-parsed"
- "macos" -> "macOS" in a CI platform list

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): correct macOS spelling in CI platform list

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(provisioner): use filepath.Rel for component base path containment

The naive absBase+separator prefix check breaks when componentBasePath
resolves to a filesystem root ("/" on Unix, "C:\" on Windows): absBase
already ends in the separator there, so the literal absBase+sep prefix
("//" or "C:\\") never matches any real descendant, rejecting every
valid target with ErrPathTraversal. filepath.Rel doesn't have this
edge case.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(schema): wrap WorkflowContainer JSON decode error

UnmarshalJSON returned the raw json.Unmarshal error directly instead
of wrapping it with a static error from errors/errors.go, so callers
couldn't classify a WorkflowContainer JSON decode failure the way
they already can for its YAML counterpart. Wrap with the existing
ErrInvalidWorkflowContainer sentinel, matching UnmarshalYAML.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixtures): sync stack-manifest comments with path-safety fixes

The comments on the three path-traversal probes in this fixture's
dev.yaml still described pre-fix behavior (determineSourceTargetDirectory
having no containment guard, DetermineTargetDirectory's non-workdir
fallback having no sanitization, createWorkdirDirectory reimplementing
an unsanitized formula) even though all three are now fixed on this
branch. Updated to describe the current, correct expected behavior,
matching the README sync in the prior commit.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(provisioner,cmd): close symlink containment gap and route script steps through container overrides

- pkg/provisioner/source: validateWithinComponentBasePath now resolves
  symlinks in the existing portion of target/base paths before checking
  containment, closing a bypass where a symlink under componentBasePath
  pointing outside it passed the old lexical-only check.
- cmd/cmd_utils: type: script custom-command steps now route through
  StepContainerOverride/RunStepContainerOverride like type: shell steps
  already do, instead of silently ignoring a step-level container: override.
- tests/fixtures: drop the POSIX-only /dev/stderr log destination from the
  source-provisioner-workdir-nested fixture.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd): propagate Cobra cancellation to custom-command step execution

executor.Execute and both RunStepContainerOverride call sites in
executeCustomCommand used context.Background() instead of cmd.Context(),
so a Ctrl-C on the top-level invocation couldn't cancel an extended step
handler or a container runtime operation. Derive one executionCtx from
cmd.Context() (falling back to context.Background() for direct-test
invocations), mirroring the existing depCtx pattern used for dependency
graph execution in the same function.

Addresses CodeRabbit review comment on PR cloudposse#2879.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): add missing comma after "e.g." in fix-log doc

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd,schema): address CodeRabbit findings on PR cloudposse#2879

Completes Cobra-cancellation propagation to the remaining
context.Background() call sites in executeCustomCommand, wraps
with:/container: decode failures with their static sentinel errors so
errors.Is works regardless of which decode step fails, and extends
cmd.NewTestKit(t) to restore RootCmd.Commands() between tests so custom
commands registered by one test no longer leak into the next. Also fixes
comment/doc-accuracy nits (godot periods, exported test-double doc
comments, and two docs/fixes/*.md wording corrections).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(workdir): document BuildPath's separator sanitization in its doc comment

CodeRabbit nitpick on PR cloudposse#2879: the doc comment didn't mention that both
"/" and "\" are replaced with "-", only the inline comment did.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test(cmd): add regression test for RootCmd.Commands() restoration

Addresses CodeRabbit findings on PR cloudposse#2879: a dedicated table-driven test
was missing for restoreRootCmdCommands (confirmed failing pre-fix,
passing post-fix), plus a comment period and an inconsistent
path-traversal probe description in a test fixture README.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir,schema): close BuildPath collision/traversal gaps, stop mutating caller task maps

Addresses CodeRabbit findings on PR cloudposse#2879:

- workdir.BuildPath encoded "/" and "-" identically, so components named
  e.g. "app/local" and "app-local" collided on the same workdir, sharing
  files, metadata, and Terraform state. Encode "/" and "\" as "--" instead.
- BuildPath validated the component name but never the stack name, both of
  which come from user-controlled YAML; a crafted stack value could escape
  BasePath. Move a shared containment check into BuildPath itself so all
  six call sites get it, instead of the two ad hoc copies that existed
  before (and the four call sites that had none).
- decodeTaskFromMap deleted "with"/"container" keys in place, which could
  mutate the caller's own map (e.g. Viper's live config tree) when earlier
  normalization steps returned it unchanged instead of a copy.

Also converts a hard-coded JIT-workdir test case to table-driven per a
separate nitpick on the same PR.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* docs(fixes): fix EditorConfig indentation in workdir fix-log doc

The numbered list's continuation lines used 3-space indentation
(aligned under the "1. " marker), which fails the repo's
indent_size=2 EditorConfig rule (want multiple of 2). CI's
"Run pre-commit hooks" job caught this. Switched to the 2-space
continuation indentation already used elsewhere in docs/fixes/.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir,cmd): make BuildPath's encoding fully injective, restore removed RootCmd commands

Addresses a second CodeRabbit review pass on PR cloudposse#2879:

- The prior "/" -> "--" fix for workdir.BuildPath's component-name
  collision was still not injective: a component literally named
  "app--local" collided with "app/local" (both encode to "app--local").
  Replaced it with a fully injective scheme -- escape the literal hyphen
  ("-" -> "-h") before encoding separators ("/" or "\" -> "-s") -- so "-"
  never appears unescaped in the output and no two distinct component
  names can produce the same encoded path segment. This changes the
  on-disk workdir directory name for existing hyphenated components;
  updated every hardcoded expected-path assertion this touched across
  six packages, several switched to compute the expected path via the
  real BuildPath instead of a hand-rolled formula so they can't go stale
  the same way again.
- restoreRootCmdCommands (added in an earlier pass on this PR) only
  removed commands added to RootCmd after a NewTestKit snapshot; a
  command present in the snapshot but removed mid-test (via
  RootCmd.RemoveCommand) stayed gone for every later test. It now also
  re-adds any snapshot command whose Parent() is no longer RootCmd.

Also fixes a godot comment-period nit and stale sanitized-name comments
in a fixture referencing the earlier "--" encoding.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test: update hardcoded workdir names for BuildPath's injective encoding

Fixes CI failures on all three platforms (linux/windows/macos) from the
previous commit: several tests hardcoded the pre-encoding workdir
directory name (e.g. "dev-vpc-remote-workdir", "dev-null-label-exports",
"test-producer-from-source") instead of the new "-h"/"-s" escaped form
BuildPath now produces for hyphenated component names. These packages
weren't covered by the test sweep before that commit landed:
pkg/ci/plugins/terraform and the tests/ acceptance suite's JIT-source and
source-provisioner-workdir tests.

The pkg/git TestDefaultBranchAndGitHubRepository failure on the Windows
run is unrelated -- a transient runner permission error on
C:/Users/runneradmin/.gitconfig, not a code issue.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir): give backslash its own escape token, route CleanWorkdir through BuildPath

Addresses a third CodeRabbit review pass on PR cloudposse#2879:

- escapeComponentNameForPath aliased "/" and "\" to the same "-s" token,
  so "ecs/cluster" and `ecs\cluster` still collided. The aliasing was
  meant to keep a component name's encoding OS-independent, but that's
  already guaranteed by the encoding being pure Go string processing
  (never delegated to path/filepath) -- so backslash now gets its own
  token ("-b") at no cost to that property.
- CleanWorkdir had its own separate, unsanitized stack+"-"+component
  formula, never routed through BuildPath. It already couldn't find
  workdirs for "/"-containing components; the encoding fixes on this PR
  widened that to ordinary hyphenated components too. Now delegates to
  BuildPath like every other consumer.
- TestCustomCommandStepContainerFalseOptOutRunsOnHost only proved the
  host command ran, not that docker was never invoked. Now installs the
  fake container runtime and asserts its argument log was never created.
- Two other fix-log docs and this PR's own fix-log doc still described
  earlier, now-superseded encoding examples; updated for consistency.
- Replaced a slash-delimited path literal with filepath.Join in a test.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir): handle filesystem-root basePath, de-tautologize workdir_path_test oracles

containWithinBase's absBase+separator prefix check rejected every legitimate
workdir path when basePath resolved to a filesystem root (absBase already
ends in the separator there, so absBase+sep doubled up). Switch to
filepath.Rel, mirroring pkg/provisioner/source/source.go's isWithinBase.

Also replace pkg/component/workdir_path_test.go's BuildPath-derived expected
paths with independent hand-computed literals: BuildAndResolveWorkdirPath
calls the same BuildPath internally, so a setup+assertion pair that both
called BuildPath would silently agree on a wrong path if the encoding ever
regressed again.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* test: cover BuildPath's error-propagation branches across workdir consumers

Adds behavioral tests for the (string, error) BuildPath signature change:
stack-name path-traversal now returns errUtils.ErrPathTraversal instead of
silently resolving, and every caller's new `if err != nil` branch needs its
own test to prove it actually forwards/wraps that error rather than
swallowing it. Also covers resolveExistingSymlinks's non-ENOENT propagation
and buildWorkdirPath's empty-BasePath default, both left untested by the
original patch.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir,cmd,tests): contain stack traversal to component-type root, fix bootstrap flag inheritance, fix mock fixture marker

pkg/provisioner/workdir/types.go: BuildPath validated the derived path against
basePath only, but stack (unlike component) was never escaped before being
folded into workdirName -- a stack like "../../components" resolves inside
basePath while still escaping .workdir/<componentType>. Now also validates
against the canonical per-component-type workdir root.

cmd/git/bootstrap.go: CIGitCloneBootstrapRequestedFromRawArgs's throwaway
Cobra tree only registered clone-specific flags, so an inherited global flag
like --config made clone.ParseFlags reject the args and silently report no
CI-bootstrap request. Now registers the real global persistent flags before
parsing.

tests/fixtures/.../components/terraform/mock/main.tf: was byte-identical to
the vendored source-modules/mock/main.tf, including its "vendored" header --
the local component is never vendored, so its component_type marker couldn't
distinguish which module actually produced a given state.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir,cmd/git): address PR cloudposse#2879 CodeRabbit round and fix local-backend state loss on re-provision

CodeRabbit review round on PR cloudposse#2879 (verified against current code, not just
the diff it saw):

- pkg/provisioner/source/source.go: attach underlying filesystem errors to
  symlink-resolution failures instead of discarding them.
- pkg/provisioner/workdir/types.go: BuildPath rejects a stack name containing
  "/" or "\" instead of only checking containment after the fact, closing a
  workdir-collision gap (e.g. stack "team/../prod" aliasing stack "prod").
- pkg/provisioner/workdir/clean.go, cmd/terraform/workdir/workdir_helpers.go:
  CleanWorkdir/GetWorkdirInfo/DescribeWorkdir now honor atmos_component
  overrides via BuildPath. The CLI-wired DefaultWorkdirManager had its own
  separate, never-updated path formula that couldn't find any hyphenated
  component's real workdir at all -- fixed too.
- pkg/provisioner/workdir/workdir.go: best-effort migration of a workdir
  found at the pre-escaping path onto the new encoded one, so upgrading
  doesn't orphan existing local state.
- cmd/git/bootstrap.go: a malformed `atmos git clone --depth not-a-number`
  no longer gets masked by an unrelated config/profile error; Cobra's own
  flag-parsing error now surfaces as intended.

Also fixes a real, separate bug found while testing the above: workdir sync
was deleting local-backend Terraform state (terraform.tfstate) on every
re-provision, since only provider lock files and the workspace-specific
terraform.tfstate.d/ were protected from the sync's delete-orphaned-files
pass. A local-backend component's state was silently gone after the second
run. shouldSkipSyncFile now also protects terraform.tfstate,
terraform.tfstate.backup, and .terraform.tfstate.lock.info.

See docs/fixes/2026-08-17-pr2879-coderabbit-round-workdir-and-bootstrap-fixes.md
and docs/fixes/2026-08-17-workdir-sync-deletes-local-backend-state.md for
full details, and website/blog/2026-08-17-container-config-validation-and-workdir-path-encoding.mdx
for the user-facing changelog.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(workdir): reject only '.'/'..' segments in stack, not every '/'

CI caught a real regression from the previous commit's validateStackForPath:
rejecting any stack value containing "/" broke cmd/terraform/migrate's own
test fixtures (stack "deploy/test") and, transitively, three
tests/cli_workdir_test.go fixtures for hyphenated component names.

Only a literal "." or ".." path segment is an actual collision/traversal
risk (filepath.Join's implicit Clean() can fold it away, aliasing e.g. stack
"team/../prod" onto stack "prod"). A plain "/" without such a segment, like
"deploy/test", is a real, already-supported nesting convention with no
traversal risk -- it just becomes a real subdirectory, exactly as it always
has. Narrowed the check accordingly.

Also fixed tests/cli_workdir_test.go's testWorkdirShow/testWorkdirDescribe/
testWorkdirCleanSpecific fixtures, which hand-rolled a pre-escaping workdir
path for a hyphenated component name instead of computing it via BuildPath
-- the same class of drift the prior commit's CleanWorkdir fix addressed.
testWorkdirShow/testWorkdirDescribe had been silently masking their own
breakage via a weak assert.Contains check that passed on error output too;
tightened to require.NoError.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* refactor(cmd): extract shared container-override step helper

The "shell" and "script" custom-command step cases each built an identical
workflowPkg.ContainerStepParams and called RunStepContainerOverride, differing
only in the workflowStep and the display command. Extracted into a shared
runContainerOverrideStep closure.

No behavior change: TestCustomCommandStepContainerOverrideRunsInsideContainer
(shell), its _ScriptType variant, and TestCustomCommandStepContainerFalseOptOutRunsOnHost
all still pass.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd,workdir,terraform): address PR cloudposse#2879 CodeRabbit round 3 findings

Propagate executionCtx to non-TTY shell steps and the atmos step type so
Ctrl-C/prompt cancellation actually stops an in-flight custom-command step
instead of letting it run to completion. Make migrateLegacyWorkdir fail
closed on a rename error instead of silently creating a fresh empty
workdir over an orphaned legacy directory that may hold real Terraform
state. Make ExtractComponentPath propagate a BuildPath rejection instead
of falling back to the source component directory, which could point
Terraform at the wrong workdir on a rejected (traversal/invalid) stack.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd): make workdir clean/describe/show honor atmos_component overrides

resolveComponentConfig passed the caller's already-loaded (processStacks=false)
AtmosConfiguration into ExecuteDescribeComponent, which only does its own full
stack-processing init when passed nil. That branch never ran, so component
resolution always failed silently and every clean/describe/show call fell back
to treating the component as its own instance name -- the exact failure mode
atmos_component-override support exists to prevent. It now builds its own
fully-processed config from the same CLI flag overrides (base-path, config,
config-path, profile) the caller already derived, so overrides actually
resolve. Adds three regression tests that execute the real command path
against a real stack fixture and assert the manager receives the resolved
atmos_component, replacing gomock.Any() assertions CodeRabbit flagged as too
permissive to catch this. Also fixes two stale doc/comment references from the
same review round (obsolete BuildPath encoding description; a stale fixture
path in a test comment).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

* fix(cmd,provisioner): address PR cloudposse#2879 CodeRabbit round 4 findings

Fixes four independent path-identity gaps in the vendoring/workdir subsystem:
DetermineTargetDirectory's default vendoring target permitted resolving to
the shared component-type directory itself (component name "." or
"child/.."); shouldSkipSyncFile protected local-backend state files by
basename, over-broadly excluding nested source files with the same name;
migrateLegacyWorkdir could rename the wrong identity's directory since its
legacy-name formula isn't injective across stack/component; and
validateStackForPath's segment split silently dropped empty segments from a
leading or repeated "/", letting a stack name alias another's workdir path.
Also fixes a test helper that suppressed all panics instead of only the
expected one, and corrects three stale doc references from earlier rounds.
Skipped one invalid finding (adding perf.Track to pkg/schema/workflow.go
would create an import cycle with pkg/perf).

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>

This branch was successfully deployed

1 active and 1 inactive deployments
preview — 9a4d3d04 Deployed Aug 10, 2026 by github-actions[bot]
screengrabs — 9a4d3d04 Deployed Aug 10, 2026 by osterman via build #1253
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

patch A minor, backward compatible change size/l Large size PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants