Update Go imports paths (#4605)

Co-authored-by: Robert Kaussow <mail@thegeeklab.de>
2026-03-16 17:54:07 +01:00 · 2024-12-22 11:44:34 +02:00
parent ceb607ffec
commit 81b74025d4
390 changed files with 1030 additions and 1030 deletions
--- a/server/services/config/combined.go
+++ b/server/services/config/combined.go
@@ -17,9 +17,9 @@ package config
 import (
 	"context"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 type combined struct {
--- a/server/services/config/combined_test.go
+++ b/server/services/config/combined_test.go
@@ -31,10 +31,10 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/yaronf/httpsign"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks"
-	forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/config"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks"
+	forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/config"
 )

 func TestFetchFromConfigService(t *testing.T) {
--- a/server/services/config/forge.go
+++ b/server/services/config/forge.go
@@ -23,10 +23,10 @@ import (

 	"github.com/rs/zerolog/log"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/constant"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/shared/constant"
 )

 type forgeFetcher struct {
--- a/server/services/config/forge_test.go
+++ b/server/services/config/forge_test.go
@@ -24,10 +24,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks"
-	forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/config"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks"
+	forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/config"
 )

 func TestFetch(t *testing.T) {
--- a/server/services/config/http.go
+++ b/server/services/config/http.go
@@ -20,10 +20,10 @@ import (
 	"fmt"
 	net_http "net/http"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/utils"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/utils"
 )

 type http struct {
--- a/server/services/config/mocks/service.go
+++ b/server/services/config/mocks/service.go
@@ -6,11 +6,11 @@ import (
 	context "context"

 	mock "github.com/stretchr/testify/mock"
-	forge "go.woodpecker-ci.org/woodpecker/v2/server/forge"
+	forge "go.woodpecker-ci.org/woodpecker/v3/server/forge"

-	model "go.woodpecker-ci.org/woodpecker/v2/server/model"
+	model "go.woodpecker-ci.org/woodpecker/v3/server/model"

-	types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
+	types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
 )

 // Service is an autogenerated mock type for the Service type
--- a/server/services/config/service.go
+++ b/server/services/config/service.go
@@ -17,9 +17,9 @@ package config
 import (
 	"context"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
-	"go.woodpecker-ci.org/woodpecker/v2/server/forge/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 //go:generate mockery --name Service --output mocks --case underscore
--- a/server/services/encryption/aes.go
+++ b/server/services/encryption/aes.go
@@ -21,8 +21,8 @@ import (

 	"github.com/google/tink/go/subtle/random"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type aesEncryptionService struct {
--- a/server/services/encryption/aes_builder.go
+++ b/server/services/encryption/aes_builder.go
@@ -20,8 +20,8 @@ import (

 	"github.com/urfave/cli/v3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type aesConfiguration struct {
--- a/server/services/encryption/aes_encryption.go
+++ b/server/services/encryption/aes_encryption.go
@@ -23,7 +23,7 @@ import (
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/crypto/sha3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 func (svc *aesEncryptionService) loadCipher(password string) error {
--- a/server/services/encryption/encryption.go
+++ b/server/services/encryption/encryption.go
@@ -19,8 +19,8 @@ import (

 	"github.com/urfave/cli/v3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type builder struct {
--- a/server/services/encryption/encryption_builder.go
+++ b/server/services/encryption/encryption_builder.go
@@ -18,8 +18,8 @@ import (
 	"errors"
 	"fmt"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	storeTypes "go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	storeTypes "go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 func (b builder) getService(keyType string) (types.EncryptionService, error) {
--- a/server/services/encryption/no_encryption.go
+++ b/server/services/encryption/no_encryption.go
@@ -14,7 +14,7 @@

 package encryption

-import "go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
+import "go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"

 type noEncryptionBuilder struct {
 	clients []types.EncryptionClient
--- a/server/services/encryption/tink.go
+++ b/server/services/encryption/tink.go
@@ -21,8 +21,8 @@ import (
 	"github.com/fsnotify/fsnotify"
 	"github.com/google/tink/go/tink"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type tinkEncryptionService struct {
--- a/server/services/encryption/tink_builder.go
+++ b/server/services/encryption/tink_builder.go
@@ -20,8 +20,8 @@ import (

 	"github.com/urfave/cli/v3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type tinkConfiguration struct {
--- a/server/services/encryption/tink_keyset.go
+++ b/server/services/encryption/tink_keyset.go
@@ -25,7 +25,7 @@ import (
 	"github.com/google/tink/go/keyset"
 	"github.com/rs/zerolog/log"

-	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 func (svc *tinkEncryptionService) loadKeyset() error {
--- a/server/services/encryption/wrapper/store/secret_store.go
+++ b/server/services/encryption/wrapper/store/secret_store.go
@@ -17,7 +17,7 @@ package store
 import (
 	"fmt"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 func (wrapper *EncryptedSecretStore) SecretFind(repo *model.Repo, s string) (*model.Secret, error) {
--- a/server/services/encryption/wrapper/store/secret_store_wrapper.go
+++ b/server/services/encryption/wrapper/store/secret_store_wrapper.go
@@ -21,8 +21,8 @@ import (

 	"github.com/rs/zerolog/log"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/encryption/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/encryption/types"
 )

 type EncryptedSecretStore struct {
--- a/server/services/environment/mocks/service.go
+++ b/server/services/environment/mocks/service.go
@@ -4,7 +4,7 @@ package mocks

 import (
 	mock "github.com/stretchr/testify/mock"
-	model "go.woodpecker-ci.org/woodpecker/v2/server/model"
+	model "go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 // Service is an autogenerated mock type for the Service type
--- a/server/services/environment/parse.go
+++ b/server/services/environment/parse.go
@@ -19,7 +19,7 @@ import (

 	"github.com/rs/zerolog/log"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 type builtin struct {
--- a/server/services/environment/service.go
+++ b/server/services/environment/service.go
@@ -14,7 +14,7 @@

 package environment

-import "go.woodpecker-ci.org/woodpecker/v2/server/model"
+import "go.woodpecker-ci.org/woodpecker/v3/server/model"

 //go:generate mockery --name Service --output mocks --case underscore

--- a/server/services/log/file/file.go
+++ b/server/services/log/file/file.go
@@ -10,9 +10,9 @@ import (

 	logger "github.com/rs/zerolog/log"

-	"go.woodpecker-ci.org/woodpecker/v2/pipeline"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/log"
+	"go.woodpecker-ci.org/woodpecker/v3/pipeline"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/log"
 )

 const (
--- a/server/services/log/service.go
+++ b/server/services/log/service.go
@@ -1,6 +1,6 @@
 package log

-import "go.woodpecker-ci.org/woodpecker/v2/server/model"
+import "go.woodpecker-ci.org/woodpecker/v3/server/model"

 type Service interface {
 	LogFind(step *model.Step) ([]*model.LogEntry, error)
--- a/server/services/manager.go
+++ b/server/services/manager.go
@@ -21,13 +21,13 @@ import (
 	"github.com/jellydator/ttlcache/v3"
 	"github.com/urfave/cli/v3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/forge"
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/config"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/environment"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/registry"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/secret"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/forge"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/config"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/environment"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/registry"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/secret"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 //go:generate mockery --name Manager --output mocks --case underscore --note "+build test"
--- a/server/services/mocks/manager.go
+++ b/server/services/mocks/manager.go
@@ -8,19 +8,19 @@ package mocks
 import (
 	crypto "crypto"

-	config "go.woodpecker-ci.org/woodpecker/v2/server/services/config"
+	config "go.woodpecker-ci.org/woodpecker/v3/server/services/config"

-	environment "go.woodpecker-ci.org/woodpecker/v2/server/services/environment"
+	environment "go.woodpecker-ci.org/woodpecker/v3/server/services/environment"

-	forge "go.woodpecker-ci.org/woodpecker/v2/server/forge"
+	forge "go.woodpecker-ci.org/woodpecker/v3/server/forge"

 	mock "github.com/stretchr/testify/mock"

-	model "go.woodpecker-ci.org/woodpecker/v2/server/model"
+	model "go.woodpecker-ci.org/woodpecker/v3/server/model"

-	registry "go.woodpecker-ci.org/woodpecker/v2/server/services/registry"
+	registry "go.woodpecker-ci.org/woodpecker/v3/server/services/registry"

-	secret "go.woodpecker-ci.org/woodpecker/v2/server/services/secret"
+	secret "go.woodpecker-ci.org/woodpecker/v3/server/services/secret"
 )

 // Manager is an autogenerated mock type for the Manager type
--- a/server/services/permissions/admins.go
+++ b/server/services/permissions/admins.go
@@ -1,8 +1,8 @@
 package permissions

 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/utils"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/shared/utils"
 )

 func NewAdmins(admins []string) *Admins {
--- a/server/services/permissions/admins_test.go
+++ b/server/services/permissions/admins_test.go
@@ -5,7 +5,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 func TestAdmins(t *testing.T) {
--- a/server/services/permissions/orgs.go
+++ b/server/services/permissions/orgs.go
@@ -1,8 +1,8 @@
 package permissions

 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/utils"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/shared/utils"
 )

 func NewOrgs(orgs []string) *Orgs {
--- a/server/services/permissions/orgs_test.go
+++ b/server/services/permissions/orgs_test.go
@@ -5,7 +5,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 func TestOrgs(t *testing.T) {
--- a/server/services/permissions/repo_owners.go
+++ b/server/services/permissions/repo_owners.go
@@ -1,8 +1,8 @@
 package permissions

 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/shared/utils"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/shared/utils"
 )

 func NewOwnersAllowlist(owners []string) *OwnersAllowlist {
--- a/server/services/permissions/repo_owners_test.go
+++ b/server/services/permissions/repo_owners_test.go
@@ -5,7 +5,7 @@ import (

 	"github.com/stretchr/testify/assert"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 func TestOwnersAllowlist(t *testing.T) {
--- a/server/services/registry/combined.go
+++ b/server/services/registry/combined.go
@@ -17,8 +17,8 @@ package registry
 import (
 	"errors"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 type combined struct {
--- a/server/services/registry/db.go
+++ b/server/services/registry/db.go
@@ -15,8 +15,8 @@
 package registry

 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type db struct {
--- a/server/services/registry/filesystem.go
+++ b/server/services/registry/filesystem.go
@@ -24,8 +24,8 @@ import (
 	config_file "github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/config/types"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	model_types "go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	model_types "go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 type filesystem struct {
--- a/server/services/registry/mocks/service.go
+++ b/server/services/registry/mocks/service.go
@@ -4,7 +4,7 @@ package mocks

 import (
 	mock "github.com/stretchr/testify/mock"
-	model "go.woodpecker-ci.org/woodpecker/v2/server/model"
+	model "go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 // Service is an autogenerated mock type for the Service type
--- a/server/services/registry/service.go
+++ b/server/services/registry/service.go
@@ -14,7 +14,7 @@

 package registry

-import "go.woodpecker-ci.org/woodpecker/v2/server/model"
+import "go.woodpecker-ci.org/woodpecker/v3/server/model"

 //go:generate mockery --name Service --output mocks --case underscore

--- a/server/services/secret/db.go
+++ b/server/services/secret/db.go
@@ -15,8 +15,8 @@
 package secret

 import (
-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
 )

 type db struct {
--- a/server/services/secret/db_test.go
+++ b/server/services/secret/db_test.go
@@ -20,9 +20,9 @@ import (
 	"github.com/franela/goblin"
 	"github.com/stretchr/testify/mock"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/secret"
-	mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/secret"
+	mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks"
 )

 func TestSecretListPipeline(t *testing.T) {
--- a/server/services/secret/mocks/service.go
+++ b/server/services/secret/mocks/service.go
@@ -4,7 +4,7 @@ package mocks

 import (
 	mock "github.com/stretchr/testify/mock"
-	model "go.woodpecker-ci.org/woodpecker/v2/server/model"
+	model "go.woodpecker-ci.org/woodpecker/v3/server/model"
 )

 // Service is an autogenerated mock type for the Service type
--- a/server/services/secret/service.go
+++ b/server/services/secret/service.go
@@ -14,7 +14,7 @@

 package secret

-import "go.woodpecker-ci.org/woodpecker/v2/server/model"
+import "go.woodpecker-ci.org/woodpecker/v3/server/model"

 //go:generate mockery --name Service --output mocks --case underscore

--- a/server/services/setup.go
+++ b/server/services/setup.go
@@ -26,12 +26,12 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/urfave/cli/v3"

-	"go.woodpecker-ci.org/woodpecker/v2/server/model"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/config"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/registry"
-	"go.woodpecker-ci.org/woodpecker/v2/server/services/secret"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store"
-	"go.woodpecker-ci.org/woodpecker/v2/server/store/types"
+	"go.woodpecker-ci.org/woodpecker/v3/server/model"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/config"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/registry"
+	"go.woodpecker-ci.org/woodpecker/v3/server/services/secret"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )

 func setupRegistryService(store store.Store, dockerConfig string) registry.Service {