From 0763e30f3cae120458e4c8a39be5fc884600a0b5 Mon Sep 17 00:00:00 2001 From: Gordon Chan Date: Fri, 15 May 2026 11:33:53 +1200 Subject: [PATCH] [TE-5843] Encode v2 major version in go.mod module path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Go's major version suffix rules require modules at v2+ to encode the major version in the module path. Without the /v2 suffix, v2.x tags are unfetchable via 'go get' and uninstallable as a 'go tool', so downstream consumers (e.g. buildkite/agent) have been pinned to v1.6.0 — which predates the 'plan' subcommand and --collect-git-metadata. Change module path in go.mod to github.com/buildkite/test-engine-client/v2 and rewrite all internal import paths to match. Also update the version ldflags path in .goreleaser.yaml so release builds continue to stamp the version string into internal/version.Version. Once this lands and a v2.x tag is cut, downstream projects can switch to: go get github.com/buildkite/test-engine-client/v2@vX.Y.Z Unblocks TE-5842 (unify both bktec call sites in buildkite/agent onto 'go tool' against a current v2.x release). --- .goreleaser.yaml | 2 +- go.mod | 2 +- internal/api/client.go | 4 ++-- internal/api/client_test.go | 2 +- internal/api/create_test_plan.go | 2 +- internal/api/create_test_plan_test.go | 2 +- internal/api/fetch_commit_list.go | 2 +- internal/api/fetch_test_plan.go | 2 +- internal/api/fetch_test_plan_test.go | 2 +- internal/api/filter_tests.go | 4 ++-- internal/api/filter_tests_test.go | 4 ++-- internal/api/post_test_plan_metadata.go | 4 ++-- internal/api/post_test_plan_metadata_test.go | 4 ++-- internal/api/presign_upload.go | 2 +- internal/command/backfill_commit_metadata.go | 14 +++++++------- .../command/backfill_commit_metadata_test.go | 6 +++--- internal/command/errors.go | 2 +- internal/command/errors_test.go | 2 +- internal/command/files.go | 2 +- internal/command/plan.go | 14 +++++++------- internal/command/plan_test.go | 8 ++++---- internal/command/request_param.go | 10 +++++----- internal/command/request_param_test.go | 8 ++++---- internal/command/run.go | 12 ++++++------ internal/command/run_test.go | 10 +++++----- internal/git/auto_metadata.go | 2 +- internal/git/diff.go | 2 +- internal/git/fetch.go | 2 +- internal/git/git.go | 2 +- internal/runner/command.go | 2 +- internal/runner/cucumber.go | 4 ++-- internal/runner/cucumber_test.go | 2 +- internal/runner/custom.go | 4 ++-- internal/runner/custom_test.go | 2 +- internal/runner/cypress.go | 4 ++-- internal/runner/cypress_test.go | 2 +- internal/runner/detector.go | 4 ++-- internal/runner/gotest.go | 4 ++-- internal/runner/gotest_junit_test.go | 18 +++++++++--------- internal/runner/gotest_test.go | 2 +- internal/runner/jest.go | 4 ++-- internal/runner/jest_test.go | 2 +- internal/runner/nunit.go | 4 ++-- internal/runner/nunit_test.go | 2 +- internal/runner/playwright.go | 4 ++-- internal/runner/playwright_test.go | 2 +- internal/runner/pytest.go | 4 ++-- internal/runner/pytest_pants.go | 2 +- internal/runner/pytest_pants_test.go | 2 +- internal/runner/pytest_test.go | 2 +- internal/runner/rspec.go | 4 ++-- internal/runner/rspec_test.go | 2 +- internal/runner/run_result.go | 2 +- internal/runner/run_result_test.go | 2 +- internal/runner/test_result.go | 2 +- internal/runner/util.go | 2 +- internal/upload/s3.go | 2 +- main.go | 10 +++++----- 58 files changed, 118 insertions(+), 118 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index f00d6af4..75567aec 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -19,7 +19,7 @@ builds: - CGO_ENABLED=0 goos: [linux, darwin, windows] goarch: [amd64, arm64] - ldflags: "-X 'github.com/buildkite/test-engine-client/internal/version.Version=v{{ .Version }}'" + ldflags: "-X 'github.com/buildkite/test-engine-client/v2/internal/version.Version=v{{ .Version }}'" binary: bktec checksum: diff --git a/go.mod b/go.mod index 38a6809a..e9b20db5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/buildkite/test-engine-client +module github.com/buildkite/test-engine-client/v2 go 1.25.0 diff --git a/internal/api/client.go b/internal/api/client.go index 013019de..ddc798b2 100644 --- a/internal/api/client.go +++ b/internal/api/client.go @@ -14,8 +14,8 @@ import ( "time" "github.com/buildkite/roko" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/version" ) // client is a client for the test plan API. diff --git a/internal/api/client_test.go b/internal/api/client_test.go index 0a4862aa..d89502b5 100644 --- a/internal/api/client_test.go +++ b/internal/api/client_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/version" "github.com/google/go-cmp/cmp" ) diff --git a/internal/api/create_test_plan.go b/internal/api/create_test_plan.go index 2aeb5e6e..adc4b65e 100644 --- a/internal/api/create_test_plan.go +++ b/internal/api/create_test_plan.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) type TestPlanParamsTest struct { diff --git a/internal/api/create_test_plan_test.go b/internal/api/create_test_plan_test.go index 9121cc7f..fc0cb2e2 100644 --- a/internal/api/create_test_plan_test.go +++ b/internal/api/create_test_plan_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/api/fetch_commit_list.go b/internal/api/fetch_commit_list.go index 0698d199..8da91e44 100644 --- a/internal/api/fetch_commit_list.go +++ b/internal/api/fetch_commit_list.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) // FetchCommitList fetches the list of commit SHAs that need metadata from the diff --git a/internal/api/fetch_test_plan.go b/internal/api/fetch_test_plan.go index 5deb1042..4e8ca457 100644 --- a/internal/api/fetch_test_plan.go +++ b/internal/api/fetch_test_plan.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) // FetchTestPlan fetchs a test plan from the server. diff --git a/internal/api/fetch_test_plan_test.go b/internal/api/fetch_test_plan_test.go index 05d9f0af..2cf92083 100644 --- a/internal/api/fetch_test_plan_test.go +++ b/internal/api/fetch_test_plan_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/api/filter_tests.go b/internal/api/filter_tests.go index 10c95e7f..6fb11d5b 100644 --- a/internal/api/filter_tests.go +++ b/internal/api/filter_tests.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) type FilterTestsParams struct { diff --git a/internal/api/filter_tests_test.go b/internal/api/filter_tests_test.go index 649e6368..791c60a8 100644 --- a/internal/api/filter_tests_test.go +++ b/internal/api/filter_tests_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/api/post_test_plan_metadata.go b/internal/api/post_test_plan_metadata.go index 3bddd5fe..431c17a7 100644 --- a/internal/api/post_test_plan_metadata.go +++ b/internal/api/post_test_plan_metadata.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/runner" ) type Timeline struct { diff --git a/internal/api/post_test_plan_metadata_test.go b/internal/api/post_test_plan_metadata_test.go index 6a5ae228..0a6a4c5c 100644 --- a/internal/api/post_test_plan_metadata_test.go +++ b/internal/api/post_test_plan_metadata_test.go @@ -8,8 +8,8 @@ import ( "net/http/httptest" "testing" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/runner" ) func TestPostTestPlanMetadata(t *testing.T) { diff --git a/internal/api/presign_upload.go b/internal/api/presign_upload.go index 58e578b7..e98e64df 100644 --- a/internal/api/presign_upload.go +++ b/internal/api/presign_upload.go @@ -6,7 +6,7 @@ import ( "net/http" "net/url" - "github.com/buildkite/test-engine-client/internal/upload" + "github.com/buildkite/test-engine-client/v2/internal/upload" ) // PresignedUploadResponse is the response from the presigned upload endpoint. diff --git a/internal/command/backfill_commit_metadata.go b/internal/command/backfill_commit_metadata.go index 8a9b4977..7878b782 100644 --- a/internal/command/backfill_commit_metadata.go +++ b/internal/command/backfill_commit_metadata.go @@ -8,13 +8,13 @@ import ( "os" "time" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/git" - "github.com/buildkite/test-engine-client/internal/packaging" - "github.com/buildkite/test-engine-client/internal/upload" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/git" + "github.com/buildkite/test-engine-client/v2/internal/packaging" + "github.com/buildkite/test-engine-client/v2/internal/upload" + "github.com/buildkite/test-engine-client/v2/internal/version" ) // BackfillCommitMetadata collects historical git commit metadata from the local diff --git a/internal/command/backfill_commit_metadata_test.go b/internal/command/backfill_commit_metadata_test.go index 4b371da2..b7a310cc 100644 --- a/internal/command/backfill_commit_metadata_test.go +++ b/internal/command/backfill_commit_metadata_test.go @@ -14,9 +14,9 @@ import ( "sync/atomic" "testing" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/git" - "github.com/buildkite/test-engine-client/internal/packaging" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/git" + "github.com/buildkite/test-engine-client/v2/internal/packaging" ) func getBackfillConfig(serverURL string) *config.Config { diff --git a/internal/command/errors.go b/internal/command/errors.go index 19b331fa..fce35b36 100644 --- a/internal/command/errors.go +++ b/internal/command/errors.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/buildkite/test-engine-client/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/api" ) const fallbackExtra = "⚠️ Falling back to non-intelligent splitting. Your build may take longer than usual." diff --git a/internal/command/errors_test.go b/internal/command/errors_test.go index e26537c6..f46b7caa 100644 --- a/internal/command/errors_test.go +++ b/internal/command/errors_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/buildkite/test-engine-client/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/api" "github.com/stretchr/testify/assert" ) diff --git a/internal/command/files.go b/internal/command/files.go index e7e299b9..4cc39761 100644 --- a/internal/command/files.go +++ b/internal/command/files.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/buildkite/test-engine-client/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/runner" ) func getTestFiles(fileList string, testRunner runner.TestRunner) ([]string, error) { diff --git a/internal/command/plan.go b/internal/command/plan.go index 9acc66d0..bf66c279 100644 --- a/internal/command/plan.go +++ b/internal/command/plan.go @@ -9,13 +9,13 @@ import ( "os/exec" "strconv" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/git" - "github.com/buildkite/test-engine-client/internal/plan" - "github.com/buildkite/test-engine-client/internal/runner" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/git" + "github.com/buildkite/test-engine-client/v2/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/version" ) type PlanOutput int diff --git a/internal/command/plan_test.go b/internal/command/plan_test.go index 846442f5..d3716fc9 100644 --- a/internal/command/plan_test.go +++ b/internal/command/plan_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/command/request_param.go b/internal/command/request_param.go index 85c631b4..765d04d0 100644 --- a/internal/command/request_param.go +++ b/internal/command/request_param.go @@ -5,11 +5,11 @@ import ( "fmt" "strings" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" - "github.com/buildkite/test-engine-client/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/runner" ) // createRequestParam generates the parameters needed for a test plan request. diff --git a/internal/command/request_param_test.go b/internal/command/request_param_test.go index 021ac7a0..0bdbef14 100644 --- a/internal/command/request_param_test.go +++ b/internal/command/request_param_test.go @@ -7,10 +7,10 @@ import ( "net/http/httptest" "testing" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/plan" - "github.com/buildkite/test-engine-client/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/runner" "github.com/google/go-cmp/cmp" ) diff --git a/internal/command/run.go b/internal/command/run.go index 9a0e4782..252340ef 100644 --- a/internal/command/run.go +++ b/internal/command/run.go @@ -10,12 +10,12 @@ import ( "syscall" "time" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" - "github.com/buildkite/test-engine-client/internal/runner" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/version" "github.com/olekukonko/tablewriter" ) diff --git a/internal/command/run_test.go b/internal/command/run_test.go index 0395365f..351b1a9c 100644 --- a/internal/command/run_test.go +++ b/internal/command/run_test.go @@ -13,11 +13,11 @@ import ( "testing" "time" - "github.com/buildkite/test-engine-client/internal/api" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/plan" - "github.com/buildkite/test-engine-client/internal/runner" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/api" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/runner" + "github.com/buildkite/test-engine-client/v2/internal/version" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" "github.com/stretchr/testify/assert" diff --git a/internal/git/auto_metadata.go b/internal/git/auto_metadata.go index 92b9270c..0fdbee2c 100644 --- a/internal/git/auto_metadata.go +++ b/internal/git/auto_metadata.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) // ResolveBaseBranch determines the base branch ref to diff against. diff --git a/internal/git/diff.go b/internal/git/diff.go index f75466ef..919815d0 100644 --- a/internal/git/diff.go +++ b/internal/git/diff.go @@ -6,7 +6,7 @@ import ( "strings" "sync" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) // CommitDiffs holds the diff information for a single commit relative to its fork-point. diff --git a/internal/git/fetch.go b/internal/git/fetch.go index 7f6b17b6..debc0920 100644 --- a/internal/git/fetch.go +++ b/internal/git/fetch.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) const fetchChunkSize = 1000 diff --git a/internal/git/git.go b/internal/git/git.go index 8f55c8a9..4720234b 100644 --- a/internal/git/git.go +++ b/internal/git/git.go @@ -10,7 +10,7 @@ import ( "os/exec" "strings" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) // GitRunner abstracts git command execution for testability. diff --git a/internal/runner/command.go b/internal/runner/command.go index b91aea5c..8c9038f3 100644 --- a/internal/runner/command.go +++ b/internal/runner/command.go @@ -7,7 +7,7 @@ import ( "os/signal" "syscall" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) func buildCommand(runner TestRunner, testCases []plan.TestCase, retry bool) (*exec.Cmd, error) { diff --git a/internal/runner/cucumber.go b/internal/runner/cucumber.go index 794b732d..3d147936 100644 --- a/internal/runner/cucumber.go +++ b/internal/runner/cucumber.go @@ -8,8 +8,8 @@ import ( "slices" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/cucumber_test.go b/internal/runner/cucumber_test.go index 532064d9..6e380604 100644 --- a/internal/runner/cucumber_test.go +++ b/internal/runner/cucumber_test.go @@ -7,7 +7,7 @@ import ( "sort" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/custom.go b/internal/runner/custom.go index 7c7d83bf..91a320bc 100644 --- a/internal/runner/custom.go +++ b/internal/runner/custom.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/custom_test.go b/internal/runner/custom_test.go index 7521a100..9c3b0e7f 100644 --- a/internal/runner/custom_test.go +++ b/internal/runner/custom_test.go @@ -4,7 +4,7 @@ import ( "os/exec" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/internal/runner/cypress.go b/internal/runner/cypress.go index 86b15970..1375b958 100644 --- a/internal/runner/cypress.go +++ b/internal/runner/cypress.go @@ -5,8 +5,8 @@ import ( "slices" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/cypress_test.go b/internal/runner/cypress_test.go index 097d210a..62190af1 100644 --- a/internal/runner/cypress_test.go +++ b/internal/runner/cypress_test.go @@ -6,7 +6,7 @@ import ( "syscall" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/detector.go b/internal/runner/detector.go index 523713b8..3d06f755 100644 --- a/internal/runner/detector.go +++ b/internal/runner/detector.go @@ -3,8 +3,8 @@ package runner import ( "fmt" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) type TestRunner interface { diff --git a/internal/runner/gotest.go b/internal/runner/gotest.go index d1c3a03e..54e6e30a 100644 --- a/internal/runner/gotest.go +++ b/internal/runner/gotest.go @@ -6,8 +6,8 @@ import ( "os/exec" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/gotest_junit_test.go b/internal/runner/gotest_junit_test.go index 10ebc7a4..74f7c463 100644 --- a/internal/runner/gotest_junit_test.go +++ b/internal/runner/gotest_junit_test.go @@ -10,16 +10,16 @@ import ( const exampleJUnitXML = ` - + - + === RUN TestPrintf debug_test.go:21: error matching output: <nil> --- FAIL: TestPrintf (0.00s) - - - + + + ` @@ -38,25 +38,25 @@ func TestLoadAndParseGotestJUnitXmlResult(t *testing.T) { require.Len(t, results, 4) - assert.Equal(t, "github.com/buildkite/test-engine-client/internal/debug", results[0].Classname) + assert.Equal(t, "github.com/buildkite/test-engine-client/v2/internal/debug", results[0].Classname) assert.Equal(t, "TestPrintf", results[0].Name) assert.Equal(t, TestStatusFailed, results[0].Result) assert.NotNil(t, results[0].Failure) assert.Nil(t, results[0].Skipped) - assert.Equal(t, "github.com/buildkite/test-engine-client/internal/debug", results[1].Classname) + assert.Equal(t, "github.com/buildkite/test-engine-client/v2/internal/debug", results[1].Classname) assert.Equal(t, "TestPrintf_disabled", results[1].Name) assert.Equal(t, TestStatusPassed, results[1].Result) assert.Nil(t, results[1].Failure) assert.Nil(t, results[1].Skipped) - assert.Equal(t, "github.com/buildkite/test-engine-client/internal/debug", results[2].Classname) + assert.Equal(t, "github.com/buildkite/test-engine-client/v2/internal/debug", results[2].Classname) assert.Equal(t, "TestPrintln", results[2].Name) assert.Equal(t, TestStatusPassed, results[2].Result) assert.Nil(t, results[2].Failure) assert.Nil(t, results[2].Skipped) - assert.Equal(t, "github.com/buildkite/test-engine-client/internal/debug", results[3].Classname) + assert.Equal(t, "github.com/buildkite/test-engine-client/v2/internal/debug", results[3].Classname) assert.Equal(t, "TestPrintln_disabled", results[3].Name) assert.Equal(t, TestStatusPassed, results[3].Result) assert.Nil(t, results[3].Failure) diff --git a/internal/runner/gotest_test.go b/internal/runner/gotest_test.go index 9974418f..800945da 100644 --- a/internal/runner/gotest_test.go +++ b/internal/runner/gotest_test.go @@ -7,7 +7,7 @@ import ( "path/filepath" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/internal/runner/jest.go b/internal/runner/jest.go index 42c7e127..787f5a3d 100644 --- a/internal/runner/jest.go +++ b/internal/runner/jest.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/jest_test.go b/internal/runner/jest_test.go index 51092045..1c06f985 100644 --- a/internal/runner/jest_test.go +++ b/internal/runner/jest_test.go @@ -8,7 +8,7 @@ import ( "syscall" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/nunit.go b/internal/runner/nunit.go index b8864d9d..e2eec8ba 100644 --- a/internal/runner/nunit.go +++ b/internal/runner/nunit.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/nunit_test.go b/internal/runner/nunit_test.go index d0706d6d..9b0fc1b2 100644 --- a/internal/runner/nunit_test.go +++ b/internal/runner/nunit_test.go @@ -3,7 +3,7 @@ package runner import ( "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/runner/playwright.go b/internal/runner/playwright.go index b979ef5b..808d2812 100644 --- a/internal/runner/playwright.go +++ b/internal/runner/playwright.go @@ -9,8 +9,8 @@ import ( "slices" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/playwright_test.go b/internal/runner/playwright_test.go index 914c8d9e..51e6093f 100644 --- a/internal/runner/playwright_test.go +++ b/internal/runner/playwright_test.go @@ -9,7 +9,7 @@ import ( "syscall" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/stretchr/testify/assert" ) diff --git a/internal/runner/pytest.go b/internal/runner/pytest.go index c3241107..5209f354 100644 --- a/internal/runner/pytest.go +++ b/internal/runner/pytest.go @@ -8,8 +8,8 @@ import ( "path/filepath" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" "golang.org/x/mod/semver" ) diff --git a/internal/runner/pytest_pants.go b/internal/runner/pytest_pants.go index 3b71fec8..6d51005b 100644 --- a/internal/runner/pytest_pants.go +++ b/internal/runner/pytest_pants.go @@ -7,7 +7,7 @@ import ( "os/exec" "strings" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/pytest_pants_test.go b/internal/runner/pytest_pants_test.go index e5939ba1..d889f783 100644 --- a/internal/runner/pytest_pants_test.go +++ b/internal/runner/pytest_pants_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/pytest_test.go b/internal/runner/pytest_test.go index 1c18974d..6f37e0c8 100644 --- a/internal/runner/pytest_test.go +++ b/internal/runner/pytest_test.go @@ -5,7 +5,7 @@ import ( "os/exec" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/rspec.go b/internal/runner/rspec.go index 018c1557..4b6d1913 100644 --- a/internal/runner/rspec.go +++ b/internal/runner/rspec.go @@ -8,8 +8,8 @@ import ( "slices" "strings" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/kballard/go-shellquote" ) diff --git a/internal/runner/rspec_test.go b/internal/runner/rspec_test.go index 4aae8a36..ed12b6de 100644 --- a/internal/runner/rspec_test.go +++ b/internal/runner/rspec_test.go @@ -7,7 +7,7 @@ import ( "syscall" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" "github.com/kballard/go-shellquote" "github.com/stretchr/testify/assert" diff --git a/internal/runner/run_result.go b/internal/runner/run_result.go index 47bd09da..5c4185a0 100644 --- a/internal/runner/run_result.go +++ b/internal/runner/run_result.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" ) type RunStatus string diff --git a/internal/runner/run_result_test.go b/internal/runner/run_result_test.go index 30269504..c6d63dc7 100644 --- a/internal/runner/run_result_test.go +++ b/internal/runner/run_result_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - "github.com/buildkite/test-engine-client/internal/plan" + "github.com/buildkite/test-engine-client/v2/internal/plan" "github.com/google/go-cmp/cmp" ) diff --git a/internal/runner/test_result.go b/internal/runner/test_result.go index 4b733e44..7396695b 100644 --- a/internal/runner/test_result.go +++ b/internal/runner/test_result.go @@ -1,6 +1,6 @@ package runner -import "github.com/buildkite/test-engine-client/internal/plan" +import "github.com/buildkite/test-engine-client/v2/internal/plan" type TestStatus string diff --git a/internal/runner/util.go b/internal/runner/util.go index 5568c91c..a009113b 100644 --- a/internal/runner/util.go +++ b/internal/runner/util.go @@ -1,6 +1,6 @@ package runner -import "github.com/buildkite/test-engine-client/internal/plan" +import "github.com/buildkite/test-engine-client/v2/internal/plan" func testCasesFromPaths(paths []string) []plan.TestCase { testCases := make([]plan.TestCase, len(paths)) diff --git a/internal/upload/s3.go b/internal/upload/s3.go index 8e769190..585629f2 100644 --- a/internal/upload/s3.go +++ b/internal/upload/s3.go @@ -12,7 +12,7 @@ import ( "sort" "time" - "github.com/buildkite/test-engine-client/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/debug" ) // S3ForbiddenError is returned when S3 rejects the upload with 403 Forbidden. diff --git a/main.go b/main.go index e89d8c29..b347cb0a 100644 --- a/main.go +++ b/main.go @@ -9,11 +9,11 @@ import ( "os" "os/exec" - "github.com/buildkite/test-engine-client/internal/command" - "github.com/buildkite/test-engine-client/internal/config" - "github.com/buildkite/test-engine-client/internal/debug" - "github.com/buildkite/test-engine-client/internal/git" - "github.com/buildkite/test-engine-client/internal/version" + "github.com/buildkite/test-engine-client/v2/internal/command" + "github.com/buildkite/test-engine-client/v2/internal/config" + "github.com/buildkite/test-engine-client/v2/internal/debug" + "github.com/buildkite/test-engine-client/v2/internal/git" + "github.com/buildkite/test-engine-client/v2/internal/version" "github.com/urfave/cli/v3" )