Skip to content

refactor(e2e): call framework.SetupDockerProvider directly - #1481

Merged
skevetter merged 1 commit into
mainfrom
refactor/e2e-drop-setup-docker-provider-wrappers
Oct 14, 2026
Merged

skevetter merged 1 commit into
mainfrom
refactor/e2e-drop-setup-docker-provider-wrappers

Conversation

@skevetter

@skevetter skevetter commented Oct 14, 2026 •

Copy link
Copy Markdown
Contributor

What changed

  • Deleted three per-package wrappers named setupDockerProvider:
    • e2e/tests/up/helper.go (binDir, dockerPath)
    • e2e/tests/up-features/helper.go (binDir, dockerPath, with its //nolint:unparam comment)
    • e2e/tests/up-docker-compose/helper.go (binDir, always passed "docker")
  • Rewrote every call site to call framework.SetupDockerProvider directly with the same arguments. up-docker-compose now passes "docker" explicitly where the wrapper implied it.
  • Removed the now-unused e2e/framework import from e2e/tests/up-features/helper.go.
  • 24 files changed, 55 insertions, 66 deletions. No behaviour, argument, error-handling, or test-structure change.

Why

The three wrappers only forwarded to framework.SetupDockerProvider (e2e/framework/command.go). Removing them leaves one implementation and one call path.

CodeRabbit findings

  • coderabbit review --agent --committed --base-commit 2f3756f1 failed with "Failed to start review. Please try again." No findings were produced, so none are fixed or skipped.

Verification

  • grep -rn setupDockerProvider e2e returns nothing.
  • task cli:format clean (no changes beyond the 24 edited files).
  • task cli:lint:ci: 0 issues. The first run hit "parallel golangci-lint is running" (a lock from another process) and was rerun clean.
  • go vet ./e2e/... exit 0.
  • go test -count=1 -run xxx ./e2e/... exit 0 (e2e packages compile).
  • Signed commit with prek hooks passing on commit.

Summary by CodeRabbit

  • Chores
    • Standardized Docker and Podman provider setup across end-to-end tests. Test scenarios and behavior remain unchanged.

The per-package setupDockerProvider wrappers in e2e/tests/up, up-features and up-docker-compose only forwarded to framework.SetupDockerProvider. Remove them and call the framework function at each site. up-docker-compose passes "docker" explicitly where the wrapper implied it. Behaviour is unchanged.
@netlify

netlify Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for devsydev canceled.

Name Link
🔨 Latest commit 21f4459
🔍 Latest deploy log https://app.netlify.com/projects/devsydev/deploys/6acf0ce6103dcd3ecacb0989

@coderabbitai

coderabbitai Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 881d9591-77a6-4cb7-9a73-fe921b2a579d
📥 Commits

Reviewing files that changed from the base of the PR and between 2f3756f and 21f4459.

📒 Files selected for processing: 24
  • e2e/tests/up-docker-compose/build.go
  • e2e/tests/up-docker-compose/config.go
  • e2e/tests/up-docker-compose/helper.go
  • e2e/tests/up-docker-compose/recreate_lifecycle.go
  • e2e/tests/up-docker-compose/up_docker_compose.go
  • e2e/tests/up-features/helper.go
  • e2e/tests/up-features/up_features.go
  • e2e/tests/up-features/wsl.go
  • e2e/tests/up/docker_wsl.go
  • e2e/tests/up/dockerfile_build.go
  • e2e/tests/up/git_repositories.go
  • e2e/tests/up/handles_errors.go
  • e2e/tests/up/helper.go
  • e2e/tests/up/podman_rootful.go
  • e2e/tests/up/provider_docker.go
  • e2e/tests/up/provider_podman_rootless_basic.go
  • e2e/tests/up/provider_podman_rootless_config.go
  • e2e/tests/up/provider_podman_rootless_exec.go
  • e2e/tests/up/provider_podman_rootless_features.go
  • e2e/tests/up/provider_podman_rootless_lifecycle.go
  • e2e/tests/up/sops.go
  • e2e/tests/up/up.go
  • e2e/tests/up/up_behaviors.go
  • e2e/tests/up/up_private_token.go
💤 Files with no reviewable changes: 3
  • e2e/tests/up-docker-compose/helper.go
  • e2e/tests/up/helper.go
  • e2e/tests/up-features/helper.go

Included review availability: This review used your included allowance. Your plan provides up to 2 included reviews per hour; 1 remain after this review.

📝 Walkthrough

The end-to-end test suites now call framework.SetupDockerProvider directly instead of using package-local wrappers. The test scenarios and assertions remain unchanged.

Changes: E2E provider setup

Layer / File(s) Summary
Replace local provider wrappers
e2e/tests/up-docker-compose/*, e2e/tests/up-features/*, e2e/tests/up/*
Test setup calls framework.SetupDockerProvider with the existing binary directory and provider name. The package-local wrappers are removed.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Refactor

Merge Risk: ⚪ Minimal · up to 21f44

This change replaces pass-through test setup wrappers with calls to the same framework function, preserving the provider configuration. No actionable merge risk is evident.

Pre-merge checks: Passed 5
Passed Passed checks: 5 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: replacing local e2e wrappers with direct calls to framework.SetupDockerProvider.
Docstring Coverage Passed Docstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 21 files.
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
✨ Simplify code
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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.

@netlify

netlify Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

✅ Deploy Preview for images-devsy-sh canceled.

Name Link
🔨 Latest commit 21f4459
🔍 Latest deploy log https://app.netlify.com/projects/images-devsy-sh/deploys/6acf0ce62316ac5e99b66f86

@skevetter
skevetter marked this pull request as ready for review October 14, 2026 06:09
@mergify

mergify Bot commented Oct 14, 2026 •

Copy link
Copy Markdown

This pull request does not currently match the merge queue conditions, so it cannot be queued from here. The box comes back if it matches again.

@skevetter
skevetter merged commit d102b9a into main Oct 14, 2026
105 checks passed
@skevetter
skevetter deleted the refactor/e2e-drop-setup-docker-provider-wrappers branch October 14, 2026 06:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant