fix: preserve scoped infra plan hashes#716
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR fixes a stale-hash false-positive for plans generated with wfctl infra plan --include=<subset>. Previously the scope wasn't persisted in the plan file, so applying the plan against a config containing additional (unscoped) resources rehashed the full desired set and rejected the plan as stale. The fix persists the include scope on the plan and reapplies it before rehashing.
Changes:
- Add
Include []stringtoIaCPlan(JSON-roundtrippable, sorted) recording the plan-time--includescope. - During
infra apply --plan, reconstruct the include set, validate it, and filter both desired specs and current state to that scope before computing the comparison hash. - Add unit (JSON roundtrip) and integration (
TestInfraApplyConsumesScopedPlan) tests.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| interfaces/iac_state.go | New Include field on IaCPlan with docstring describing semantics. |
| interfaces/iac_state_test.go | JSON roundtrip test for the new field. |
| cmd/wfctl/infra.go | Persist scope at plan time; rehydrate, validate, and filter scope at apply time before stale-hash check. |
| cmd/wfctl/infra_apply_include.go | New sortedIncludeNames / includeSetFromNames helpers to convert between persisted slice and runtime set. |
| cmd/wfctl/infra_apply_plan_test.go | Integration test exercising scoped plan apply against a config with additional unscoped resources. |
Codecov Report❌ Patch coverage is
📢 Thoughts on this report? Let us know! |
⏱ Benchmark Results✅ No significant performance regressions detected. benchstat comparison (baseline → PR)
|
intel352
force-pushed
the
fix/wfctl-scoped-plan-hash
branch
from
509c95d to
3b4cf8c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
wfctl infra plan --includeresource scope into savedplan.jsonfiles.wfctl infra apply --planstale-hash validation.Verification
GOWORK=off go test ./cmd/wfctl -run TestInfraApplyConsumesScopedPlan -count=1failed before the fix withplan stale: config hash mismatch.GOWORK=off go test ./cmd/wfctl -run 'TestInfraApplyConsumesScopedPlan|TestInfraApplyConsumesPlan|TestInfraApplyPlanSkipBootstrap|TestApplyInclude' -count=1\n-GOWORK=off go test ./interfaces -count=1\n-GOWORK=off go test ./cmd/wfctl -run 'TestInfraApply|TestInfraPlan|TestApplyInclude|TestPlanInclude|TestIaCPlan|TestParseInfraConfig_AutoBootstrap' -count=1\n-GOWORK=off go build ./cmd/wfctl\n-git diff --check