Skip to content

refactor(wait)!: create wait package and call it directly within actions#4549

Merged
AustinAbro321 merged 30 commits intomainfrom
call-wait-directly
Feb 4, 2026
Merged

refactor(wait)!: create wait package and call it directly within actions#4549
AustinAbro321 merged 30 commits intomainfrom
call-wait-directly

Conversation

@AustinAbro321
Copy link
Copy Markdown
Member

@AustinAbro321 AustinAbro321 commented Jan 23, 2026 •
edited
Loading

Breaking changes:

  • This deletes utils.ExecuteWait, in favor of two new functions in the new package src/pkg/wait. wait.ForResource and wait.ForNetwork. These functions no longer have both the parameter waitTimeout string and timeout time.Duration and instead only accept timeout time.Duration

Description

.actions.wait currently calls shells out to zarf tools wait-for. It makes more sense to call the wait functions directly. This makes us less reliant on shelling out (though it's still necessary for now when zarf tools kubectl wait is called by utils.ExecuteWait(). For now...

New e2e test takes ~6 seconds

Relates to #4550

Checklist before merging

@netlify
Copy link
Copy Markdown

netlify Bot commented Jan 23, 2026 •
edited
Loading

✅ Deploy Preview for zarf-docs ready!

Name Link
🔨 Latest commit 0d5655c
🔍 Latest deploy log https://app.netlify.com/projects/zarf-docs/deploys/6983491a34f2cf0008a042c1
😎 Deploy Preview https://deploy-preview-4549--zarf-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

@AustinAbro321 AustinAbro321 changed the title refactor: call wait function directly instead of shelling out refactor: call wait directly within actions instead of shelling out Jan 23, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 23, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 4.22535% with 68 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/pkg/packager/actions/actions.go 0.00% 51 Missing ⚠️
src/pkg/wait/wait.go 20.00% 12 Missing ⚠️
src/cmd/wait.go 0.00% 5 Missing ⚠️
Files with missing lines Coverage Δ
src/cmd/wait.go 42.10% <0.00%> (-4.96%) ⬇️
src/pkg/wait/wait.go 26.13% <20.00%> (ø)
src/pkg/packager/actions/actions.go 22.05% <0.00%> (-0.61%) ⬇️
🚀 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.

@AustinAbro321 AustinAbro321 marked this pull request as ready for review January 23, 2026 19:23
@AustinAbro321 AustinAbro321 requested review from a team as code owners January 23, 2026 19:23
@AustinAbro321 AustinAbro321 marked this pull request as draft January 23, 2026 19:24
@AustinAbro321 AustinAbro321 changed the title refactor: call wait directly within actions instead of shelling out refactor!: Create wait package and call it directly within actions Jan 26, 2026
@AustinAbro321 AustinAbro321 changed the title refactor!: Create wait package and call it directly within actions refactor!: create wait package and call it directly within actions Jan 26, 2026
@AustinAbro321 AustinAbro321 marked this pull request as ready for review January 26, 2026 16:29
@AustinAbro321 AustinAbro321 moved this to PR Review in Zarf Jan 26, 2026
@AustinAbro321 AustinAbro321 changed the title refactor!: create wait package and call it directly within actions refactor(wait)!: create wait package and call it directly within actions Jan 30, 2026
brandtkeller
brandtkeller requested changes Feb 3, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@brandtkeller brandtkeller left a comment

Choose a reason for hiding this comment

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

Minor nits primarily with a thought on testing.

Comment thread src/pkg/packager/actions/actions.go Outdated
Comment thread src/pkg/wait/wait.go Outdated
Comment thread src/test/e2e/46_tools_wait_for_test.go Outdated
Comment thread src/test/e2e/46_tools_wait_for_test.go
@github-project-automation github-project-automation Bot moved this from PR Review to In progress in Zarf Feb 3, 2026
AustinAbro321 and others added 15 commits February 4, 2026 08:24
@AustinAbro321
call wait directly
99f7eb4 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
create wait package
bb54691 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
add wait package
a1fec41 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
add back interval
e529fd5 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
restructure code
c2ea8a6 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
remove duplicate flag
8741c05 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
restructure arg order
2b87d54 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321 @brandtkeller
feat: remove direct usage of parent command zarf package inspect (#…
1875a9e 
…4548)

Signed-off-by: Austin Abro <austinabro321@gmail.com>
Signed-off-by: Austin Abro <37223396+AustinAbro321@users.noreply.github.com>
Co-authored-by: Brandt Keller <43887158+brandtkeller@users.noreply.github.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
feat: error early during healthchecks when status is terminal (#4547)
ca80971 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@brandtkeller @AustinAbro321
fix(helm): preserve block scalar semantics (#4541)
fb4572e 
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@dependabot @AustinAbro321
chore(deps): bump github/codeql-action from 4.31.10 to 4.31.11 (#4554)
4fa8e56 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@dependabot @AustinAbro321
chore(deps): bump actions/checkout from 6.0.1 to 6.0.2 in the actions…
1af7401 
…-organization group (#4553)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@jasonwashburn @AustinAbro321
docs: fix grammatical error in OnlyHasImageLayers doc comment (#4552)
758b1d7 
Signed-off-by: Jason Washburn <jason.washburn@gmail.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
chore: update dos games package 1.3.0 (#4555)
d20cc6a 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
docs: clarify data injections deprecation timeline (#4556)
4e819d3 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
AustinAbro321 and others added 14 commits February 4, 2026 08:24
@AustinAbro321
chore: update dos-games references to 1.3 (#4557)
5fc6871 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
refactor!: move v1alpha1 validation logic to it's own package (#4544)
9b6f5c6 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@brandtkeller @AustinAbro321
feat(release): add release please workflow and docs (#4558)
a354772 
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@brandtkeller @AustinAbro321
feat(sign): implement support for sigstore bundle format (#4519)
055bd60 
Signed-off-by: Brandt Keller <brandt.keller@defenseunicorns.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@dependabot @AustinAbro321
chore(deps): bump sigs.k8s.io/controller-runtime from 0.22.4 to 0.23.0 (
129bebe 
#4534)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
add e2e tests
0fcc63a 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
additional test for pod to be deleted
908c731 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
status code is unknown
73fb19d 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321 @brandtkeller
Update src/test/e2e/46_tools_wait_for_test.go
5c4669e 
Co-authored-by: Brandt Keller <43887158+brandtkeller@users.noreply.github.com>
Signed-off-by: Austin Abro <37223396+AustinAbro321@users.noreply.github.com>
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
switch statement
bb3492f 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
delete cmdwithTesting
4fa6469 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
revert back context
adf2b13 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
Revert "revert back context"
0d577fd 
This reverts commit 2b885f1.

Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
Revert "delete cmdwithTesting"
68f9adc 
This reverts commit f85b92c.

Signed-off-by: Austin Abro <austinabro321@gmail.com>
@AustinAbro321
merge
0d5655c 
Signed-off-by: Austin Abro <austinabro321@gmail.com>
brandtkeller
brandtkeller approved these changes Feb 4, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@brandtkeller brandtkeller left a comment

Choose a reason for hiding this comment

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

Test coverage and existing docs looks to align to implementation - I didn't find any additional scenarios to test for parity. lgtm.

@AustinAbro321 AustinAbro321 added this pull request to the merge queue Feb 4, 2026
Merged via the queue into main with commit 2498e1c Feb 4, 2026
37 of 39 checks passed
@AustinAbro321 AustinAbro321 deleted the call-wait-directly branch February 4, 2026 20:34
@github-project-automation github-project-automation Bot moved this from In progress to Done in Zarf Feb 4, 2026
@zarf-release-please zarf-release-please Bot mentioned this pull request Feb 4, 2026
Merged
@AustinAbro321 AustinAbro321 mentioned this pull request Feb 12, 2026
Merged
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@brandtkeller brandtkeller brandtkeller approved these changes

Assignees

No one assigned

Labels

None yet

Projects

Zarf
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@AustinAbro321 @brandtkeller @jasonwashburn