From 51eeaa86086f3c75f4383cd973995fa593be6865 Mon Sep 17 00:00:00 2001 From: Fabian Holler Date: Mon, 10 Jun 2024 16:49:34 +0200 Subject: [PATCH] change go package version from v3 to v4 Change the version specifier in the baur import path from v3 to v4. --- .golangci.yml | 2 +- .goreleaser.yaml | 2 +- Makefile | 4 ++-- README.md | 2 +- cmd/baur/main.go | 2 +- go.mod | 2 +- internal/command/command_test.go | 14 ++++++------- internal/command/completion.go | 4 ++-- internal/command/diff_inputs.go | 14 ++++++------- internal/command/diff_inputs_test.go | 2 +- internal/command/flag/buildstatus.go | 2 +- internal/command/flag/oneof.go | 2 +- internal/command/flag/sort.go | 2 +- internal/command/helpers.go | 24 +++++++++++----------- internal/command/init.go | 2 +- internal/command/init_app.go | 6 +++--- internal/command/init_bashcomp.go | 4 ++-- internal/command/init_db.go | 6 +++--- internal/command/init_fishcomp.go | 4 ++-- internal/command/init_include.go | 4 ++-- internal/command/init_repo.go | 6 +++--- internal/command/ls_apps.go | 6 +++--- internal/command/ls_apps_test.go | 4 ++-- internal/command/ls_inputs.go | 10 ++++----- internal/command/ls_inputs_test.go | 4 ++-- internal/command/ls_outputs.go | 8 ++++---- internal/command/ls_runs.go | 10 ++++----- internal/command/ls_runs_test.go | 2 +- internal/command/release_create.go | 10 ++++----- internal/command/release_download.go | 10 ++++----- internal/command/release_download_test.go | 10 ++++----- internal/command/release_exists.go | 2 +- internal/command/release_show.go | 8 ++++---- internal/command/release_test.go | 10 ++++----- internal/command/root.go | 8 ++++---- internal/command/run.go | 20 +++++++++--------- internal/command/run_test.go | 8 ++++---- internal/command/show.go | 10 ++++----- internal/command/show_internal_test.go | 2 +- internal/command/show_test.go | 4 ++-- internal/command/status.go | 10 ++++----- internal/command/status_test.go | 10 ++++----- internal/command/storageinputwrapper.go | 6 +++--- internal/command/taskinput_test.go | 12 +++++------ internal/command/term/color.go | 2 +- internal/command/term/streams.go | 2 +- internal/command/upgrade_configs.go | 2 +- internal/command/upgrade_configs_test.go | 12 +++++------ internal/command/upgrade_db.go | 6 +++--- internal/command/upgrade_db_test.go | 2 +- internal/command/util_test.go | 8 ++++---- internal/digest/gitobjectid/gitobjectid.go | 4 ++-- internal/digest/sha384/sha384.go | 2 +- internal/digest/sha384/sha384_test.go | 4 ++-- internal/fs/fileglob_test.go | 4 ++-- internal/fs/fs_test.go | 2 +- internal/output/filecopy/filecopy.go | 2 +- internal/resolve/glob/glob.go | 2 +- internal/resolve/gosource/goenv.go | 2 +- internal/resolve/gosource/gosource.go | 2 +- internal/resolve/gosource/gosource_test.go | 8 ++++---- internal/testutils/gittest/gittest.go | 2 +- internal/testutils/repotest/repotest.go | 18 ++++++++-------- internal/vcs/git/files.go | 2 +- internal/vcs/git/git.go | 4 ++-- internal/vcs/git/git_test.go | 8 ++++---- internal/vcs/git/repository.go | 2 +- internal/vcs/git/trackedobjects.go | 2 +- internal/vcs/git/trackedobjects_test.go | 4 ++-- pkg/baur/app.go | 2 +- pkg/baur/cfgupgrade.go | 8 ++++---- pkg/baur/input.go | 2 +- pkg/baur/inputenvar.go | 4 ++-- pkg/baur/inputfile.go | 4 ++-- pkg/baur/inputfile_singletoncache.go | 2 +- pkg/baur/inputfile_test.go | 4 ++-- pkg/baur/inputresolver.go | 16 +++++++-------- pkg/baur/inputresolver_cache.go | 2 +- pkg/baur/inputresolver_test.go | 16 +++++++-------- pkg/baur/inputresolver_unix_test.go | 6 +++--- pkg/baur/inputs.go | 4 ++-- pkg/baur/inputstring.go | 4 ++-- pkg/baur/inputtask.go | 2 +- pkg/baur/loader.go | 8 ++++---- pkg/baur/loader_test.go | 6 +++--- pkg/baur/output.go | 2 +- pkg/baur/outputdockerimage.go | 4 ++-- pkg/baur/outputfile.go | 6 +++--- pkg/baur/releasemanager.go | 8 ++++---- pkg/baur/repository.go | 4 ++-- pkg/baur/repository_test.go | 6 +++--- pkg/baur/storage.go | 4 ++-- pkg/baur/task.go | 2 +- pkg/baur/taskinfocreator.go | 4 ++-- pkg/baur/taskrunner.go | 2 +- pkg/baur/taskstatusevaluator.go | 2 +- pkg/baur/taskstatusevaluator_test.go | 2 +- pkg/baur/uploadinfo.go | 2 +- pkg/cfg/includedb_test.go | 2 +- pkg/cfg/inputinclude.go | 2 +- pkg/cfg/outputinclude.go | 2 +- pkg/cfg/taskinclude.go | 2 +- pkg/cfg/upgrade/v5/v5.go | 2 +- pkg/cfg/validation.go | 2 +- pkg/storage/postgres/filters_sorters.go | 2 +- pkg/storage/postgres/init_test.go | 2 +- pkg/storage/postgres/insert.go | 2 +- pkg/storage/postgres/insert_test.go | 2 +- pkg/storage/postgres/query.go | 2 +- pkg/storage/postgres/query_test.go | 2 +- pkg/storage/postgres/schema.go | 2 +- pkg/storage/postgres/schema_test.go | 2 +- 112 files changed, 284 insertions(+), 284 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index fe1e84aea..474017e2e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -32,7 +32,7 @@ linters: linters-settings: goimports: - local-prefixes: github.com/simplesurance/baur/v3 + local-prefixes: github.com/simplesurance/baur/v4 godox: keywords: - FIXME diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 43e132157..6d0075d65 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -16,7 +16,7 @@ builds: flags: - -trimpath ldflags: - - "-X github.com/simplesurance/baur/v3/internal/version.GitCommit={{ .FullCommit }}" + - "-X github.com/simplesurance/baur/v4/internal/version.GitCommit={{ .FullCommit }}" goos: - linux - windows diff --git a/Makefile b/Makefile index 3300f9079..aa8b984b5 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ GIT_COMMIT := $(shell git rev-parse HEAD) GIT_DIRTY := $(if $(shell git diff-files),wip) -LDFLAGS := "-X github.com/simplesurance/baur/v3/internal/version.GitCommit=$(GIT_COMMIT) \ - -X github.com/simplesurance/baur/v3/internal/version.Appendix=$(GIT_DIRTY)" +LDFLAGS := "-X github.com/simplesurance/baur/v4/internal/version.GitCommit=$(GIT_COMMIT) \ + -X github.com/simplesurance/baur/v4/internal/version.Appendix=$(GIT_DIRTY)" BUILDFLAGS := -trimpath -ldflags=$(LDFLAGS) export GO111MODULE=on export GOFLAGS=-mod=vendor diff --git a/README.md b/README.md index 3dc473cd8..75a68bfef 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ After downloading the release archive, extract the `baur` binary You can build and install the latest version from the main branch by running: ```sh -go install github.com/simplesurance/baur/v3/...@main +go install github.com/simplesurance/baur/v4/...@main ``` ### Setup diff --git a/cmd/baur/main.go b/cmd/baur/main.go index 4963807fb..73e7c9cb1 100644 --- a/cmd/baur/main.go +++ b/cmd/baur/main.go @@ -1,6 +1,6 @@ package main -import "github.com/simplesurance/baur/v3/internal/command" +import "github.com/simplesurance/baur/v4/internal/command" func main() { command.Execute() diff --git a/go.mod b/go.mod index c394105fa..ea88747aa 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/simplesurance/baur/v3 +module github.com/simplesurance/baur/v4 go 1.22.4 diff --git a/internal/command/command_test.go b/internal/command/command_test.go index 16b4c0784..4677cc572 100644 --- a/internal/command/command_test.go +++ b/internal/command/command_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/testutils/dbtest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/testutils/dbtest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/baur" ) func runInitDb(t *testing.T) { diff --git a/internal/command/completion.go b/internal/command/completion.go index 97c4fd193..309bab510 100644 --- a/internal/command/completion.go +++ b/internal/command/completion.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/baur" ) func mockGitCommitID() (string, error) { diff --git a/internal/command/diff_inputs.go b/internal/command/diff_inputs.go index 4d681f67d..748c06452 100644 --- a/internal/command/diff_inputs.go +++ b/internal/command/diff_inputs.go @@ -10,13 +10,13 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/format/csv" - "github.com/simplesurance/baur/v3/internal/format/table" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/format/csv" + "github.com/simplesurance/baur/v4/internal/format/table" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) type diffInputArgDetails struct { diff --git a/internal/command/diff_inputs_test.go b/internal/command/diff_inputs_test.go index 10cd2d55d..b991d43e6 100644 --- a/internal/command/diff_inputs_test.go +++ b/internal/command/diff_inputs_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" ) var appOneName = "app-one" diff --git a/internal/command/flag/buildstatus.go b/internal/command/flag/buildstatus.go index 82abd55c0..6792de3b3 100644 --- a/internal/command/flag/buildstatus.go +++ b/internal/command/flag/buildstatus.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/baur" ) // Valid commandline values diff --git a/internal/command/flag/oneof.go b/internal/command/flag/oneof.go index 9398b23a9..7a5debb9c 100644 --- a/internal/command/flag/oneof.go +++ b/internal/command/flag/oneof.go @@ -6,7 +6,7 @@ import ( "strings" "unicode" - "github.com/simplesurance/baur/v3/internal/set" + "github.com/simplesurance/baur/v4/internal/set" "github.com/spf13/cobra" ) diff --git a/internal/command/flag/sort.go b/internal/command/flag/sort.go index a9df1f741..ba56a2215 100644 --- a/internal/command/flag/sort.go +++ b/internal/command/flag/sort.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) // Sort is a commandline flag to specify via which field and in which order diff --git a/internal/command/helpers.go b/internal/command/helpers.go index d4be4087c..826afaefc 100644 --- a/internal/command/helpers.go +++ b/internal/command/helpers.go @@ -6,18 +6,18 @@ import ( "os" "path/filepath" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/format/csv" - "github.com/simplesurance/baur/v3/internal/format/json" - "github.com/simplesurance/baur/v3/internal/format/table" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/prettyprint" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" - "github.com/simplesurance/baur/v3/pkg/storage" - "github.com/simplesurance/baur/v3/pkg/storage/postgres" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/format/csv" + "github.com/simplesurance/baur/v4/internal/format/json" + "github.com/simplesurance/baur/v4/internal/format/table" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/prettyprint" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage/postgres" ) type Formatter interface { diff --git a/internal/command/init.go b/internal/command/init.go index 3775928cc..50138f5b5 100644 --- a/internal/command/init.go +++ b/internal/command/init.go @@ -6,7 +6,7 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" + "github.com/simplesurance/baur/v4/internal/command/term" ) const ( diff --git a/internal/command/init_app.go b/internal/command/init_app.go index 7e8feaa3b..0f2b6f448 100644 --- a/internal/command/init_app.go +++ b/internal/command/init_app.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func init() { diff --git a/internal/command/init_bashcomp.go b/internal/command/init_bashcomp.go index 3932ef3d0..63df649c9 100644 --- a/internal/command/init_bashcomp.go +++ b/internal/command/init_bashcomp.go @@ -9,8 +9,8 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/fs" ) const ( diff --git a/internal/command/init_db.go b/internal/command/init_db.go index 492211bd4..4466e8528 100644 --- a/internal/command/init_db.go +++ b/internal/command/init_db.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) const initDbExample = ` diff --git a/internal/command/init_fishcomp.go b/internal/command/init_fishcomp.go index 3c45d36b5..008f69a26 100644 --- a/internal/command/init_fishcomp.go +++ b/internal/command/init_fishcomp.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/fs" ) type initFishCompCmd struct { diff --git a/internal/command/init_include.go b/internal/command/init_include.go index a979f41c9..3f1b51649 100644 --- a/internal/command/init_include.go +++ b/internal/command/init_include.go @@ -6,8 +6,8 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func init() { diff --git a/internal/command/init_repo.go b/internal/command/init_repo.go index 853163401..385878f10 100644 --- a/internal/command/init_repo.go +++ b/internal/command/init_repo.go @@ -7,9 +7,9 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func init() { diff --git a/internal/command/ls_apps.go b/internal/command/ls_apps.go index 5bef83ba4..6c25fabdd 100644 --- a/internal/command/ls_apps.go +++ b/internal/command/ls_apps.go @@ -5,9 +5,9 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/baur" ) const ( diff --git a/internal/command/ls_apps_test.go b/internal/command/ls_apps_test.go index 9668258f6..b5a30ec78 100644 --- a/internal/command/ls_apps_test.go +++ b/internal/command/ls_apps_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/command/ls_inputs.go b/internal/command/ls_inputs.go index 2a4dab098..3ec0940a2 100644 --- a/internal/command/ls_inputs.go +++ b/internal/command/ls_inputs.go @@ -6,11 +6,11 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/format/csv" - "github.com/simplesurance/baur/v3/internal/format/table" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/format/csv" + "github.com/simplesurance/baur/v4/internal/format/table" + "github.com/simplesurance/baur/v4/pkg/baur" ) func init() { diff --git a/internal/command/ls_inputs_test.go b/internal/command/ls_inputs_test.go index 6e890638b..336b8ee73 100644 --- a/internal/command/ls_inputs_test.go +++ b/internal/command/ls_inputs_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/baur" ) func TestLsInputsTaskAndRunInputsAreTheSame(t *testing.T) { diff --git a/internal/command/ls_outputs.go b/internal/command/ls_outputs.go index 279f89781..f7754ef89 100644 --- a/internal/command/ls_outputs.go +++ b/internal/command/ls_outputs.go @@ -6,10 +6,10 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/storage" ) type lsOutputsCmd struct { diff --git a/internal/command/ls_runs.go b/internal/command/ls_runs.go index ae089f8b5..774669051 100644 --- a/internal/command/ls_runs.go +++ b/internal/command/ls_runs.go @@ -8,11 +8,11 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/format/csv" - "github.com/simplesurance/baur/v3/internal/format/table" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/format/csv" + "github.com/simplesurance/baur/v4/internal/format/table" + "github.com/simplesurance/baur/v4/pkg/storage" ) const lsRunsLongHelp = ` diff --git a/internal/command/ls_runs_test.go b/internal/command/ls_runs_test.go index 0e5da9bc0..4473bdda2 100644 --- a/internal/command/ls_runs_test.go +++ b/internal/command/ls_runs_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" ) func TestLsRunsHasInput(t *testing.T) { diff --git a/internal/command/release_create.go b/internal/command/release_create.go index 914248a29..0c48e9f87 100644 --- a/internal/command/release_create.go +++ b/internal/command/release_create.go @@ -8,11 +8,11 @@ import ( "os" "strings" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/validation" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/validation" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" "github.com/spf13/cobra" ) diff --git a/internal/command/release_download.go b/internal/command/release_download.go index 4626b5ad6..a103160e0 100644 --- a/internal/command/release_download.go +++ b/internal/command/release_download.go @@ -7,11 +7,11 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/output/s3" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/output/s3" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) var releaseDownloadLongHelp = fmt.Sprintf(` diff --git a/internal/command/release_download_test.go b/internal/command/release_download_test.go index 40757e991..48bf12729 100644 --- a/internal/command/release_download_test.go +++ b/internal/command/release_download_test.go @@ -9,11 +9,11 @@ import ( "path/filepath" "testing" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/internal/testutils/s3test" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/s3test" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" "github.com/stretchr/testify/require" ) diff --git a/internal/command/release_exists.go b/internal/command/release_exists.go index 62cc7dc0e..cc2933021 100644 --- a/internal/command/release_exists.go +++ b/internal/command/release_exists.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/simplesurance/baur/v3/internal/command/term" + "github.com/simplesurance/baur/v4/internal/command/term" "github.com/spf13/cobra" ) diff --git a/internal/command/release_show.go b/internal/command/release_show.go index 3c1f44514..b82a69e4e 100644 --- a/internal/command/release_show.go +++ b/internal/command/release_show.go @@ -6,10 +6,10 @@ import ( "os" "strings" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" "github.com/spf13/cobra" ) diff --git a/internal/command/release_test.go b/internal/command/release_test.go index d5faa27c6..a093f4638 100644 --- a/internal/command/release_test.go +++ b/internal/command/release_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" - "github.com/simplesurance/baur/v3/internal/prettyprint" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/internal/prettyprint" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/baur" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/command/root.go b/internal/command/root.go index fdfa0fe1e..0e0450424 100644 --- a/internal/command/root.go +++ b/internal/command/root.go @@ -10,10 +10,10 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/version" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/version" ) var rootCmd = &cobra.Command{ diff --git a/internal/command/run.go b/internal/command/run.go index 71cb571aa..c7adebaaf 100644 --- a/internal/command/run.go +++ b/internal/command/run.go @@ -11,16 +11,16 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/output/docker" - "github.com/simplesurance/baur/v3/internal/output/filecopy" - "github.com/simplesurance/baur/v3/internal/output/s3" - "github.com/simplesurance/baur/v3/internal/routines" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/output/docker" + "github.com/simplesurance/baur/v4/internal/output/filecopy" + "github.com/simplesurance/baur/v4/internal/output/s3" + "github.com/simplesurance/baur/v4/internal/routines" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) const runExample = ` diff --git a/internal/command/run_test.go b/internal/command/run_test.go index 5ba8386bd..4eaddef70 100644 --- a/internal/command/run_test.go +++ b/internal/command/run_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func TestRunSimultaneously(t *testing.T) { diff --git a/internal/command/show.go b/internal/command/show.go index a69ede0f5..774804b48 100644 --- a/internal/command/show.go +++ b/internal/command/show.go @@ -9,11 +9,11 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/format/table" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/format/table" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) const showLongHelp = ` diff --git a/internal/command/show_internal_test.go b/internal/command/show_internal_test.go index b21abb21e..79af47f1a 100644 --- a/internal/command/show_internal_test.go +++ b/internal/command/show_internal_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/simplesurance/baur/v3/internal/format/table" + "github.com/simplesurance/baur/v4/internal/format/table" ) func TestMustWriteStringSliceRows(t *testing.T) { diff --git a/internal/command/show_test.go b/internal/command/show_test.go index 02479742b..4438315b9 100644 --- a/internal/command/show_test.go +++ b/internal/command/show_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" ) // TestShowArgs verifies that the show command works with all supported diff --git a/internal/command/status.go b/internal/command/status.go index 0061ccf81..d24f16f09 100644 --- a/internal/command/status.go +++ b/internal/command/status.go @@ -5,11 +5,11 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/flag" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/flag" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) const ( diff --git a/internal/command/status_test.go b/internal/command/status_test.go index 129a31e37..7fa78c3d1 100644 --- a/internal/command/status_test.go +++ b/internal/command/status_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/dbtest" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/dbtest" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" ) func TestStatusTaskSpecArgParsing(t *testing.T) { diff --git a/internal/command/storageinputwrapper.go b/internal/command/storageinputwrapper.go index 5edbfb2f3..c531bcba8 100644 --- a/internal/command/storageinputwrapper.go +++ b/internal/command/storageinputwrapper.go @@ -3,9 +3,9 @@ package command import ( "fmt" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) type storageInputFile struct { diff --git a/internal/command/taskinput_test.go b/internal/command/taskinput_test.go index 3c6b146f9..6c6c317e3 100644 --- a/internal/command/taskinput_test.go +++ b/internal/command/taskinput_test.go @@ -13,12 +13,12 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func writeTaskInfoCheckScript(t *testing.T, uuid, scriptPath, taskInfoCpDest string) { diff --git a/internal/command/term/color.go b/internal/command/term/color.go index 636cd4c4c..38c1ada8e 100644 --- a/internal/command/term/color.go +++ b/internal/command/term/color.go @@ -3,7 +3,7 @@ package term import ( "github.com/fatih/color" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/baur" ) var ( diff --git a/internal/command/term/streams.go b/internal/command/term/streams.go index d9896d1bd..cd3055d2c 100644 --- a/internal/command/term/streams.go +++ b/internal/command/term/streams.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/baur" ) const separator = "------------------------------------------------------------------------------" diff --git a/internal/command/upgrade_configs.go b/internal/command/upgrade_configs.go index 9b9fe52f0..7e0b443fa 100644 --- a/internal/command/upgrade_configs.go +++ b/internal/command/upgrade_configs.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/baur" ) func init() { diff --git a/internal/command/upgrade_configs_test.go b/internal/command/upgrade_configs_test.go index e99314bdc..4803bb286 100644 --- a/internal/command/upgrade_configs_test.go +++ b/internal/command/upgrade_configs_test.go @@ -7,12 +7,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func TestUpgrade(t *testing.T) { diff --git a/internal/command/upgrade_db.go b/internal/command/upgrade_db.go index 85b032dff..ec24b45a3 100644 --- a/internal/command/upgrade_db.go +++ b/internal/command/upgrade_db.go @@ -8,9 +8,9 @@ import ( "github.com/spf13/cobra" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/storage" ) var upgradeDbLongHelp = fmt.Sprintf(` diff --git a/internal/command/upgrade_db_test.go b/internal/command/upgrade_db_test.go index f1cf17b17..facf395e4 100644 --- a/internal/command/upgrade_db_test.go +++ b/internal/command/upgrade_db_test.go @@ -10,7 +10,7 @@ import ( oldpostgres "github.com/simplesurance/baur/v2/pkg/storage/postgres" - "github.com/simplesurance/baur/v3/internal/testutils/repotest" + "github.com/simplesurance/baur/v4/internal/testutils/repotest" ) func TestUpgradeDb_DatabaseNotExist(t *testing.T) { diff --git a/internal/command/util_test.go b/internal/command/util_test.go index d5f1d786e..6e7df4eff 100644 --- a/internal/command/util_test.go +++ b/internal/command/util_test.go @@ -8,10 +8,10 @@ import ( "path/filepath" "testing" - "github.com/simplesurance/baur/v3/internal/command/term" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/testutils/logwriter" + "github.com/simplesurance/baur/v4/internal/command/term" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/testutils/logwriter" "github.com/stretchr/testify/require" ) diff --git a/internal/digest/gitobjectid/gitobjectid.go b/internal/digest/gitobjectid/gitobjectid.go index 45bb5064e..734155fd1 100644 --- a/internal/digest/gitobjectid/gitobjectid.go +++ b/internal/digest/gitobjectid/gitobjectid.go @@ -3,8 +3,8 @@ package gitobjectid import ( "context" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/vcs/git" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/vcs/git" ) type PrintfFn func(format string, a ...any) diff --git a/internal/digest/sha384/sha384.go b/internal/digest/sha384/sha384.go index 6c3f47241..1dfb16f28 100644 --- a/internal/digest/sha384/sha384.go +++ b/internal/digest/sha384/sha384.go @@ -9,7 +9,7 @@ import ( "os" "sort" - "github.com/simplesurance/baur/v3/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest" ) // Hash offers an interface to add data for computing a digest diff --git a/internal/digest/sha384/sha384_test.go b/internal/digest/sha384/sha384_test.go index a14779bab..d0abb18f9 100644 --- a/internal/digest/sha384/sha384_test.go +++ b/internal/digest/sha384/sha384_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" ) func TestDigestOnEmptyHashErrors(t *testing.T) { diff --git a/internal/fs/fileglob_test.go b/internal/fs/fileglob_test.go index 4cd386a37..015a13cdc 100644 --- a/internal/fs/fileglob_test.go +++ b/internal/fs/fileglob_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/strtest" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/strtest" ) func createFiles(t *testing.T, basedir string, paths []string) { diff --git a/internal/fs/fs_test.go b/internal/fs/fs_test.go index 67314067d..2d1eb4801 100644 --- a/internal/fs/fs_test.go +++ b/internal/fs/fs_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" ) func TestFindFileInParentDirsOnRoot(t *testing.T) { diff --git a/internal/output/filecopy/filecopy.go b/internal/output/filecopy/filecopy.go index 571aa2d61..a57abe795 100644 --- a/internal/output/filecopy/filecopy.go +++ b/internal/output/filecopy/filecopy.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/fs" ) var defLogFn = func(string, ...any) {} diff --git a/internal/resolve/glob/glob.go b/internal/resolve/glob/glob.go index d88e606ff..aa890d350 100644 --- a/internal/resolve/glob/glob.go +++ b/internal/resolve/glob/glob.go @@ -3,7 +3,7 @@ package glob import ( "fmt" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/fs" ) // Resolver resolves a glob path to files. The functionality is the same then diff --git a/internal/resolve/gosource/goenv.go b/internal/resolve/gosource/goenv.go index 1634fa945..a7b3cc560 100644 --- a/internal/resolve/gosource/goenv.go +++ b/internal/resolve/gosource/goenv.go @@ -6,7 +6,7 @@ import ( "fmt" "path/filepath" - "github.com/simplesurance/baur/v3/internal/exec" + "github.com/simplesurance/baur/v4/internal/exec" ) type goEnv struct { diff --git a/internal/resolve/gosource/gosource.go b/internal/resolve/gosource/gosource.go index da29c7dc8..a2cf3cc86 100644 --- a/internal/resolve/gosource/gosource.go +++ b/internal/resolve/gosource/gosource.go @@ -10,7 +10,7 @@ import ( "golang.org/x/tools/go/packages" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/fs" ) const globQueryPrefix = "fileglob=" diff --git a/internal/resolve/gosource/gosource_test.go b/internal/resolve/gosource/gosource_test.go index e8facd9a0..a68f757e8 100644 --- a/internal/resolve/gosource/gosource_test.go +++ b/internal/resolve/gosource/gosource_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/prettyprint" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/internal/testutils/strtest" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/prettyprint" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/internal/testutils/strtest" ) type testCfg struct { diff --git a/internal/testutils/gittest/gittest.go b/internal/testutils/gittest/gittest.go index 348a76211..9833fbdf4 100644 --- a/internal/testutils/gittest/gittest.go +++ b/internal/testutils/gittest/gittest.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/exec" + "github.com/simplesurance/baur/v4/internal/exec" ) // CommitFilesToGit adds and commit all files in directory (incl. diff --git a/internal/testutils/repotest/repotest.go b/internal/testutils/repotest/repotest.go index 7238bb454..aed07a98c 100644 --- a/internal/testutils/repotest/repotest.go +++ b/internal/testutils/repotest/repotest.go @@ -7,15 +7,15 @@ import ( "runtime" "testing" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/gitobjectid" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/testutils/dbtest" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/pkg/baur" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/gitobjectid" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/testutils/dbtest" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/pkg/baur" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func (r *Repo) CreateAppWithoutTasks(t *testing.T) *cfg.App { diff --git a/internal/vcs/git/files.go b/internal/vcs/git/files.go index 3066407d6..23a13d4fb 100644 --- a/internal/vcs/git/files.go +++ b/internal/vcs/git/files.go @@ -10,7 +10,7 @@ import ( "strconv" "strings" - "github.com/simplesurance/baur/v3/internal/exec" + "github.com/simplesurance/baur/v4/internal/exec" ) const ( diff --git a/internal/vcs/git/git.go b/internal/vcs/git/git.go index 25f45e87c..1bebdcb4b 100644 --- a/internal/vcs/git/git.go +++ b/internal/vcs/git/git.go @@ -12,8 +12,8 @@ import ( "path/filepath" "strings" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/fs" ) // CommandIsInstalled returns true if an executable called "git" is found in diff --git a/internal/vcs/git/git_test.go b/internal/vcs/git/git_test.go index a7d5b92f9..a1fcc6dd1 100644 --- a/internal/vcs/git/git_test.go +++ b/internal/vcs/git/git_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" ) func TestUntrackedFilesIncludesGitIgnoredFiles(t *testing.T) { diff --git a/internal/vcs/git/repository.go b/internal/vcs/git/repository.go index d5003f7f9..7ae02698b 100644 --- a/internal/vcs/git/repository.go +++ b/internal/vcs/git/repository.go @@ -5,7 +5,7 @@ import ( "path/filepath" "sync" - "github.com/simplesurance/baur/v3/internal/set" + "github.com/simplesurance/baur/v4/internal/set" ) const Name = "git" diff --git a/internal/vcs/git/trackedobjects.go b/internal/vcs/git/trackedobjects.go index 3055fe299..dc3d6d5d7 100644 --- a/internal/vcs/git/trackedobjects.go +++ b/internal/vcs/git/trackedobjects.go @@ -6,7 +6,7 @@ import ( "path/filepath" "sync" - "github.com/simplesurance/baur/v3/internal/set" + "github.com/simplesurance/baur/v4/internal/set" ) var ErrObjectNotFound = errors.New("git object id not found, file might not exist, untracked or modified") diff --git a/internal/vcs/git/trackedobjects_test.go b/internal/vcs/git/trackedobjects_test.go index ac86e6e37..41f997ac6 100644 --- a/internal/vcs/git/trackedobjects_test.go +++ b/internal/vcs/git/trackedobjects_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" ) func TestModifiedFilesMissing(t *testing.T) { diff --git a/pkg/baur/app.go b/pkg/baur/app.go index 364cdb219..9bd65eb5b 100644 --- a/pkg/baur/app.go +++ b/pkg/baur/app.go @@ -5,7 +5,7 @@ import ( "path/filepath" "sort" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) // App represents an Application. diff --git a/pkg/baur/cfgupgrade.go b/pkg/baur/cfgupgrade.go index 30be27520..2b41a3cd9 100644 --- a/pkg/baur/cfgupgrade.go +++ b/pkg/baur/cfgupgrade.go @@ -4,10 +4,10 @@ import ( "fmt" "path/filepath" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/cfg" - v5 "github.com/simplesurance/baur/v3/pkg/cfg/upgrade/v5" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/cfg" + v5 "github.com/simplesurance/baur/v4/pkg/cfg/upgrade/v5" ) // CfgUpgrader converts baur configurations files from a previous format to the diff --git a/pkg/baur/input.go b/pkg/baur/input.go index 2c797e6c8..c76f0c40b 100644 --- a/pkg/baur/input.go +++ b/pkg/baur/input.go @@ -1,6 +1,6 @@ package baur -import "github.com/simplesurance/baur/v3/internal/digest" +import "github.com/simplesurance/baur/v4/internal/digest" // Input represents an input type Input interface { diff --git a/pkg/baur/inputenvar.go b/pkg/baur/inputenvar.go index 4b5f4f6a7..ee0da6993 100644 --- a/pkg/baur/inputenvar.go +++ b/pkg/baur/inputenvar.go @@ -3,8 +3,8 @@ package baur import ( "fmt" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" ) // InputEnvVar represents an environment variable that is tracked as baur diff --git a/pkg/baur/inputfile.go b/pkg/baur/inputfile.go index ff485e88f..f56ebd903 100644 --- a/pkg/baur/inputfile.go +++ b/pkg/baur/inputfile.go @@ -3,8 +3,8 @@ package baur import ( "errors" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" ) type InputFileOpt func(*InputFile) diff --git a/pkg/baur/inputfile_singletoncache.go b/pkg/baur/inputfile_singletoncache.go index f815c29df..01dcaa39a 100644 --- a/pkg/baur/inputfile_singletoncache.go +++ b/pkg/baur/inputfile_singletoncache.go @@ -1,7 +1,7 @@ package baur import ( - "github.com/simplesurance/baur/v3/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest" ) const inputFileSingletonCacheInitialSize = 250 diff --git a/pkg/baur/inputfile_test.go b/pkg/baur/inputfile_test.go index 3e26cf02e..82231e29d 100644 --- a/pkg/baur/inputfile_test.go +++ b/pkg/baur/inputfile_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/digest/sha384" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" ) func TestDigestDoesNotDependOnRepoPath(t *testing.T) { diff --git a/pkg/baur/inputresolver.go b/pkg/baur/inputresolver.go index 4265a1b86..6b27b5c05 100644 --- a/pkg/baur/inputresolver.go +++ b/pkg/baur/inputresolver.go @@ -10,14 +10,14 @@ import ( "slices" "strings" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/gitobjectid" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/resolve/glob" - "github.com/simplesurance/baur/v3/internal/resolve/gosource" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/gitobjectid" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/resolve/glob" + "github.com/simplesurance/baur/v4/internal/resolve/gosource" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/cfg" ) // goSourceResolver returns a list source files required to compile a golang diff --git a/pkg/baur/inputresolver_cache.go b/pkg/baur/inputresolver_cache.go index 2cd6ef3cf..dad1a1dee 100644 --- a/pkg/baur/inputresolver_cache.go +++ b/pkg/baur/inputresolver_cache.go @@ -8,7 +8,7 @@ import ( "github.com/golang/groupcache/lru" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) const inputResolverCacheMaxEntries = 512 diff --git a/pkg/baur/inputresolver_test.go b/pkg/baur/inputresolver_test.go index 856d3d09a..b55a7a899 100644 --- a/pkg/baur/inputresolver_test.go +++ b/pkg/baur/inputresolver_test.go @@ -11,14 +11,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/testutils/fstest" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/testutils/fstest" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/cfg" ) type DummyGitUntrackedFilesResolver struct{} diff --git a/pkg/baur/inputresolver_unix_test.go b/pkg/baur/inputresolver_unix_test.go index 759459edf..808353329 100644 --- a/pkg/baur/inputresolver_unix_test.go +++ b/pkg/baur/inputresolver_unix_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/exec" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/testutils/gittest" + "github.com/simplesurance/baur/v4/internal/exec" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/testutils/gittest" ) func TestSymlinkTargetFilePermissionsChange(t *testing.T) { diff --git a/pkg/baur/inputs.go b/pkg/baur/inputs.go index a18da8327..8202a8b1f 100644 --- a/pkg/baur/inputs.go +++ b/pkg/baur/inputs.go @@ -5,8 +5,8 @@ import ( "fmt" "slices" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" ) // Inputs are resolved Inputs of a task. diff --git a/pkg/baur/inputstring.go b/pkg/baur/inputstring.go index 1a3d3405d..603ae5971 100644 --- a/pkg/baur/inputstring.go +++ b/pkg/baur/inputstring.go @@ -3,8 +3,8 @@ package baur import ( "fmt" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" ) // InputString represents a string diff --git a/pkg/baur/inputtask.go b/pkg/baur/inputtask.go index b3b0442c6..14113b4ff 100644 --- a/pkg/baur/inputtask.go +++ b/pkg/baur/inputtask.go @@ -1,6 +1,6 @@ package baur -import "github.com/simplesurance/baur/v3/internal/digest" +import "github.com/simplesurance/baur/v4/internal/digest" // InputTask is a baur task whose information are used as input of another // task. diff --git a/pkg/baur/loader.go b/pkg/baur/loader.go index 0e55e6452..c3e870cf9 100644 --- a/pkg/baur/loader.go +++ b/pkg/baur/loader.go @@ -7,10 +7,10 @@ import ( "golang.org/x/exp/maps" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/set" - "github.com/simplesurance/baur/v3/pkg/cfg" - "github.com/simplesurance/baur/v3/pkg/cfg/resolver" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/set" + "github.com/simplesurance/baur/v4/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg/resolver" ) type Logger interface { diff --git a/pkg/baur/loader_test.go b/pkg/baur/loader_test.go index 9b20290c1..13f408219 100644 --- a/pkg/baur/loader_test.go +++ b/pkg/baur/loader_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/internal/testutils/ostest" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/internal/testutils/ostest" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func TestFindAppConfigsRemovesDups(t *testing.T) { diff --git a/pkg/baur/output.go b/pkg/baur/output.go index 6f1e5a33c..4fd0a5b80 100644 --- a/pkg/baur/output.go +++ b/pkg/baur/output.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - "github.com/simplesurance/baur/v3/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest" ) type OutputType int diff --git a/pkg/baur/outputdockerimage.go b/pkg/baur/outputdockerimage.go index c0781dfe7..c2f13d66b 100644 --- a/pkg/baur/outputdockerimage.go +++ b/pkg/baur/outputdockerimage.go @@ -3,8 +3,8 @@ package baur import ( "fmt" - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/fs" ) // DockerInfoClient is an interface fo retrieving information about a docker image. diff --git a/pkg/baur/outputfile.go b/pkg/baur/outputfile.go index 037856875..cf233e26a 100644 --- a/pkg/baur/outputfile.go +++ b/pkg/baur/outputfile.go @@ -1,9 +1,9 @@ package baur import ( - "github.com/simplesurance/baur/v3/internal/digest" - "github.com/simplesurance/baur/v3/internal/digest/sha384" - "github.com/simplesurance/baur/v3/internal/fs" + "github.com/simplesurance/baur/v4/internal/digest" + "github.com/simplesurance/baur/v4/internal/digest/sha384" + "github.com/simplesurance/baur/v4/internal/fs" ) // OutputFile is a file created by a task run. diff --git a/pkg/baur/releasemanager.go b/pkg/baur/releasemanager.go index 5da118cd6..687884c4f 100644 --- a/pkg/baur/releasemanager.go +++ b/pkg/baur/releasemanager.go @@ -8,10 +8,10 @@ import ( "strconv" "strings" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/output/s3" - "github.com/simplesurance/baur/v3/internal/set" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/output/s3" + "github.com/simplesurance/baur/v4/internal/set" + "github.com/simplesurance/baur/v4/pkg/storage" ) type S3Downloader interface { diff --git a/pkg/baur/repository.go b/pkg/baur/repository.go index 5bf9df93d..260d8adf8 100644 --- a/pkg/baur/repository.go +++ b/pkg/baur/repository.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/pkg/cfg" ) // Repository represents a baur repository. diff --git a/pkg/baur/repository_test.go b/pkg/baur/repository_test.go index 0ee961416..16dc91472 100644 --- a/pkg/baur/repository_test.go +++ b/pkg/baur/repository_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/fs" - "github.com/simplesurance/baur/v3/internal/log" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/internal/fs" + "github.com/simplesurance/baur/v4/internal/log" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func TestNewRepositoryUsesRealPaths(t *testing.T) { diff --git a/pkg/baur/storage.go b/pkg/baur/storage.go index 0a8e2e1f3..47b6710f3 100644 --- a/pkg/baur/storage.go +++ b/pkg/baur/storage.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/simplesurance/baur/v3/internal/vcs/git" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/internal/vcs/git" + "github.com/simplesurance/baur/v4/pkg/storage" ) // StoreRun stores the result of a task run in a baur storage. diff --git a/pkg/baur/task.go b/pkg/baur/task.go index 923430d5b..607f3f59e 100644 --- a/pkg/baur/task.go +++ b/pkg/baur/task.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) // Task is a an execution step belonging to an app. diff --git a/pkg/baur/taskinfocreator.go b/pkg/baur/taskinfocreator.go index a15e2c011..04781254c 100644 --- a/pkg/baur/taskinfocreator.go +++ b/pkg/baur/taskinfocreator.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/simplesurance/baur/v3/pkg/cfg" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/storage" ) /* The implementation has the followig caveats: diff --git a/pkg/baur/taskrunner.go b/pkg/baur/taskrunner.go index f148d2d81..67fefb205 100644 --- a/pkg/baur/taskrunner.go +++ b/pkg/baur/taskrunner.go @@ -10,7 +10,7 @@ import ( "github.com/fatih/color" - "github.com/simplesurance/baur/v3/internal/exec" + "github.com/simplesurance/baur/v4/internal/exec" ) type ErrUntrackedGitFilesExist struct { diff --git a/pkg/baur/taskstatusevaluator.go b/pkg/baur/taskstatusevaluator.go index 5a037fff3..d34b8b0f2 100644 --- a/pkg/baur/taskstatusevaluator.go +++ b/pkg/baur/taskstatusevaluator.go @@ -6,7 +6,7 @@ import ( "fmt" "slices" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) // TaskStatusEvaluator determines if a task already run with the same set of diff --git a/pkg/baur/taskstatusevaluator_test.go b/pkg/baur/taskstatusevaluator_test.go index 2b609e3b4..dcd137381 100644 --- a/pkg/baur/taskstatusevaluator_test.go +++ b/pkg/baur/taskstatusevaluator_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func TestStatusEvaluatorFailsWhenTaskInfoAndLookupStrIsUsed(t *testing.T) { diff --git a/pkg/baur/uploadinfo.go b/pkg/baur/uploadinfo.go index 78b5017fe..8e2215ec5 100644 --- a/pkg/baur/uploadinfo.go +++ b/pkg/baur/uploadinfo.go @@ -3,7 +3,7 @@ package baur import ( "fmt" - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) type UploadMethod int diff --git a/pkg/cfg/includedb_test.go b/pkg/cfg/includedb_test.go index f7f0921c8..62d6d3e6f 100644 --- a/pkg/cfg/includedb_test.go +++ b/pkg/cfg/includedb_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/pkg/cfg/resolver" + "github.com/simplesurance/baur/v4/pkg/cfg/resolver" ) type mockResolver struct { diff --git a/pkg/cfg/inputinclude.go b/pkg/cfg/inputinclude.go index e3b88aaec..3b9f2a8b0 100644 --- a/pkg/cfg/inputinclude.go +++ b/pkg/cfg/inputinclude.go @@ -1,7 +1,7 @@ package cfg import ( - "github.com/simplesurance/baur/v3/internal/deepcopy" + "github.com/simplesurance/baur/v4/internal/deepcopy" ) // InputInclude is a reusable Input definition. diff --git a/pkg/cfg/outputinclude.go b/pkg/cfg/outputinclude.go index be0372722..e61e58d96 100644 --- a/pkg/cfg/outputinclude.go +++ b/pkg/cfg/outputinclude.go @@ -3,7 +3,7 @@ package cfg import ( "errors" - "github.com/simplesurance/baur/v3/internal/deepcopy" + "github.com/simplesurance/baur/v4/internal/deepcopy" ) // OutputInclude is a reusable Output definition diff --git a/pkg/cfg/taskinclude.go b/pkg/cfg/taskinclude.go index ef9fd221c..65987819c 100644 --- a/pkg/cfg/taskinclude.go +++ b/pkg/cfg/taskinclude.go @@ -1,7 +1,7 @@ package cfg import ( - "github.com/simplesurance/baur/v3/internal/deepcopy" + "github.com/simplesurance/baur/v4/internal/deepcopy" ) // TaskInclude is a reusable Tasks definition diff --git a/pkg/cfg/upgrade/v5/v5.go b/pkg/cfg/upgrade/v5/v5.go index a05b15f1c..84e452cbe 100644 --- a/pkg/cfg/upgrade/v5/v5.go +++ b/pkg/cfg/upgrade/v5/v5.go @@ -2,7 +2,7 @@ package v5 import ( - "github.com/simplesurance/baur/v3/pkg/cfg" + "github.com/simplesurance/baur/v4/pkg/cfg" ) func UpgradeRepositoryConfig(old *cfg.Repository) *cfg.Repository { diff --git a/pkg/cfg/validation.go b/pkg/cfg/validation.go index 92056d8d7..2361c6d6a 100644 --- a/pkg/cfg/validation.go +++ b/pkg/cfg/validation.go @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "github.com/simplesurance/baur/v3/internal/validation" + "github.com/simplesurance/baur/v4/internal/validation" ) var forbiddenNameRunes = [...]rune{ diff --git a/pkg/storage/postgres/filters_sorters.go b/pkg/storage/postgres/filters_sorters.go index 03c78e05a..a1fecd4c7 100644 --- a/pkg/storage/postgres/filters_sorters.go +++ b/pkg/storage/postgres/filters_sorters.go @@ -3,7 +3,7 @@ package postgres import ( "fmt" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) // query assembles an SQL-Query described by storage Filters and Sorters diff --git a/pkg/storage/postgres/init_test.go b/pkg/storage/postgres/init_test.go index 8585d2f11..5489bd9f4 100644 --- a/pkg/storage/postgres/init_test.go +++ b/pkg/storage/postgres/init_test.go @@ -11,7 +11,7 @@ import ( "github.com/jackc/pgx/v4/pgxpool" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/internal/testutils/dbtest" + "github.com/simplesurance/baur/v4/internal/testutils/dbtest" ) var ctx = context.Background() diff --git a/pkg/storage/postgres/insert.go b/pkg/storage/postgres/insert.go index 49c9c375d..f0dbc09d6 100644 --- a/pkg/storage/postgres/insert.go +++ b/pkg/storage/postgres/insert.go @@ -13,7 +13,7 @@ import ( "github.com/jackc/pgconn" "github.com/jackc/pgx/v4" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) func strArgList(args ...any) string { diff --git a/pkg/storage/postgres/insert_test.go b/pkg/storage/postgres/insert_test.go index 156636281..e23eb3ad9 100644 --- a/pkg/storage/postgres/insert_test.go +++ b/pkg/storage/postgres/insert_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) func TestSaveTaskRun(t *testing.T) { diff --git a/pkg/storage/postgres/query.go b/pkg/storage/postgres/query.go index e8313be0b..95a0013f7 100644 --- a/pkg/storage/postgres/query.go +++ b/pkg/storage/postgres/query.go @@ -9,7 +9,7 @@ import ( "github.com/jackc/pgx/v4" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) func (c *Client) TaskRun(ctx context.Context, id int) (*storage.TaskRunWithID, error) { diff --git a/pkg/storage/postgres/query_test.go b/pkg/storage/postgres/query_test.go index 13958f607..ed437980a 100644 --- a/pkg/storage/postgres/query_test.go +++ b/pkg/storage/postgres/query_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) // dropping the local monotonic values from timestamps and rounding them is required diff --git a/pkg/storage/postgres/schema.go b/pkg/storage/postgres/schema.go index 783eb94a9..b5d0af0e1 100644 --- a/pkg/storage/postgres/schema.go +++ b/pkg/storage/postgres/schema.go @@ -13,7 +13,7 @@ import ( "github.com/jackc/pgx/v4" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) // schemaVer is the database schema version required by this package. diff --git a/pkg/storage/postgres/schema_test.go b/pkg/storage/postgres/schema_test.go index f3328ae75..738d80422 100644 --- a/pkg/storage/postgres/schema_test.go +++ b/pkg/storage/postgres/schema_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/simplesurance/baur/v3/pkg/storage" + "github.com/simplesurance/baur/v4/pkg/storage" ) func TestIsCompatible_AfterInit(t *testing.T) {