diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 074502363..8fef8d0a7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,8 +27,8 @@ repos: rev: v2.13.1-beta hooks: - id: hadolint - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v4.0.0-alpha.8 + - repo: https://github.com/rbubley/mirrors-prettier + rev: v3.4.2 hooks: - id: prettier - repo: https://github.com/adrienverge/yamllint.git diff --git a/Makefile b/Makefile index dadacae45..a9cf6bb42 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ else endif TAGS ?= -LDFLAGS := -X go.woodpecker-ci.org/woodpecker/v2/version.Version=${VERSION} +LDFLAGS := -X go.woodpecker-ci.org/woodpecker/v3/version.Version=${VERSION} STATIC_BUILD ?= true ifeq ($(STATIC_BUILD),true) LDFLAGS := -s -w -extldflags "-static" $(LDFLAGS) @@ -161,20 +161,20 @@ lint-ui: ui-dependencies ## Lint UI code (cd web/; pnpm lint --quiet) test-agent: ## Test agent code - go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/agent go.woodpecker-ci.org/woodpecker/v2/agent/... + go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/agent go.woodpecker-ci.org/woodpecker/v3/agent/... test-server: ## Test server code - go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v2/server/... | grep -v '/store') + go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v3/server/... | grep -v '/store') test-cli: ## Test cli code - go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/cmd/cli go.woodpecker-ci.org/woodpecker/v2/cli/... + go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/cmd/cli go.woodpecker-ci.org/woodpecker/v3/cli/... test-server-datastore: ## Test server datastore - go test -timeout 300s -tags 'test $(TAGS)' -run TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... - go test -race -timeout 100s -tags 'test $(TAGS)' -skip TestMigrate go.woodpecker-ci.org/woodpecker/v2/server/store/... + go test -timeout 300s -tags 'test $(TAGS)' -run TestMigrate go.woodpecker-ci.org/woodpecker/v3/server/store/... + go test -race -timeout 100s -tags 'test $(TAGS)' -skip TestMigrate go.woodpecker-ci.org/woodpecker/v3/server/store/... test-server-datastore-coverage: ## Test server datastore with coverage report - go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v2/server/store/... + go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test $(TAGS)' go.woodpecker-ci.org/woodpecker/v3/server/store/... test-ui: ui-dependencies ## Test UI code (cd web/; pnpm run lint) @@ -194,13 +194,13 @@ build-ui: ## Build UI (cd web/; pnpm install --frozen-lockfile; pnpm build) build-server: build-ui generate-openapi ## Build server - CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/server + CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-server${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/server build-agent: ## Build agent - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/agent + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-agent${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/agent build-cli: ## Build cli - CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v2/cmd/cli + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-cli${BIN_SUFFIX} go.woodpecker-ci.org/woodpecker/v3/cmd/cli build-tarball: ## Build tar archive mkdir -p ${DIST_DIR} && tar chzvf ${DIST_DIR}/woodpecker-src.tar.gz \ @@ -259,7 +259,7 @@ release-server-xgo: check-xgo ## Create server binaries for release using xgo release-server: ## Create server binaries for release # compile - GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/v2/cmd/server + GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=${CGO_ENABLED} go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server$(BIN_SUFFIX) go.woodpecker-ci.org/woodpecker/v3/cmd/server # tar binary files if [ "$(BIN_SUFFIX)" == ".exe" ]; then \ zip -j ${DIST_DIR}/woodpecker-server_$(TARGETOS)_$(TARGETARCH).zip ${DIST_DIR}/server/$(TARGETOS)_$(TARGETARCH)/woodpecker-server.exe; \ @@ -269,12 +269,12 @@ release-server: ## Create server binaries for release release-agent: ## Create agent binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v2/cmd/agent + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_arm/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/windows_amd64/woodpecker-agent.exe go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_amd64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/darwin_arm64/woodpecker-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent # tar binary files tar -cvzf ${DIST_DIR}/woodpecker-agent_linux_amd64.tar.gz -C ${DIST_DIR}/agent/linux_amd64 woodpecker-agent tar -cvzf ${DIST_DIR}/woodpecker-agent_linux_arm64.tar.gz -C ${DIST_DIR}/agent/linux_arm64 woodpecker-agent @@ -287,12 +287,12 @@ release-agent: ## Create agent binaries for release release-cli: ## Create cli binaries for release # compile - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli - GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v2/cmd/cli + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/windows_amd64/woodpecker-cli.exe go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_amd64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_arm64/woodpecker-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli # tar binary files tar -cvzf ${DIST_DIR}/woodpecker-cli_linux_amd64.tar.gz -C ${DIST_DIR}/cli/linux_amd64 woodpecker-cli tar -cvzf ${DIST_DIR}/woodpecker-cli_linux_arm64.tar.gz -C ${DIST_DIR}/cli/linux_arm64 woodpecker-cli diff --git a/README.md b/README.md index 1386dc7c1..9806ceb33 100644 --- a/README.md +++ b/README.md @@ -19,11 +19,11 @@ Matrix space - - Go Report Card + + Go Report Card - - go reference + + go reference GitHub release diff --git a/agent/logger.go b/agent/logger.go index 7e3469fd6..47413df90 100644 --- a/agent/logger.go +++ b/agent/logger.go @@ -20,10 +20,10 @@ import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) func (r *Runner) createLogger(_logger zerolog.Logger, uploads *sync.WaitGroup, workflow *rpc.Workflow) pipeline.Logger { diff --git a/agent/rpc/auth_client_grpc.go b/agent/rpc/auth_client_grpc.go index 55c89a41a..7abc7835d 100644 --- a/agent/rpc/auth_client_grpc.go +++ b/agent/rpc/auth_client_grpc.go @@ -20,7 +20,7 @@ import ( "google.golang.org/grpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" ) const authClientTimeout = time.Second * 5 diff --git a/agent/rpc/client_grpc.go b/agent/rpc/client_grpc.go index 7ebe9e04d..29c552e2a 100644 --- a/agent/rpc/client_grpc.go +++ b/agent/rpc/client_grpc.go @@ -27,9 +27,9 @@ import ( "google.golang.org/grpc/status" grpcproto "google.golang.org/protobuf/proto" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" ) const ( diff --git a/agent/runner.go b/agent/runner.go index 27363aa66..f5640982e 100644 --- a/agent/runner.go +++ b/agent/runner.go @@ -25,11 +25,11 @@ import ( "github.com/rs/zerolog/log" "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) type Runner struct { diff --git a/agent/tracer.go b/agent/tracer.go index ff8f23c38..a3af590d3 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) func (r *Runner) createTracer(ctxMeta context.Context, uploads *sync.WaitGroup, logger zerolog.Logger, workflow *rpc.Workflow) pipeline.TraceFunc { diff --git a/cli/admin/admin.go b/cli/admin/admin.go index f99b79f0f..110c210d4 100644 --- a/cli/admin/admin.go +++ b/cli/admin/admin.go @@ -17,10 +17,10 @@ package admin import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/loglevel" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/secret" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin/user" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/loglevel" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin/user" ) // Command exports the admin command set. diff --git a/cli/admin/loglevel/loglevel.go b/cli/admin/loglevel/loglevel.go index 323974d01..aac46af36 100644 --- a/cli/admin/loglevel/loglevel.go +++ b/cli/admin/loglevel/loglevel.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the log-level command used to change the servers log-level. diff --git a/cli/admin/registry/registry_add.go b/cli/admin/registry/registry_add.go index b09f8a74e..756bcc9dd 100644 --- a/cli/admin/registry/registry_add.go +++ b/cli/admin/registry/registry_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_list.go b/cli/admin/registry/registry_list.go index 72332b9a0..cef4af5b4 100644 --- a/cli/admin/registry/registry_list.go +++ b/cli/admin/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_rm.go b/cli/admin/registry/registry_rm.go index 3dfb02c1f..296135694 100644 --- a/cli/admin/registry/registry_rm.go +++ b/cli/admin/registry/registry_rm.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_set.go b/cli/admin/registry/registry_set.go index 4196a982d..dca865e93 100644 --- a/cli/admin/registry/registry_set.go +++ b/cli/admin/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/admin/registry/registry_show.go b/cli/admin/registry/registry_show.go index c7ae1359d..bf6561ed7 100644 --- a/cli/admin/registry/registry_show.go +++ b/cli/admin/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_add.go b/cli/admin/secret/secret_add.go index 07afa8134..ad65c00db 100644 --- a/cli/admin/secret/secret_add.go +++ b/cli/admin/secret/secret_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_list.go b/cli/admin/secret/secret_list.go index d8d7374f0..ee00567fc 100644 --- a/cli/admin/secret/secret_list.go +++ b/cli/admin/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_rm.go b/cli/admin/secret/secret_rm.go index f919d6b9d..596672d3a 100644 --- a/cli/admin/secret/secret_rm.go +++ b/cli/admin/secret/secret_rm.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_set.go b/cli/admin/secret/secret_set.go index 452826115..7e86d66e2 100644 --- a/cli/admin/secret/secret_set.go +++ b/cli/admin/secret/secret_set.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/admin/secret/secret_show.go b/cli/admin/secret/secret_show.go index 09ce610b8..b5b9855b9 100644 --- a/cli/admin/secret/secret_show.go +++ b/cli/admin/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/admin/user/user_add.go b/cli/admin/user/user_add.go index b05b5f6a9..aecf11e9d 100644 --- a/cli/admin/user/user_add.go +++ b/cli/admin/user/user_add.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var userAddCmd = &cli.Command{ diff --git a/cli/admin/user/user_list.go b/cli/admin/user/user_list.go index 894ec02df..baa436861 100644 --- a/cli/admin/user/user_list.go +++ b/cli/admin/user/user_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var userListCmd = &cli.Command{ diff --git a/cli/admin/user/user_rm.go b/cli/admin/user/user_rm.go index 962fc03a1..f6f4a7cdc 100644 --- a/cli/admin/user/user_rm.go +++ b/cli/admin/user/user_rm.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var userRemoveCmd = &cli.Command{ diff --git a/cli/admin/user/user_show.go b/cli/admin/user/user_show.go index 6ed453fc8..9f45d5a13 100644 --- a/cli/admin/user/user_show.go +++ b/cli/admin/user/user_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var userShowCmd = &cli.Command{ diff --git a/cli/common/flags.go b/cli/common/flags.go index db972762d..5cada2671 100644 --- a/cli/common/flags.go +++ b/cli/common/flags.go @@ -17,7 +17,7 @@ package common import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) var GlobalFlags = append([]cli.Flag{ diff --git a/cli/common/hooks.go b/cli/common/hooks.go index d35dd2fd6..fb7a4b4c7 100644 --- a/cli/common/hooks.go +++ b/cli/common/hooks.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal/config" - "go.woodpecker-ci.org/woodpecker/v2/cli/update" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal/config" + "go.woodpecker-ci.org/woodpecker/v3/cli/update" ) var ( diff --git a/cli/common/pipeline.go b/cli/common/pipeline.go index fba8cb54a..ba560ba1e 100644 --- a/cli/common/pipeline.go +++ b/cli/common/pipeline.go @@ -22,7 +22,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func DetectPipelineConfig() (isDir bool, config string, _ error) { diff --git a/cli/common/zerologger.go b/cli/common/zerologger.go index 7c932c83d..e27682023 100644 --- a/cli/common/zerologger.go +++ b/cli/common/zerologger.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) func setupGlobalLogger(ctx context.Context, c *cli.Command) error { diff --git a/cli/exec/dummy.go b/cli/exec/dummy.go index edb544598..757bd9519 100644 --- a/cli/exec/dummy.go +++ b/cli/exec/dummy.go @@ -17,7 +17,7 @@ package exec -import "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" +import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" func init() { //nolint:gochecknoinits backends = append(backends, dummy.New()) diff --git a/cli/exec/exec.go b/cli/exec/exec.go index 0b1462d6c..43bd57388 100644 --- a/cli/exec/exec.go +++ b/cli/exec/exec.go @@ -29,22 +29,22 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/lint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - pipelineLog "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/lint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/local" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + pipelineLog "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // Command exports the exec command. diff --git a/cli/exec/metadata.go b/cli/exec/metadata.go index 799e843a4..f4366ae47 100644 --- a/cli/exec/metadata.go +++ b/cli/exec/metadata.go @@ -24,9 +24,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // return the metadata from the cli context. diff --git a/cli/exec/metadata_test.go b/cli/exec/metadata_test.go index 188426e8d..231dc9cb2 100644 --- a/cli/exec/metadata_test.go +++ b/cli/exec/metadata_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/require" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" ) func TestMetadataFromContext(t *testing.T) { diff --git a/cli/info/info.go b/cli/info/info.go index 2d17680d4..06f81e1c4 100644 --- a/cli/info/info.go +++ b/cli/info/info.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) // Command exports the info command. diff --git a/cli/internal/util.go b/cli/internal/util.go index e705dc9f9..e1367dfd5 100644 --- a/cli/internal/util.go +++ b/cli/internal/util.go @@ -30,7 +30,7 @@ import ( "golang.org/x/net/proxy" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // NewClient returns a new client from the CLI context. diff --git a/cli/lint/lint.go b/cli/lint/lint.go index b52175daa..832a508bd 100644 --- a/cli/lint/lint.go +++ b/cli/lint/lint.go @@ -24,10 +24,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) // Command exports the info command. diff --git a/cli/lint/utils.go b/cli/lint/utils.go index c6b5a95ba..bfa29c6c0 100644 --- a/cli/lint/utils.go +++ b/cli/lint/utils.go @@ -7,7 +7,7 @@ import ( term_env "github.com/muesli/termenv" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" ) func FormatLintError(file string, err error, strict bool) (string, error) { diff --git a/cli/org/org.go b/cli/org/org.go index 2b3aacf28..1c03978df 100644 --- a/cli/org/org.go +++ b/cli/org/org.go @@ -17,8 +17,8 @@ package org import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/org/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/org/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/org/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/org/secret" ) // Command exports the org command set. diff --git a/cli/org/registry/registry.go b/cli/org/registry/registry.go index 38ca0454e..4788deb91 100644 --- a/cli/org/registry/registry.go +++ b/cli/org/registry/registry.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the registry command set. diff --git a/cli/org/registry/registry_add.go b/cli/org/registry/registry_add.go index e6b184bcf..c15990b42 100644 --- a/cli/org/registry/registry_add.go +++ b/cli/org/registry/registry_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/org/registry/registry_list.go b/cli/org/registry/registry_list.go index a905d2128..ca036a806 100644 --- a/cli/org/registry/registry_list.go +++ b/cli/org/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/org/registry/registry_rm.go b/cli/org/registry/registry_rm.go index 8157e1626..151cf1b9d 100644 --- a/cli/org/registry/registry_rm.go +++ b/cli/org/registry/registry_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/org/registry/registry_set.go b/cli/org/registry/registry_set.go index e08e2af4f..08d8f829f 100644 --- a/cli/org/registry/registry_set.go +++ b/cli/org/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/org/registry/registry_show.go b/cli/org/registry/registry_show.go index 8fd7a77f0..ede2994e5 100644 --- a/cli/org/registry/registry_show.go +++ b/cli/org/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/org/secret/secret.go b/cli/org/secret/secret.go index b50880c91..af53be6ed 100644 --- a/cli/org/secret/secret.go +++ b/cli/org/secret/secret.go @@ -19,7 +19,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the secret command. diff --git a/cli/org/secret/secret_add.go b/cli/org/secret/secret_add.go index d356773f1..a0a83ef80 100644 --- a/cli/org/secret/secret_add.go +++ b/cli/org/secret/secret_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/org/secret/secret_list.go b/cli/org/secret/secret_list.go index f33aaaa8a..bba6079e9 100644 --- a/cli/org/secret/secret_list.go +++ b/cli/org/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/org/secret/secret_rm.go b/cli/org/secret/secret_rm.go index 0b0f4db39..37b2fe8fa 100644 --- a/cli/org/secret/secret_rm.go +++ b/cli/org/secret/secret_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/org/secret/secret_set.go b/cli/org/secret/secret_set.go index 4357d3296..cb784c316 100644 --- a/cli/org/secret/secret_set.go +++ b/cli/org/secret/secret_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/org/secret/secret_show.go b/cli/org/secret/secret_show.go index 9a78741c2..86790c42b 100644 --- a/cli/org/secret/secret_show.go +++ b/cli/org/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/pipeline/approve.go b/cli/pipeline/approve.go index ae99324f5..299d7c10d 100644 --- a/cli/pipeline/approve.go +++ b/cli/pipeline/approve.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineApproveCmd = &cli.Command{ diff --git a/cli/pipeline/create.go b/cli/pipeline/create.go index 7f079f818..b317d4b3c 100644 --- a/cli/pipeline/create.go +++ b/cli/pipeline/create.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineCreateCmd = &cli.Command{ diff --git a/cli/pipeline/decline.go b/cli/pipeline/decline.go index f44179ba8..330515314 100644 --- a/cli/pipeline/decline.go +++ b/cli/pipeline/decline.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineDeclineCmd = &cli.Command{ diff --git a/cli/pipeline/deploy/deploy.go b/cli/pipeline/deploy/deploy.go index 199310ac6..110c675c5 100644 --- a/cli/pipeline/deploy/deploy.go +++ b/cli/pipeline/deploy/deploy.go @@ -23,9 +23,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the deploy command. diff --git a/cli/pipeline/kill.go b/cli/pipeline/kill.go index 839d7c75e..ac72899b7 100644 --- a/cli/pipeline/kill.go +++ b/cli/pipeline/kill.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineKillCmd = &cli.Command{ diff --git a/cli/pipeline/last.go b/cli/pipeline/last.go index 68e6cbb2f..3b3b4e315 100644 --- a/cli/pipeline/last.go +++ b/cli/pipeline/last.go @@ -19,9 +19,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineLastCmd = &cli.Command{ diff --git a/cli/pipeline/list.go b/cli/pipeline/list.go index 930e0e84f..312456a7a 100644 --- a/cli/pipeline/list.go +++ b/cli/pipeline/list.go @@ -20,10 +20,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) //nolint:mnd diff --git a/cli/pipeline/list_test.go b/cli/pipeline/list_test.go index 4668b2fb3..969e06794 100644 --- a/cli/pipeline/list_test.go +++ b/cli/pipeline/list_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker/mocks" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker/mocks" ) func TestPipelineList(t *testing.T) { diff --git a/cli/pipeline/log/log_purge.go b/cli/pipeline/log/log_purge.go index 44070289b..80cd0d55f 100644 --- a/cli/pipeline/log/log_purge.go +++ b/cli/pipeline/log/log_purge.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var logPurgeCmd = &cli.Command{ diff --git a/cli/pipeline/log/log_show.go b/cli/pipeline/log/log_show.go index e9de7a747..86931e31e 100644 --- a/cli/pipeline/log/log_show.go +++ b/cli/pipeline/log/log_show.go @@ -23,8 +23,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var logShowCmd = &cli.Command{ diff --git a/cli/pipeline/pipeline.go b/cli/pipeline/pipeline.go index 04bd256df..efcae8553 100644 --- a/cli/pipeline/pipeline.go +++ b/cli/pipeline/pipeline.go @@ -22,10 +22,10 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/output" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/deploy" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/output" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline/deploy" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the pipeline command set. diff --git a/cli/pipeline/pipeline_test.go b/cli/pipeline/pipeline_test.go index 4bbe52b31..5238a19fe 100644 --- a/cli/pipeline/pipeline_test.go +++ b/cli/pipeline/pipeline_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) func TestPipelineOutput(t *testing.T) { diff --git a/cli/pipeline/ps.go b/cli/pipeline/ps.go index 5468d480a..f2836d7c3 100644 --- a/cli/pipeline/ps.go +++ b/cli/pipeline/ps.go @@ -23,9 +23,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelinePsCmd = &cli.Command{ diff --git a/cli/pipeline/purge.go b/cli/pipeline/purge.go index 3781f8458..0e22537f3 100644 --- a/cli/pipeline/purge.go +++ b/cli/pipeline/purge.go @@ -24,9 +24,9 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) //nolint:mnd diff --git a/cli/pipeline/purge_test.go b/cli/pipeline/purge_test.go index 728a947d4..b6e285492 100644 --- a/cli/pipeline/purge_test.go +++ b/cli/pipeline/purge_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker/mocks" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker/mocks" ) func TestPipelinePurge(t *testing.T) { diff --git a/cli/pipeline/queue.go b/cli/pipeline/queue.go index ffa123d4e..239179456 100644 --- a/cli/pipeline/queue.go +++ b/cli/pipeline/queue.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineQueueCmd = &cli.Command{ diff --git a/cli/pipeline/show.go b/cli/pipeline/show.go index 2f14224af..2b9a25d4a 100644 --- a/cli/pipeline/show.go +++ b/cli/pipeline/show.go @@ -20,9 +20,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineShowCmd = &cli.Command{ diff --git a/cli/pipeline/start.go b/cli/pipeline/start.go index 02c3e3de0..694295fae 100644 --- a/cli/pipeline/start.go +++ b/cli/pipeline/start.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var pipelineStartCmd = &cli.Command{ diff --git a/cli/pipeline/stop.go b/cli/pipeline/stop.go index a69352249..af2fa7b4d 100644 --- a/cli/pipeline/stop.go +++ b/cli/pipeline/stop.go @@ -21,7 +21,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var pipelineStopCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_add.go b/cli/repo/cron/cron_add.go index 2ab730e0d..df86ef483 100644 --- a/cli/repo/cron/cron_add.go +++ b/cli/repo/cron/cron_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronCreateCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_list.go b/cli/repo/cron/cron_list.go index 6925b784d..45b1d4fb4 100644 --- a/cli/repo/cron/cron_list.go +++ b/cli/repo/cron/cron_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronListCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_rm.go b/cli/repo/cron/cron_rm.go index 048dcd605..89a6fcb7b 100644 --- a/cli/repo/cron/cron_rm.go +++ b/cli/repo/cron/cron_rm.go @@ -20,8 +20,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var cronDeleteCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_show.go b/cli/repo/cron/cron_show.go index 2e8b86650..c2bc9c36b 100644 --- a/cli/repo/cron/cron_show.go +++ b/cli/repo/cron/cron_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var cronShowCmd = &cli.Command{ diff --git a/cli/repo/cron/cron_update.go b/cli/repo/cron/cron_update.go index de66e9a1f..987505b84 100644 --- a/cli/repo/cron/cron_update.go +++ b/cli/repo/cron/cron_update.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var cronUpdateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry.go b/cli/repo/registry/registry.go index ab362934a..475d7564f 100644 --- a/cli/repo/registry/registry.go +++ b/cli/repo/registry/registry.go @@ -17,8 +17,8 @@ package registry import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the registry command set. diff --git a/cli/repo/registry/registry_add.go b/cli/repo/registry/registry_add.go index 50eecffa0..87202244b 100644 --- a/cli/repo/registry/registry_add.go +++ b/cli/repo/registry/registry_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryCreateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_list.go b/cli/repo/registry/registry_list.go index d76bcc18b..8d41457b3 100644 --- a/cli/repo/registry/registry_list.go +++ b/cli/repo/registry/registry_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryListCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_rm.go b/cli/repo/registry/registry_rm.go index 4b3437d48..94613e8d0 100644 --- a/cli/repo/registry/registry_rm.go +++ b/cli/repo/registry/registry_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryDeleteCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_set.go b/cli/repo/registry/registry_set.go index 4af39f5c2..131269f9c 100644 --- a/cli/repo/registry/registry_set.go +++ b/cli/repo/registry/registry_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var registryUpdateCmd = &cli.Command{ diff --git a/cli/repo/registry/registry_show.go b/cli/repo/registry/registry_show.go index d3b50b9f2..b3b7869a5 100644 --- a/cli/repo/registry/registry_show.go +++ b/cli/repo/registry/registry_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var registryShowCmd = &cli.Command{ diff --git a/cli/repo/repo.go b/cli/repo/repo.go index 8bb3b612a..f64f6a280 100644 --- a/cli/repo/repo.go +++ b/cli/repo/repo.go @@ -17,9 +17,9 @@ package repo import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/cron" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/registry" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo/secret" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/cron" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/registry" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo/secret" ) // Command exports the repository command. diff --git a/cli/repo/repo_add.go b/cli/repo/repo_add.go index 55601dd85..c9cd60a73 100644 --- a/cli/repo/repo_add.go +++ b/cli/repo/repo_add.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoAddCmd = &cli.Command{ diff --git a/cli/repo/repo_chown.go b/cli/repo/repo_chown.go index 118940184..f294ab277 100644 --- a/cli/repo/repo_chown.go +++ b/cli/repo/repo_chown.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoChownCmd = &cli.Command{ diff --git a/cli/repo/repo_list.go b/cli/repo/repo_list.go index 4e2ae0f85..92e5b73d5 100644 --- a/cli/repo/repo_list.go +++ b/cli/repo/repo_list.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoListCmd = &cli.Command{ diff --git a/cli/repo/repo_repair.go b/cli/repo/repo_repair.go index 35ca8f398..850d97357 100644 --- a/cli/repo/repo_repair.go +++ b/cli/repo/repo_repair.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoRepairCmd = &cli.Command{ diff --git a/cli/repo/repo_rm.go b/cli/repo/repo_rm.go index b884dccf3..0b56c70e7 100644 --- a/cli/repo/repo_rm.go +++ b/cli/repo/repo_rm.go @@ -20,7 +20,7 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoRemoveCmd = &cli.Command{ diff --git a/cli/repo/repo_show.go b/cli/repo/repo_show.go index af8a45153..c9c9ce87c 100644 --- a/cli/repo/repo_show.go +++ b/cli/repo/repo_show.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var repoShowCmd = &cli.Command{ diff --git a/cli/repo/repo_sync.go b/cli/repo/repo_sync.go index b9bbdaa63..d7802c92e 100644 --- a/cli/repo/repo_sync.go +++ b/cli/repo/repo_sync.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoSyncCmd = &cli.Command{ diff --git a/cli/repo/repo_update.go b/cli/repo/repo_update.go index d8bc73917..dd28e3d28 100644 --- a/cli/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var repoUpdateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret.go b/cli/repo/secret/secret.go index 2d5d965e6..4bdbf674b 100644 --- a/cli/repo/secret/secret.go +++ b/cli/repo/secret/secret.go @@ -17,8 +17,8 @@ package secret import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Command exports the secret command. diff --git a/cli/repo/secret/secret_add.go b/cli/repo/secret/secret_add.go index cc4251e20..fb6e21383 100644 --- a/cli/repo/secret/secret_add.go +++ b/cli/repo/secret/secret_add.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretCreateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_list.go b/cli/repo/secret/secret_list.go index 3ad0b23d4..b6bf0145f 100644 --- a/cli/repo/secret/secret_list.go +++ b/cli/repo/secret/secret_list.go @@ -22,9 +22,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretListCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_rm.go b/cli/repo/secret/secret_rm.go index aa0109e67..b2fb8c07b 100644 --- a/cli/repo/secret/secret_rm.go +++ b/cli/repo/secret/secret_rm.go @@ -19,8 +19,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretDeleteCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_set.go b/cli/repo/secret/secret_set.go index 60c0fcc8d..b28473527 100644 --- a/cli/repo/secret/secret_set.go +++ b/cli/repo/secret/secret_set.go @@ -21,9 +21,9 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) var secretUpdateCmd = &cli.Command{ diff --git a/cli/repo/secret/secret_show.go b/cli/repo/secret/secret_show.go index 8387f4054..15515fdb8 100644 --- a/cli/repo/secret/secret_show.go +++ b/cli/repo/secret/secret_show.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal" ) var secretShowCmd = &cli.Command{ diff --git a/cli/setup/setup.go b/cli/setup/setup.go index c0be0006a..8b00467cf 100644 --- a/cli/setup/setup.go +++ b/cli/setup/setup.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/internal/config" - "go.woodpecker-ci.org/woodpecker/v2/cli/setup/ui" + "go.woodpecker-ci.org/woodpecker/v3/cli/internal/config" + "go.woodpecker-ci.org/woodpecker/v3/cli/setup/ui" ) // Command exports the setup command. diff --git a/cli/update/updater.go b/cli/update/updater.go index d77bad6a4..2810989ee 100644 --- a/cli/update/updater.go +++ b/cli/update/updater.go @@ -14,7 +14,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func CheckForUpdate(ctx context.Context, force bool) (*NewVersion, error) { diff --git a/cli/update/updater_test.go b/cli/update/updater_test.go index a2855ac8e..9de9001af 100644 --- a/cli/update/updater_test.go +++ b/cli/update/updater_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func TestCheckForUpdate(t *testing.T) { diff --git a/cmd/agent/core/agent.go b/cmd/agent/core/agent.go index cba6249b1..a9f858300 100644 --- a/cmd/agent/core/agent.go +++ b/cmd/agent/core/agent.go @@ -38,14 +38,14 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - "go.woodpecker-ci.org/woodpecker/v2/agent" - agent_rpc "go.woodpecker-ci.org/woodpecker/v2/agent/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/agent" + agent_rpc "go.woodpecker-ci.org/woodpecker/v3/agent/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) const ( diff --git a/cmd/agent/core/health.go b/cmd/agent/core/health.go index b9c6398b1..7997c570f 100644 --- a/cmd/agent/core/health.go +++ b/cmd/agent/core/health.go @@ -24,8 +24,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/agent" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/agent" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // The file implements some basic healthcheck logic based on the diff --git a/cmd/agent/core/health_test.go b/cmd/agent/core/health_test.go index 326d37536..30bea8cc9 100644 --- a/cmd/agent/core/health_test.go +++ b/cmd/agent/core/health_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/agent" + "go.woodpecker-ci.org/woodpecker/v3/agent" ) func TestHealthy(t *testing.T) { diff --git a/cmd/agent/core/run.go b/cmd/agent/core/run.go index 3b01c2dc7..f3175c5b4 100644 --- a/cmd/agent/core/run.go +++ b/cmd/agent/core/run.go @@ -23,10 +23,10 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func RunAgent(ctx context.Context, backends []backend.Backend) { diff --git a/cmd/agent/dummy.go b/cmd/agent/dummy.go index 398b50f10..f2da7c105 100644 --- a/cmd/agent/dummy.go +++ b/cmd/agent/dummy.go @@ -17,7 +17,7 @@ package main -import "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" +import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" func init() { //nolint:gochecknoinits backends = append(backends, dummy.New()) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 37316195e..8b1854aec 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -19,12 +19,12 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/cmd/agent/core" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/docker" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/kubernetes" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/local" - backendTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/cmd/agent/core" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/docker" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/kubernetes" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/local" + backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) var backends = []backendTypes.Backend{ diff --git a/cmd/cli/app.go b/cmd/cli/app.go index 2784b08a3..301ec61f4 100644 --- a/cmd/cli/app.go +++ b/cmd/cli/app.go @@ -17,17 +17,17 @@ package main import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/cli/admin" - "go.woodpecker-ci.org/woodpecker/v2/cli/common" - "go.woodpecker-ci.org/woodpecker/v2/cli/exec" - "go.woodpecker-ci.org/woodpecker/v2/cli/info" - "go.woodpecker-ci.org/woodpecker/v2/cli/lint" - "go.woodpecker-ci.org/woodpecker/v2/cli/org" - "go.woodpecker-ci.org/woodpecker/v2/cli/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/cli/repo" - "go.woodpecker-ci.org/woodpecker/v2/cli/setup" - "go.woodpecker-ci.org/woodpecker/v2/cli/update" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/cli/admin" + "go.woodpecker-ci.org/woodpecker/v3/cli/common" + "go.woodpecker-ci.org/woodpecker/v3/cli/exec" + "go.woodpecker-ci.org/woodpecker/v3/cli/info" + "go.woodpecker-ci.org/woodpecker/v3/cli/lint" + "go.woodpecker-ci.org/woodpecker/v3/cli/org" + "go.woodpecker-ci.org/woodpecker/v3/cli/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/cli/repo" + "go.woodpecker-ci.org/woodpecker/v3/cli/setup" + "go.woodpecker-ci.org/woodpecker/v3/cli/update" + "go.woodpecker-ci.org/woodpecker/v3/version" ) //go:generate go run docs.go app.go diff --git a/cmd/cli/main.go b/cmd/cli/main.go index eb0f309df..d6670dadc 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -21,7 +21,7 @@ import ( _ "github.com/joho/godotenv/autoload" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func main() { diff --git a/cmd/server/flags.go b/cmd/server/flags.go index 6dd19c1be..7e63e7f51 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -21,8 +21,8 @@ import ( "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" ) var flags = append([]cli.Flag{ diff --git a/cmd/server/grpc_server.go b/cmd/server/grpc_server.go index f983bb158..7e7cf2a1a 100644 --- a/cmd/server/grpc_server.go +++ b/cmd/server/grpc_server.go @@ -24,10 +24,10 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server" - woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v2/server/grpc" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server" + woodpeckerGrpcServer "go.woodpecker-ci.org/woodpecker/v3/server/grpc" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func runGrpcServer(ctx context.Context, c *cli.Command, _store store.Store) error { diff --git a/cmd/server/main.go b/cmd/server/main.go index 009e14b9d..5ac49ff27 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -25,9 +25,9 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - _ "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" - "go.woodpecker-ci.org/woodpecker/v2/version" + _ "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func main() { diff --git a/cmd/server/metrics_server.go b/cmd/server/metrics_server.go index 007d2e48d..078099b3b 100644 --- a/cmd/server/metrics_server.go +++ b/cmd/server/metrics_server.go @@ -23,8 +23,8 @@ import ( prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func startMetricsCollector(ctx context.Context, _store store.Store) { diff --git a/cmd/server/openapi.go b/cmd/server/openapi.go index 37b68179a..ad4d97e12 100644 --- a/cmd/server/openapi.go +++ b/cmd/server/openapi.go @@ -15,8 +15,8 @@ package main import ( - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Generate docs/openapi.json via: diff --git a/cmd/server/openapi_json_gen.go b/cmd/server/openapi_json_gen.go index cccbd3e30..73474b8e3 100644 --- a/cmd/server/openapi_json_gen.go +++ b/cmd/server/openapi_json_gen.go @@ -31,7 +31,7 @@ import ( "github.com/getkin/kin-openapi/openapi2" "github.com/getkin/kin-openapi/openapi2conv" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" ) func main() { diff --git a/cmd/server/openapi_test.go b/cmd/server/openapi_test.go index 95773ce00..448aa1fad 100644 --- a/cmd/server/openapi_test.go +++ b/cmd/server/openapi_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" ) func TestSetupOpenApiStaticConfig(t *testing.T) { diff --git a/cmd/server/server.go b/cmd/server/server.go index 2983947d2..420f0c500 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -32,13 +32,13 @@ import ( "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/cron" - "go.woodpecker-ci.org/woodpecker/v2/server/router" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware" - "go.woodpecker-ci.org/woodpecker/v2/server/web" - "go.woodpecker-ci.org/woodpecker/v2/shared/logger" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/cron" + "go.woodpecker-ci.org/woodpecker/v3/server/router" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware" + "go.woodpecker-ci.org/woodpecker/v3/server/web" + "go.woodpecker-ci.org/woodpecker/v3/shared/logger" + "go.woodpecker-ci.org/woodpecker/v3/version" ) const ( diff --git a/cmd/server/setup.go b/cmd/server/setup.go index e6bf986bf..b36c83dbd 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -29,20 +29,20 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/cache" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/setup" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/services" - logService "go.woodpecker-ci.org/woodpecker/v2/server/services/log" - "go.woodpecker-ci.org/woodpecker/v2/server/services/log/file" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/cache" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/setup" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/services" + logService "go.woodpecker-ci.org/woodpecker/v3/server/services/log" + "go.woodpecker-ci.org/woodpecker/v3/server/services/log/file" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/datastore" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) const ( diff --git a/docs/docs/30-administration/11-forges/100-addon.md b/docs/docs/30-administration/11-forges/100-addon.md index fca20ac95..b1bd6ca9f 100644 --- a/docs/docs/30-administration/11-forges/100-addon.md +++ b/docs/docs/30-administration/11-forges/100-addon.md @@ -38,9 +38,9 @@ Addons use RPC to communicate to the server and are implemented using the [`go-p This example will use the Go language. -Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/v2`) and use the interfaces and types defined there. +Directly import Woodpecker's Go packages (`go.woodpecker-ci.org/woodpecker/v3`) and use the interfaces and types defined there. -In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v2/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge` as argument. +In the `main` function, just call `"go.woodpecker-ci.org/woodpecker/v3/server/forge/addon".Serve` with a `"go.woodpecker-ci.org/woodpecker/v3/server/forge".Forge` as argument. This will take care of connecting the addon forge to the server. ### Example structure @@ -52,9 +52,9 @@ import ( "context" "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/addon" - forgeTypes "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/addon" + forgeTypes "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func main() { @@ -64,5 +64,5 @@ func main() { type config struct { } -// `config` must implement `"go.woodpecker-ci.org/woodpecker/v2/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. +// `config` must implement `"go.woodpecker-ci.org/woodpecker/v3/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. ``` diff --git a/docs/docs/30-administration/22-backends/50-custom-backends.md b/docs/docs/30-administration/22-backends/50-custom-backends.md index a35a4f1ee..c95956559 100644 --- a/docs/docs/30-administration/22-backends/50-custom-backends.md +++ b/docs/docs/30-administration/22-backends/50-custom-backends.md @@ -9,8 +9,8 @@ build a custom agent using your backend with this `main.go`: package main import ( - "go.woodpecker-ci.org/woodpecker/v2/cmd/agent/core" - backendTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/cmd/agent/core" + backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func main() { diff --git a/docs/docs/92-development/01-getting-started.md b/docs/docs/92-development/01-getting-started.md index 92af0fe4d..4e1322955 100644 --- a/docs/docs/92-development/01-getting-started.md +++ b/docs/docs/92-development/01-getting-started.md @@ -128,7 +128,7 @@ make test-frontend If you want to test a specific Go file, you can also use: ```bash -go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v2/ +go test -race -timeout 30s go.woodpecker-ci.org/woodpecker/v3/ ``` Or you can open the test-file inside [VS-Code](#developing-with-vs-code) and run or debug the test by clicking on the inline commands: diff --git a/go.mod b/go.mod index bdf12e8f8..60196c4c4 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.woodpecker-ci.org/woodpecker/v2 +module go.woodpecker-ci.org/woodpecker/v3 go 1.23.4 @@ -55,7 +55,7 @@ require ( github.com/urfave/cli-docs/v3 v3.0.0-alpha6 github.com/urfave/cli/v3 v3.0.0-beta1 github.com/xeipuuv/gojsonschema v1.2.0 - github.com/yaronf/httpsign v0.3.1 + github.com/yaronf/httpsign v0.3.2 github.com/zalando/go-keyring v0.2.6 gitlab.com/gitlab-org/api/client-go v0.118.0 go.uber.org/multierr v1.11.0 @@ -66,7 +66,7 @@ require ( golang.org/x/term v0.27.0 golang.org/x/text v0.21.0 google.golang.org/grpc v1.69.2 - google.golang.org/protobuf v1.36.0 + google.golang.org/protobuf v1.36.1 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.32.0 k8s.io/apimachinery v0.32.0 @@ -145,9 +145,9 @@ require ( github.com/leodido/go-urn v1.4.0 // indirect github.com/lestrrat-go/blackmagic v1.0.2 // indirect github.com/lestrrat-go/httpcc v1.0.1 // indirect - github.com/lestrrat-go/httprc v1.0.5 // indirect + github.com/lestrrat-go/httprc v1.0.6 // indirect github.com/lestrrat-go/iter v1.0.2 // indirect - github.com/lestrrat-go/jwx/v2 v2.1.0 // indirect + github.com/lestrrat-go/jwx/v2 v2.1.2 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lucasb-eyer/go-colorful v1.2.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/go.sum b/go.sum index 1693845d9..0ab1c1841 100644 --- a/go.sum +++ b/go.sum @@ -353,12 +353,12 @@ github.com/lestrrat-go/blackmagic v1.0.2 h1:Cg2gVSc9h7sz9NOByczrbUvLopQmXrfFx//N github.com/lestrrat-go/blackmagic v1.0.2/go.mod h1:UrEqBzIR2U6CnzVyUtfM6oZNMt/7O7Vohk2J0OGSAtU= github.com/lestrrat-go/httpcc v1.0.1 h1:ydWCStUeJLkpYyjLDHihupbn2tYmZ7m22BGkcvZZrIE= github.com/lestrrat-go/httpcc v1.0.1/go.mod h1:qiltp3Mt56+55GPVCbTdM9MlqhvzyuL6W/NMDA8vA5E= -github.com/lestrrat-go/httprc v1.0.5 h1:bsTfiH8xaKOJPrg1R+E3iE/AWZr/x0Phj9PBTG/OLUk= -github.com/lestrrat-go/httprc v1.0.5/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= +github.com/lestrrat-go/httprc v1.0.6 h1:qgmgIRhpvBqexMJjA/PmwSvhNk679oqD1RbovdCGW8k= +github.com/lestrrat-go/httprc v1.0.6/go.mod h1:mwwz3JMTPBjHUkkDv/IGJ39aALInZLrhBp0X7KGUZlo= github.com/lestrrat-go/iter v1.0.2 h1:gMXo1q4c2pHmC3dn8LzRhJfP1ceCbgSiT9lUydIzltI= github.com/lestrrat-go/iter v1.0.2/go.mod h1:Momfcq3AnRlRjI5b5O8/G5/BvpzrhoFTZcn06fEOPt4= -github.com/lestrrat-go/jwx/v2 v2.1.0 h1:0zs7Ya6+39qoit7gwAf+cYm1zzgS3fceIdo7RmQ5lkw= -github.com/lestrrat-go/jwx/v2 v2.1.0/go.mod h1:Xpw9QIaUGiIUD1Wx0NcY1sIHwFf8lDuZn/cmxtXYRys= +github.com/lestrrat-go/jwx/v2 v2.1.2 h1:6poete4MPsO8+LAEVhpdrNI4Xp2xdiafgl2RD89moBc= +github.com/lestrrat-go/jwx/v2 v2.1.2/go.mod h1:pO+Gz9whn7MPdbsqSJzG8TlEpMZCwQDXnFJ+zsUVh8Y= github.com/lestrrat-go/option v1.0.1 h1:oAzP2fvZGQKWkvHa1/SAcFolBEca1oN+mQ7eooNBEYU= github.com/lestrrat-go/option v1.0.1/go.mod h1:5ZHFbivi4xwXxhxY9XHDe2FHo6/Z7WWmtT7T5nBBp3I= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -548,8 +548,8 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/yaronf/httpsign v0.3.1 h1:A4pqjwOVCwlExyy/mPTTryCHcXn+xhq4+wxq4BKhi2k= -github.com/yaronf/httpsign v0.3.1/go.mod h1:+7d6GccMcoljvE3QtU00NCmR1iTXCVNfbMe5nqaxRG4= +github.com/yaronf/httpsign v0.3.2 h1:rBYYx9eHm60noI4oC24JAD2tJuM8AUDh9ErJO/FfzBs= +github.com/yaronf/httpsign v0.3.2/go.mod h1:cYB/6toJrJnf4JTLVoo6IHzFH9/Zu1dcKmah4xfX2WA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= @@ -732,8 +732,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= -google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk= +google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= diff --git a/pipeline/backend/backend.go b/pipeline/backend/backend.go index ffb370ed7..960808d9c 100644 --- a/pipeline/backend/backend.go +++ b/pipeline/backend/backend.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func FindBackend(ctx context.Context, backends []types.Backend, backendName string) (types.Backend, error) { diff --git a/pipeline/backend/docker/backend_options.go b/pipeline/backend/docker/backend_options.go index d368309ab..b7b2a10e1 100644 --- a/pipeline/backend/docker/backend_options.go +++ b/pipeline/backend/docker/backend_options.go @@ -3,7 +3,7 @@ package docker import ( "github.com/go-viper/mapstructure/v2" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // BackendOptions defines all the advanced options for the docker backend. diff --git a/pipeline/backend/docker/backend_options_test.go b/pipeline/backend/docker/backend_options_test.go index 9f19133b4..50fb7f73e 100644 --- a/pipeline/backend/docker/backend_options_test.go +++ b/pipeline/backend/docker/backend_options_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func Test_parseBackendOptions(t *testing.T) { diff --git a/pipeline/backend/docker/convert.go b/pipeline/backend/docker/convert.go index 6a2b10604..5e20c7149 100644 --- a/pipeline/backend/docker/convert.go +++ b/pipeline/backend/docker/convert.go @@ -23,8 +23,8 @@ import ( "github.com/docker/docker/api/types/container" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Valid container volumes must have at least two components, source and destination. diff --git a/pipeline/backend/docker/convert_test.go b/pipeline/backend/docker/convert_test.go index 7c7951be3..f2948a4a7 100644 --- a/pipeline/backend/docker/convert_test.go +++ b/pipeline/backend/docker/convert_test.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/api/types/system" "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestSplitVolumeParts(t *testing.T) { diff --git a/pipeline/backend/docker/convert_win.go b/pipeline/backend/docker/convert_win.go index 37afef8e3..19cda5116 100644 --- a/pipeline/backend/docker/convert_win.go +++ b/pipeline/backend/docker/convert_win.go @@ -19,7 +19,7 @@ import ( "regexp" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go index 573599f1e..afe43937b 100644 --- a/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -35,8 +35,8 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) type docker struct { diff --git a/pipeline/backend/dummy/dummy.go b/pipeline/backend/dummy/dummy.go index cdf08c8aa..5e56f7fbb 100644 --- a/pipeline/backend/dummy/dummy.go +++ b/pipeline/backend/dummy/dummy.go @@ -29,7 +29,7 @@ import ( "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type dummy struct { diff --git a/pipeline/backend/dummy/dummy_test.go b/pipeline/backend/dummy/dummy_test.go index f0c3d8586..44e4034ae 100644 --- a/pipeline/backend/dummy/dummy_test.go +++ b/pipeline/backend/dummy/dummy_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/dummy" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestSmalPipelineDummyRun(t *testing.T) { diff --git a/pipeline/backend/kubernetes/backend_options.go b/pipeline/backend/kubernetes/backend_options.go index c43d23b32..4dbc2c14a 100644 --- a/pipeline/backend/kubernetes/backend_options.go +++ b/pipeline/backend/kubernetes/backend_options.go @@ -3,7 +3,7 @@ package kubernetes import ( "github.com/go-viper/mapstructure/v2" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // BackendOptions defines all the advanced options for the kubernetes backend. diff --git a/pipeline/backend/kubernetes/backend_options_test.go b/pipeline/backend/kubernetes/backend_options_test.go index cbf043faf..ff44202c8 100644 --- a/pipeline/backend/kubernetes/backend_options_test.go +++ b/pipeline/backend/kubernetes/backend_options_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func Test_parseBackendOptions(t *testing.T) { diff --git a/pipeline/backend/kubernetes/kubernetes.go b/pipeline/backend/kubernetes/kubernetes.go index 443c3d669..7aa11893e 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -37,7 +37,7 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/pod.go b/pipeline/backend/kubernetes/pod.go index 81bbc45af..42a04356c 100644 --- a/pipeline/backend/kubernetes/pod.go +++ b/pipeline/backend/kubernetes/pod.go @@ -26,8 +26,8 @@ import ( "k8s.io/apimachinery/pkg/api/resource" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/common" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/common" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/pod_test.go b/pipeline/backend/kubernetes/pod_test.go index cc7cbccc3..01aa95ecb 100644 --- a/pipeline/backend/kubernetes/pod_test.go +++ b/pipeline/backend/kubernetes/pod_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestPodName(t *testing.T) { diff --git a/pipeline/backend/kubernetes/secrets.go b/pipeline/backend/kubernetes/secrets.go index 96ef84593..3acba1e07 100644 --- a/pipeline/backend/kubernetes/secrets.go +++ b/pipeline/backend/kubernetes/secrets.go @@ -28,8 +28,8 @@ import ( "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) type nativeSecretsProcessor struct { diff --git a/pipeline/backend/kubernetes/secrets_test.go b/pipeline/backend/kubernetes/secrets_test.go index 99d06723b..6c2385f1e 100644 --- a/pipeline/backend/kubernetes/secrets_test.go +++ b/pipeline/backend/kubernetes/secrets_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestNativeSecretsEnabled(t *testing.T) { diff --git a/pipeline/backend/kubernetes/service.go b/pipeline/backend/kubernetes/service.go index e187aa4bc..428684648 100644 --- a/pipeline/backend/kubernetes/service.go +++ b/pipeline/backend/kubernetes/service.go @@ -25,7 +25,7 @@ import ( meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" int_str "k8s.io/apimachinery/pkg/util/intstr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/kubernetes/service_test.go b/pipeline/backend/kubernetes/service_test.go index 91ce54c1b..ab0217534 100644 --- a/pipeline/backend/kubernetes/service_test.go +++ b/pipeline/backend/kubernetes/service_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestServiceName(t *testing.T) { diff --git a/pipeline/backend/local/clone.go b/pipeline/backend/local/clone.go index 4a9bb5ff4..f18a46fbd 100644 --- a/pipeline/backend/local/clone.go +++ b/pipeline/backend/local/clone.go @@ -27,7 +27,7 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // checkGitCloneCap check if we have the git binary on hand. diff --git a/pipeline/backend/local/local.go b/pipeline/backend/local/local.go index 5e11f68f0..ab5eff802 100644 --- a/pipeline/backend/local/local.go +++ b/pipeline/backend/local/local.go @@ -31,7 +31,7 @@ import ( "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type workflowState struct { diff --git a/pipeline/errors/error.go b/pipeline/errors/error.go index 729839483..4adf7fc62 100644 --- a/pipeline/errors/error.go +++ b/pipeline/errors/error.go @@ -5,7 +5,7 @@ import ( "go.uber.org/multierr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) type LinterErrorData struct { diff --git a/pipeline/errors/error_test.go b/pipeline/errors/error_test.go index 8648c4048..a1658a797 100644 --- a/pipeline/errors/error_test.go +++ b/pipeline/errors/error_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/multierr" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) func TestGetPipelineErrors(t *testing.T) { diff --git a/pipeline/frontend/metadata/drone_compatibility_test.go b/pipeline/frontend/metadata/drone_compatibility_test.go index f38bdc5e2..5feadb946 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) func TestSetDroneEnvironOnPull(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/compiler.go b/pipeline/frontend/yaml/compiler/compiler.go index a4c394e92..858b94abf 100644 --- a/pipeline/frontend/yaml/compiler/compiler.go +++ b/pipeline/frontend/yaml/compiler/compiler.go @@ -18,11 +18,11 @@ import ( "fmt" "path" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) const ( diff --git a/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go index e3f903817..fc4c68fa9 100644 --- a/pipeline/frontend/yaml/compiler/compiler_test.go +++ b/pipeline/frontend/yaml/compiler/compiler_test.go @@ -19,11 +19,11 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func TestSecretAvailable(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/convert.go b/pipeline/frontend/yaml/compiler/convert.go index fa88f9542..57042d68f 100644 --- a/pipeline/frontend/yaml/compiler/convert.go +++ b/pipeline/frontend/yaml/compiler/convert.go @@ -23,11 +23,11 @@ import ( "github.com/oklog/ulid/v2" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler/settings" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler/settings" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) const ( diff --git a/pipeline/frontend/yaml/compiler/convert_test.go b/pipeline/frontend/yaml/compiler/convert_test.go index 39f01e20b..051cb6a87 100644 --- a/pipeline/frontend/yaml/compiler/convert_test.go +++ b/pipeline/frontend/yaml/compiler/convert_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestConvertPortNumber(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/dag.go b/pipeline/frontend/yaml/compiler/dag.go index deb673e4c..fc3e10efc 100644 --- a/pipeline/frontend/yaml/compiler/dag.go +++ b/pipeline/frontend/yaml/compiler/dag.go @@ -17,7 +17,7 @@ package compiler import ( "sort" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type dagCompilerStep struct { diff --git a/pipeline/frontend/yaml/compiler/dag_test.go b/pipeline/frontend/yaml/compiler/dag_test.go index 620b67776..d0360dab1 100644 --- a/pipeline/frontend/yaml/compiler/dag_test.go +++ b/pipeline/frontend/yaml/compiler/dag_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) func TestConvertDAGToStages(t *testing.T) { diff --git a/pipeline/frontend/yaml/compiler/option.go b/pipeline/frontend/yaml/compiler/option.go index 77e24c4ce..20b419364 100644 --- a/pipeline/frontend/yaml/compiler/option.go +++ b/pipeline/frontend/yaml/compiler/option.go @@ -19,7 +19,7 @@ import ( "path" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) // Option configures a compiler option. diff --git a/pipeline/frontend/yaml/compiler/option_test.go b/pipeline/frontend/yaml/compiler/option_test.go index b4c179d20..061d63e26 100644 --- a/pipeline/frontend/yaml/compiler/option_test.go +++ b/pipeline/frontend/yaml/compiler/option_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) func TestWithWorkspace(t *testing.T) { diff --git a/pipeline/frontend/yaml/constraint/constraint.go b/pipeline/frontend/yaml/constraint/constraint.go index 28c29f2ab..aade4bef2 100644 --- a/pipeline/frontend/yaml/constraint/constraint.go +++ b/pipeline/frontend/yaml/constraint/constraint.go @@ -26,8 +26,8 @@ import ( "go.uber.org/multierr" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yamlBaseTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yamlBaseTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) type ( diff --git a/pipeline/frontend/yaml/constraint/constraint_test.go b/pipeline/frontend/yaml/constraint/constraint_test.go index 60936d8c7..a6c68dffa 100644 --- a/pipeline/frontend/yaml/constraint/constraint_test.go +++ b/pipeline/frontend/yaml/constraint/constraint_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) func TestConstraint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/error.go b/pipeline/frontend/yaml/linter/error.go index 09e243016..96c96ddc0 100644 --- a/pipeline/frontend/yaml/linter/error.go +++ b/pipeline/frontend/yaml/linter/error.go @@ -15,8 +15,8 @@ package linter import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) func newLinterError(message, file, field string, isWarning bool) *errorTypes.PipelineError { diff --git a/pipeline/frontend/yaml/linter/linter.go b/pipeline/frontend/yaml/linter/linter.go index 4bacf4345..79cfa1168 100644 --- a/pipeline/frontend/yaml/linter/linter.go +++ b/pipeline/frontend/yaml/linter/linter.go @@ -20,12 +20,12 @@ import ( "codeberg.org/6543/xyaml" "go.uber.org/multierr" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) // A Linter lints a pipeline configuration. diff --git a/pipeline/frontend/yaml/linter/linter_test.go b/pipeline/frontend/yaml/linter/linter_test.go index b9c88687d..9f78fc9c6 100644 --- a/pipeline/frontend/yaml/linter/linter_test.go +++ b/pipeline/frontend/yaml/linter/linter_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" ) func TestLint(t *testing.T) { diff --git a/pipeline/frontend/yaml/linter/schema/schema_test.go b/pipeline/frontend/yaml/linter/schema/schema_test.go index 2a5526e24..63ddcdb85 100644 --- a/pipeline/frontend/yaml/linter/schema/schema_test.go +++ b/pipeline/frontend/yaml/linter/schema/schema_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter/schema" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter/schema" ) func TestSchema(t *testing.T) { diff --git a/pipeline/frontend/yaml/matrix/matrix.go b/pipeline/frontend/yaml/matrix/matrix.go index 55855513d..a48ad31d8 100644 --- a/pipeline/frontend/yaml/matrix/matrix.go +++ b/pipeline/frontend/yaml/matrix/matrix.go @@ -19,7 +19,7 @@ import ( "codeberg.org/6543/xyaml" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) const ( diff --git a/pipeline/frontend/yaml/parse.go b/pipeline/frontend/yaml/parse.go index e9a6255fe..07452b6d9 100644 --- a/pipeline/frontend/yaml/parse.go +++ b/pipeline/frontend/yaml/parse.go @@ -17,7 +17,7 @@ package yaml import ( "codeberg.org/6543/xyaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" ) // ParseBytes parses the configuration from bytes b. diff --git a/pipeline/frontend/yaml/parse_test.go b/pipeline/frontend/yaml/parse_test.go index 3dec23cd1..5e0b5520e 100644 --- a/pipeline/frontend/yaml/parse_test.go +++ b/pipeline/frontend/yaml/parse_test.go @@ -21,8 +21,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - yaml_base_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + yaml_base_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) func TestParse(t *testing.T) { diff --git a/pipeline/frontend/yaml/types/container.go b/pipeline/frontend/yaml/types/container.go index d6044edf7..6b6b665d5 100644 --- a/pipeline/frontend/yaml/types/container.go +++ b/pipeline/frontend/yaml/types/container.go @@ -19,9 +19,9 @@ import ( "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/utils" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/utils" ) type ( diff --git a/pipeline/frontend/yaml/types/container_test.go b/pipeline/frontend/yaml/types/container_test.go index 9b06045c7..537ba5089 100644 --- a/pipeline/frontend/yaml/types/container_test.go +++ b/pipeline/frontend/yaml/types/container_test.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types/base" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types/base" ) var containerYaml = []byte(` diff --git a/pipeline/frontend/yaml/types/workflow.go b/pipeline/frontend/yaml/types/workflow.go index f1e753b3d..736e1384b 100644 --- a/pipeline/frontend/yaml/types/workflow.go +++ b/pipeline/frontend/yaml/types/workflow.go @@ -15,7 +15,7 @@ package types import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/constraint" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/constraint" ) type ( diff --git a/pipeline/log/line_writer.go b/pipeline/log/line_writer.go index ff8706f36..b88cbd671 100644 --- a/pipeline/log/line_writer.go +++ b/pipeline/log/line_writer.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/shared" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/shared" ) // LineWriter sends logs to the client. diff --git a/pipeline/log/line_writer_test.go b/pipeline/log/line_writer_test.go index 8a2d6b120..bcff046da 100644 --- a/pipeline/log/line_writer_test.go +++ b/pipeline/log/line_writer_test.go @@ -20,9 +20,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/mocks" ) func TestLineWriter(t *testing.T) { diff --git a/pipeline/log/utils_test.go b/pipeline/log/utils_test.go index cbc15b735..9dbd985f0 100644 --- a/pipeline/log/utils_test.go +++ b/pipeline/log/utils_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/log" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" ) type testWriter struct { diff --git a/pipeline/logger.go b/pipeline/logger.go index 6eea180d1..765a0333b 100644 --- a/pipeline/logger.go +++ b/pipeline/logger.go @@ -17,7 +17,7 @@ package pipeline import ( "io" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Logger handles the process logging. diff --git a/pipeline/option.go b/pipeline/option.go index 6be8f3c3d..784cfdbbd 100644 --- a/pipeline/option.go +++ b/pipeline/option.go @@ -17,7 +17,7 @@ package pipeline import ( "context" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) // Option configures a runtime option. diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index 2b732b444..c7429dbf3 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -26,8 +26,8 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/sync/errgroup" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" ) // TODO: move runtime into "runtime" subpackage diff --git a/pipeline/rpc/mocks/peer.go b/pipeline/rpc/mocks/peer.go index baac63d6e..e8383505b 100644 --- a/pipeline/rpc/mocks/peer.go +++ b/pipeline/rpc/mocks/peer.go @@ -9,7 +9,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - rpc "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" + rpc "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" ) // Peer is an autogenerated mock type for the Peer type diff --git a/pipeline/rpc/peer.go b/pipeline/rpc/peer.go index c47104210..06790ffec 100644 --- a/pipeline/rpc/peer.go +++ b/pipeline/rpc/peer.go @@ -18,7 +18,7 @@ package rpc import ( "context" - backend "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" + backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" ) type ( diff --git a/server/api/agent.go b/server/api/agent.go index 41132f2c8..116fe5cac 100644 --- a/server/api/agent.go +++ b/server/api/agent.go @@ -20,10 +20,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // diff --git a/server/api/agent_test.go b/server/api/agent_test.go index 0a87d99e0..82d5e7c3f 100644 --- a/server/api/agent_test.go +++ b/server/api/agent_test.go @@ -25,13 +25,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - queue_mocks "go.woodpecker-ci.org/woodpecker/v2/server/queue/mocks" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - store_mocks "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + queue_mocks "go.woodpecker-ci.org/woodpecker/v3/server/queue/mocks" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + store_mocks "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) var fakeAgent = &model.Agent{ diff --git a/server/api/badge.go b/server/api/badge.go index e39dcffe1..74378a7b5 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -25,12 +25,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/badges" - "go.woodpecker-ci.org/woodpecker/v2/server/ccmenu" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/badges" + "go.woodpecker-ci.org/woodpecker/v3/server/ccmenu" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) // GetBadge diff --git a/server/api/cron.go b/server/api/cron.go index 7a3909ec9..78b05b6fe 100644 --- a/server/api/cron.go +++ b/server/api/cron.go @@ -22,12 +22,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - cronScheduler "go.woodpecker-ci.org/woodpecker/v2/server/cron" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + cronScheduler "go.woodpecker-ci.org/woodpecker/v3/server/cron" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetCron diff --git a/server/api/forge.go b/server/api/forge.go index 57bc1469e..11981bc39 100644 --- a/server/api/forge.go +++ b/server/api/forge.go @@ -20,9 +20,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetForges diff --git a/server/api/global_registry.go b/server/api/global_registry.go index b175d4043..5108a76c0 100644 --- a/server/api/global_registry.go +++ b/server/api/global_registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetGlobalRegistryList diff --git a/server/api/global_secret.go b/server/api/global_secret.go index 3ede60d7f..1bcc6a825 100644 --- a/server/api/global_secret.go +++ b/server/api/global_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetGlobalSecretList diff --git a/server/api/helper.go b/server/api/helper.go index dbe6ce6e2..591e8f621 100644 --- a/server/api/helper.go +++ b/server/api/helper.go @@ -21,12 +21,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func handlePipelineErr(c *gin.Context, err error) { diff --git a/server/api/helper_test.go b/server/api/helper_test.go index 50721f9b3..4dd17b1b8 100644 --- a/server/api/helper_test.go +++ b/server/api/helper_test.go @@ -8,7 +8,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" ) func TestHandlePipelineError(t *testing.T) { diff --git a/server/api/hook.go b/server/api/hook.go index 713fca39b..fa79ff04f 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -25,13 +25,13 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "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/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "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/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // GetQueueInfo diff --git a/server/api/hook_test.go b/server/api/hook_test.go index 681edf0c8..b107d7c6b 100644 --- a/server/api/hook_test.go +++ b/server/api/hook_test.go @@ -12,17 +12,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_config_service "go.woodpecker-ci.org/woodpecker/v2/server/services/config/mocks" - mocks_services "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - mocks_registry_service "go.woodpecker-ci.org/woodpecker/v2/server/services/registry/mocks" - mocks_secret_service "go.woodpecker-ci.org/woodpecker/v2/server/services/secret/mocks" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + mocks_forge "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_config_service "go.woodpecker-ci.org/woodpecker/v3/server/services/config/mocks" + mocks_services "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + mocks_registry_service "go.woodpecker-ci.org/woodpecker/v3/server/services/registry/mocks" + mocks_secret_service "go.woodpecker-ci.org/woodpecker/v3/server/services/secret/mocks" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestHook(t *testing.T) { diff --git a/server/api/login.go b/server/api/login.go index f7db56905..06134b27d 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -27,14 +27,14 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - 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/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/httputil" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + 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/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/httputil" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) const stateTokenDuration = time.Minute * 5 diff --git a/server/api/login_test.go b/server/api/login_test.go index f76dd721d..3ccb86793 100644 --- a/server/api/login_test.go +++ b/server/api/login_test.go @@ -14,16 +14,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - mocks_forge "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" - mocks_services "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + mocks_forge "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" + mocks_services "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestHandleAuth(t *testing.T) { diff --git a/server/api/metrics/prometheus.go b/server/api/metrics/prometheus.go index b8f65e67b..1564f3926 100644 --- a/server/api/metrics/prometheus.go +++ b/server/api/metrics/prometheus.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" prometheus_http "github.com/prometheus/client_golang/prometheus/promhttp" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) // errInvalidToken is returned when the api request token is invalid. diff --git a/server/api/org.go b/server/api/org.go index 889398e7d..765ee3df8 100644 --- a/server/api/org.go +++ b/server/api/org.go @@ -21,10 +21,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetOrgs diff --git a/server/api/org_registry.go b/server/api/org_registry.go index 89f16c145..47c6c77c8 100644 --- a/server/api/org_registry.go +++ b/server/api/org_registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetOrgRegistry diff --git a/server/api/org_secret.go b/server/api/org_secret.go index c892e8780..47b9dfc53 100644 --- a/server/api/org_secret.go +++ b/server/api/org_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetOrgSecret diff --git a/server/api/pipeline.go b/server/api/pipeline.go index 07fefea62..ce3d1396f 100644 --- a/server/api/pipeline.go +++ b/server/api/pipeline.go @@ -28,13 +28,13 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) // CreatePipeline diff --git a/server/api/pipeline_test.go b/server/api/pipeline_test.go index dd7043cd5..04c1ba52c 100644 --- a/server/api/pipeline_test.go +++ b/server/api/pipeline_test.go @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_mocks "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - store_mocks "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_mocks "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + store_mocks "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) var fakePipeline = &model.Pipeline{ diff --git a/server/api/registry.go b/server/api/registry.go index 360db1483..79e1dad03 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetRegistry diff --git a/server/api/repo.go b/server/api/repo.go index d5c8a77b4..b1cd17833 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -27,13 +27,13 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // PostRepo diff --git a/server/api/repo_secret.go b/server/api/repo_secret.go index cdc58876d..59c73b4ff 100644 --- a/server/api/repo_secret.go +++ b/server/api/repo_secret.go @@ -19,9 +19,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) // GetSecret diff --git a/server/api/signature_public_key.go b/server/api/signature_public_key.go index b9364166b..c3dd717e3 100644 --- a/server/api/signature_public_key.go +++ b/server/api/signature_public_key.go @@ -22,7 +22,7 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) // GetSignaturePublicKey diff --git a/server/api/stream.go b/server/api/stream.go index a620dd068..c948af171 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -27,12 +27,12 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) const ( diff --git a/server/api/user.go b/server/api/user.go index 7a20da863..9b3690887 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -23,11 +23,11 @@ import ( "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // GetSelf diff --git a/server/api/users.go b/server/api/users.go index 1a591d127..35df2724a 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -21,9 +21,9 @@ import ( "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // GetUsers diff --git a/server/api/z.go b/server/api/z.go index 2156f8507..363040bfd 100644 --- a/server/api/z.go +++ b/server/api/z.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Health diff --git a/server/badges/badges.go b/server/badges/badges.go index 99d82bd90..e05b356fb 100644 --- a/server/badges/badges.go +++ b/server/badges/badges.go @@ -14,7 +14,7 @@ package badges -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" // cspell:words Verdana diff --git a/server/badges/badges_test.go b/server/badges/badges_test.go index 4f34488c4..7829be16d 100644 --- a/server/badges/badges_test.go +++ b/server/badges/badges_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Generate an SVG badge based on a pipeline. diff --git a/server/cache/membership.go b/server/cache/membership.go index c29aafdb0..0e7138eaa 100644 --- a/server/cache/membership.go +++ b/server/cache/membership.go @@ -21,9 +21,9 @@ import ( "github.com/jellydator/ttlcache/v3" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "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/store" ) // MembershipService is a service to check for user membership. diff --git a/server/ccmenu/cc.go b/server/ccmenu/cc.go index 6c8b77763..bfaf015c0 100644 --- a/server/ccmenu/cc.go +++ b/server/ccmenu/cc.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // CCMenu displays the pipeline status of projects on a ci server as an item in the Mac's menu bar. diff --git a/server/ccmenu/cc_test.go b/server/ccmenu/cc_test.go index 316b68394..e2b17f513 100644 --- a/server/ccmenu/cc_test.go +++ b/server/ccmenu/cc_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCC(t *testing.T) { diff --git a/server/config.go b/server/config.go index d9c8bee30..7f9d51a2e 100644 --- a/server/config.go +++ b/server/config.go @@ -18,14 +18,14 @@ package server import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/server/cache" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/services" - "go.woodpecker-ci.org/woodpecker/v2/server/services/log" - "go.woodpecker-ci.org/woodpecker/v2/server/services/permissions" + "go.woodpecker-ci.org/woodpecker/v3/server/cache" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/services" + "go.woodpecker-ci.org/woodpecker/v3/server/services/log" + "go.woodpecker-ci.org/woodpecker/v3/server/services/permissions" ) var Config = struct { diff --git a/server/cron/cron.go b/server/cron/cron.go index 9fa35aa8c..3460fbaa4 100644 --- a/server/cron/cron.go +++ b/server/cron/cron.go @@ -22,11 +22,11 @@ import ( "github.com/gdgvda/cron" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) const ( diff --git a/server/cron/cron_test.go b/server/cron/cron_test.go index 61f1a2538..ca39839f1 100644 --- a/server/cron/cron_test.go +++ b/server/cron/cron_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server" - mocks_forge "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_manager "go.woodpecker-ci.org/woodpecker/v2/server/services/mocks" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server" + mocks_forge "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_manager "go.woodpecker-ci.org/woodpecker/v3/server/services/mocks" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func TestCreatePipeline(t *testing.T) { diff --git a/server/forge/addon/args.go b/server/forge/addon/args.go index d3d85be56..9760124a3 100644 --- a/server/forge/addon/args.go +++ b/server/forge/addon/args.go @@ -15,7 +15,7 @@ package addon import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type argumentsAuth struct { diff --git a/server/forge/addon/client.go b/server/forge/addon/client.go index ba44c05aa..9640eb782 100644 --- a/server/forge/addon/client.go +++ b/server/forge/addon/client.go @@ -25,9 +25,9 @@ import ( "github.com/hashicorp/go-plugin" "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/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // make sure RPC implements forge.Forge. diff --git a/server/forge/addon/plugin.go b/server/forge/addon/plugin.go index 21099cf68..7c7faa833 100644 --- a/server/forge/addon/plugin.go +++ b/server/forge/addon/plugin.go @@ -19,7 +19,7 @@ import ( "github.com/hashicorp/go-plugin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" ) const pluginKey = "forge" diff --git a/server/forge/addon/server.go b/server/forge/addon/server.go index fc810ae23..abf14e214 100644 --- a/server/forge/addon/server.go +++ b/server/forge/addon/server.go @@ -22,8 +22,8 @@ import ( "github.com/hashicorp/go-plugin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" ) func Serve(impl forge.Forge) { diff --git a/server/forge/bitbucket/bitbucket.go b/server/forge/bitbucket/bitbucket.go index 95facb7f7..bbb5ac43b 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -26,13 +26,13 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) // Bitbucket cloud endpoints. diff --git a/server/forge/bitbucket/bitbucket_test.go b/server/forge/bitbucket/bitbucket_test.go index 452b202d9..a4fe537d1 100644 --- a/server/forge/bitbucket/bitbucket_test.go +++ b/server/forge/bitbucket/bitbucket_test.go @@ -26,10 +26,10 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "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/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_bitbucket(t *testing.T) { diff --git a/server/forge/bitbucket/convert.go b/server/forge/bitbucket/convert.go index f54cb04d3..61591976a 100644 --- a/server/forge/bitbucket/convert.go +++ b/server/forge/bitbucket/convert.go @@ -23,8 +23,8 @@ import ( "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/bitbucket/convert_test.go b/server/forge/bitbucket/convert_test.go index 0765615a8..8299a5122 100644 --- a/server/forge/bitbucket/convert_test.go +++ b/server/forge/bitbucket/convert_test.go @@ -22,8 +22,8 @@ import ( "github.com/franela/goblin" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_helper(t *testing.T) { diff --git a/server/forge/bitbucket/internal/client.go b/server/forge/bitbucket/internal/client.go index 52c8ce150..e7a5a74b0 100644 --- a/server/forge/bitbucket/internal/client.go +++ b/server/forge/bitbucket/internal/client.go @@ -26,7 +26,7 @@ import ( "golang.org/x/oauth2" "golang.org/x/oauth2/bitbucket" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/bitbucket/parse.go b/server/forge/bitbucket/parse.go index 82cf8d5cc..7f8b6710b 100644 --- a/server/forge/bitbucket/parse.go +++ b/server/forge/bitbucket/parse.go @@ -19,9 +19,9 @@ import ( "io" "net/http" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/internal" - "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/bitbucket/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/bitbucket/parse_test.go b/server/forge/bitbucket/parse_test.go index a5562fc39..e96a0ae2b 100644 --- a/server/forge/bitbucket/parse_test.go +++ b/server/forge/bitbucket/parse_test.go @@ -22,9 +22,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket/fixtures" - "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/bitbucket/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_parser(t *testing.T) { diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go index 42212895b..ccb7beb4d 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go @@ -25,13 +25,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter/internal" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - 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/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter/internal" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + 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/store" ) const listLimit = 250 diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go index 930840eb5..9ccdf1910 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go @@ -22,8 +22,8 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestBitbucketDC(t *testing.T) { diff --git a/server/forge/bitbucketdatacenter/convert.go b/server/forge/bitbucketdatacenter/convert.go index 140cb0a6a..d6adbac3a 100644 --- a/server/forge/bitbucketdatacenter/convert.go +++ b/server/forge/bitbucketdatacenter/convert.go @@ -23,7 +23,7 @@ import ( bb "github.com/neticdk/go-bitbucket/bitbucket" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func convertStatus(status model.StatusValue) bb.BuildStatusState { diff --git a/server/forge/bitbucketdatacenter/convert_test.go b/server/forge/bitbucketdatacenter/convert_test.go index 564f00530..1ce35fd27 100644 --- a/server/forge/bitbucketdatacenter/convert_test.go +++ b/server/forge/bitbucketdatacenter/convert_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" bb "github.com/neticdk/go-bitbucket/bitbucket" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) //nolint:misspell diff --git a/server/forge/common/status.go b/server/forge/common/status.go index 845edc2bf..3e07f041b 100644 --- a/server/forge/common/status.go +++ b/server/forge/common/status.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func GetPipelineStatusContext(repo *model.Repo, pipeline *model.Pipeline, workflow *model.Workflow) string { diff --git a/server/forge/common/status_test.go b/server/forge/common/status_test.go index cbf3fd9e1..04e834355 100644 --- a/server/forge/common/status_test.go +++ b/server/forge/common/status_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGetPipelineStatusContext(t *testing.T) { diff --git a/server/forge/common/utils.go b/server/forge/common/utils.go index c29d912e6..549e048cc 100644 --- a/server/forge/common/utils.go +++ b/server/forge/common/utils.go @@ -22,8 +22,8 @@ import ( "github.com/rs/zerolog/log" - "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" ) func ExtractHostFromCloneURL(cloneURL string) (string, error) { diff --git a/server/forge/common/utils_test.go b/server/forge/common/utils_test.go index 159902912..c979b25b4 100644 --- a/server/forge/common/utils_test.go +++ b/server/forge/common/utils_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" ) func Test_Netrc(t *testing.T) { diff --git a/server/forge/forge.go b/server/forge/forge.go index 4169e60d0..f5102a73e 100644 --- a/server/forge/forge.go +++ b/server/forge/forge.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "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/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: use pagination diff --git a/server/forge/forgejo/forgejo.go b/server/forge/forgejo/forgejo.go index 8930f8bca..1e5a0d418 100644 --- a/server/forge/forgejo/forgejo.go +++ b/server/forge/forgejo/forgejo.go @@ -30,13 +30,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - 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/store" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + 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/store" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/forgejo/forgejo_test.go b/server/forge/forgejo/forgejo_test.go index 7c27e8f03..1941e646e 100644 --- a/server/forge/forgejo/forgejo_test.go +++ b/server/forge/forgejo/forgejo_test.go @@ -25,11 +25,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_forgejo(t *testing.T) { diff --git a/server/forge/forgejo/helper.go b/server/forge/forgejo/helper.go index b6e4a2785..a36bbc005 100644 --- a/server/forge/forgejo/helper.go +++ b/server/forge/forgejo/helper.go @@ -24,8 +24,8 @@ import ( "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" - "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" ) // toRepo converts a Forgejo repository to a Woodpecker repository. diff --git a/server/forge/forgejo/helper_test.go b/server/forge/forgejo/helper_test.go index b87996d1e..8f0ae2316 100644 --- a/server/forge/forgejo/helper_test.go +++ b/server/forge/forgejo/helper_test.go @@ -21,9 +21,9 @@ import ( "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_parse(t *testing.T) { diff --git a/server/forge/forgejo/parse.go b/server/forge/forgejo/parse.go index 88be0cf4b..609c73a40 100644 --- a/server/forge/forgejo/parse.go +++ b/server/forge/forgejo/parse.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog/log" - "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/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/forgejo/parse_test.go b/server/forge/forgejo/parse_test.go index 9415d9975..4a24eb74d 100644 --- a/server/forge/forgejo/parse_test.go +++ b/server/forge/forgejo/parse_test.go @@ -21,9 +21,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo/fixtures" - "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/forgejo/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestForgejoParser(t *testing.T) { diff --git a/server/forge/gitea/gitea.go b/server/forge/gitea/gitea.go index 73499826c..7b3788d06 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -32,13 +32,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - 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/store" - shared_utils "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + 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/store" + shared_utils "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/gitea/gitea_test.go b/server/forge/gitea/gitea_test.go index b8f7a45be..7b7f20dce 100644 --- a/server/forge/gitea/gitea_test.go +++ b/server/forge/gitea/gitea_test.go @@ -26,11 +26,11 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_gitea(t *testing.T) { diff --git a/server/forge/gitea/helper.go b/server/forge/gitea/helper.go index 56ec0953e..67cd6cb20 100644 --- a/server/forge/gitea/helper.go +++ b/server/forge/gitea/helper.go @@ -25,8 +25,8 @@ import ( "code.gitea.io/sdk/gitea" - "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" ) // toRepo converts a Gitea repository to a Woodpecker repository. diff --git a/server/forge/gitea/helper_test.go b/server/forge/gitea/helper_test.go index f8d36f371..2f1cb94fd 100644 --- a/server/forge/gitea/helper_test.go +++ b/server/forge/gitea/helper_test.go @@ -22,9 +22,9 @@ import ( "code.gitea.io/sdk/gitea" "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func Test_parse(t *testing.T) { diff --git a/server/forge/gitea/parse.go b/server/forge/gitea/parse.go index 7b2629b2e..ae873d64d 100644 --- a/server/forge/gitea/parse.go +++ b/server/forge/gitea/parse.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "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/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/gitea/parse_test.go b/server/forge/gitea/parse_test.go index a37384464..947cb84bb 100644 --- a/server/forge/gitea/parse_test.go +++ b/server/forge/gitea/parse_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea/fixtures" - "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/gitea/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGiteaParser(t *testing.T) { diff --git a/server/forge/github/convert.go b/server/forge/github/convert.go index 19088a516..903f9edf6 100644 --- a/server/forge/github/convert.go +++ b/server/forge/github/convert.go @@ -20,7 +20,7 @@ import ( "github.com/google/go-github/v67/github" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/github/convert_test.go b/server/forge/github/convert_test.go index 3e9295cf6..1e27dda53 100644 --- a/server/forge/github/convert_test.go +++ b/server/forge/github/convert_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/google/go-github/v67/github" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_helper(t *testing.T) { diff --git a/server/forge/github/github.go b/server/forge/github/github.go index a117b71d6..750d0fdf5 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -31,13 +31,13 @@ import ( "github.com/rs/zerolog/log" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - 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/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + 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/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/github/github_test.go b/server/forge/github/github_test.go index ede197a99..c2d46bfc7 100644 --- a/server/forge/github/github_test.go +++ b/server/forge/github/github_test.go @@ -23,8 +23,8 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_github(t *testing.T) { diff --git a/server/forge/github/parse.go b/server/forge/github/parse.go index 61084d857..e6c68f528 100644 --- a/server/forge/github/parse.go +++ b/server/forge/github/parse.go @@ -24,9 +24,9 @@ import ( "github.com/google/go-github/v67/github" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/github/parse_test.go b/server/forge/github/parse_test.go index 225bfd3c9..c316dd9ab 100644 --- a/server/forge/github/parse_test.go +++ b/server/forge/github/parse_test.go @@ -25,9 +25,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github/fixtures" - "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/github/fixtures" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const ( diff --git a/server/forge/gitlab/convert.go b/server/forge/gitlab/convert.go index 116e19846..c8ccdc119 100644 --- a/server/forge/gitlab/convert.go +++ b/server/forge/gitlab/convert.go @@ -23,8 +23,8 @@ import ( "gitlab.com/gitlab-org/api/client-go" - "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" ) const ( diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go index 54ba25029..fbe145002 100644 --- a/server/forge/gitlab/gitlab.go +++ b/server/forge/gitlab/gitlab.go @@ -31,13 +31,13 @@ import ( "gitlab.com/gitlab-org/api/client-go" "golang.org/x/oauth2" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/common" - 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/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/utils" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/common" + 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/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) const ( diff --git a/server/forge/gitlab/gitlab_test.go b/server/forge/gitlab/gitlab_test.go index 4c4042cd3..04619acaf 100644 --- a/server/forge/gitlab/gitlab_test.go +++ b/server/forge/gitlab/gitlab_test.go @@ -26,9 +26,9 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab/testdata" - "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/gitlab/testdata" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func load(config string) *GitLab { diff --git a/server/forge/gitlab/status.go b/server/forge/gitlab/status.go index dd28819df..be03b7c9d 100644 --- a/server/forge/gitlab/status.go +++ b/server/forge/gitlab/status.go @@ -17,7 +17,7 @@ package gitlab import ( "gitlab.com/gitlab-org/api/client-go" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // getStatus is a helper that converts a Woodpecker status to a Gitlab status. diff --git a/server/forge/mocks/forge.go b/server/forge/mocks/forge.go index 9bc45855c..0c6ec4421 100644 --- a/server/forge/mocks/forge.go +++ b/server/forge/mocks/forge.go @@ -12,9 +12,9 @@ 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" - types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" + types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" ) // Forge is an autogenerated mock type for the Forge type diff --git a/server/forge/refresh.go b/server/forge/refresh.go index 931b67d6e..0b0e5fac5 100644 --- a/server/forge/refresh.go +++ b/server/forge/refresh.go @@ -20,8 +20,8 @@ import ( "github.com/rs/zerolog/log" - "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" ) // Refresher refreshes an oauth token and expiration for the given user. It diff --git a/server/forge/setup/setup.go b/server/forge/setup/setup.go index 9f2edd25d..e534ab112 100644 --- a/server/forge/setup/setup.go +++ b/server/forge/setup/setup.go @@ -7,15 +7,15 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/addon" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucket" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/bitbucketdatacenter" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/forgejo" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitea" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/github" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/gitlab" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/addon" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/github" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitlab" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Forge(forge *model.Forge) (forge.Forge, error) { diff --git a/server/grpc/auth_server.go b/server/grpc/auth_server.go index a12317f93..c009b6eca 100644 --- a/server/grpc/auth_server.go +++ b/server/grpc/auth_server.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type WoodpeckerAuthServer struct { diff --git a/server/grpc/filter.go b/server/grpc/filter.go index 521aeb912..6df125bcd 100644 --- a/server/grpc/filter.go +++ b/server/grpc/filter.go @@ -15,9 +15,9 @@ package grpc import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" ) func createFilterFunc(agentFilter rpc.Filter) queue.FilterFn { diff --git a/server/grpc/filter_test.go b/server/grpc/filter_test.go index e074f797f..1599a58ca 100644 --- a/server/grpc/filter_test.go +++ b/server/grpc/filter_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCreateFilterFunc(t *testing.T) { diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index 9297f3502..379fa7900 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -28,15 +28,15 @@ import ( "github.com/rs/zerolog/log" grpcMetadata "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // updateAgentLastWorkDelay the delay before the LastWork info should be updated. diff --git a/server/grpc/rpc_test.go b/server/grpc/rpc_test.go index 60bd8193a..7b071cf1b 100644 --- a/server/grpc/rpc_test.go +++ b/server/grpc/rpc_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/mock" "google.golang.org/grpc/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - mocks_store "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + mocks_store "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func TestRegisterAgent(t *testing.T) { diff --git a/server/grpc/server.go b/server/grpc/server.go index 2cfa8548a..4a79ef447 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -22,13 +22,13 @@ import ( prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc/proto" - "go.woodpecker-ci.org/woodpecker/v2/server/logging" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc/proto" + "go.woodpecker-ci.org/woodpecker/v3/server/logging" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // WoodpeckerServer is a grpc server implementation. diff --git a/server/logging/log.go b/server/logging/log.go index 0e713644f..ec7afe861 100644 --- a/server/logging/log.go +++ b/server/logging/log.go @@ -20,7 +20,7 @@ import ( logger "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: (bradrydzewski) writing to subscribers is currently a blocking diff --git a/server/logging/log_test.go b/server/logging/log_test.go index f84a5b8f3..52020e6cc 100644 --- a/server/logging/log_test.go +++ b/server/logging/log_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestLogging(t *testing.T) { diff --git a/server/logging/logging.go b/server/logging/logging.go index e8eb80117..80f1854f8 100644 --- a/server/logging/logging.go +++ b/server/logging/logging.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // ErrNotFound is returned when the log does not exist. diff --git a/server/model/pipeline.go b/server/model/pipeline.go index 6268e08a6..b74e8184a 100644 --- a/server/model/pipeline.go +++ b/server/model/pipeline.go @@ -16,7 +16,7 @@ package model import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" ) type Pipeline struct { diff --git a/server/pipeline/approve.go b/server/pipeline/approve.go index ff4336c4f..d66b128ac 100644 --- a/server/pipeline/approve.go +++ b/server/pipeline/approve.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - 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/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + 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/store" ) // Approve update the status to pending for a blocked pipeline so it can be executed. diff --git a/server/pipeline/cancel.go b/server/pipeline/cancel.go index 253e1d586..e39c20010 100644 --- a/server/pipeline/cancel.go +++ b/server/pipeline/cancel.go @@ -20,11 +20,11 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/queue" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Cancel the pipeline and returns the status. diff --git a/server/pipeline/config.go b/server/pipeline/config.go index f54066593..0e550d54c 100644 --- a/server/pipeline/config.go +++ b/server/pipeline/config.go @@ -15,10 +15,10 @@ package pipeline import ( - 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/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + 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/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func findOrPersistPipelineConfig(store store.Store, currentPipeline *model.Pipeline, forgeYamlConfig *forge_types.FileMeta) (*model.Config, error) { diff --git a/server/pipeline/create.go b/server/pipeline/create.go index 90983d8d0..2a5ebb6da 100644 --- a/server/pipeline/create.go +++ b/server/pipeline/create.go @@ -22,12 +22,12 @@ import ( "github.com/rs/zerolog/log" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - 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/store" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + 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/store" ) var skipPipelineRegex = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`) diff --git a/server/pipeline/decline.go b/server/pipeline/decline.go index 2d098fdc5..d717f878f 100644 --- a/server/pipeline/decline.go +++ b/server/pipeline/decline.go @@ -21,9 +21,9 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Decline updates the status to declined for blocked pipelines. diff --git a/server/pipeline/gated.go b/server/pipeline/gated.go index bd59122f9..4a4f3dc36 100644 --- a/server/pipeline/gated.go +++ b/server/pipeline/gated.go @@ -14,7 +14,7 @@ package pipeline -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" func setApprovalState(repo *model.Repo, pipeline *model.Pipeline) { if !needsApproval(repo, pipeline) { diff --git a/server/pipeline/gated_test.go b/server/pipeline/gated_test.go index 2b95313ec..76004ff3d 100644 --- a/server/pipeline/gated_test.go +++ b/server/pipeline/gated_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 TestSetGatedState(t *testing.T) { diff --git a/server/pipeline/helper.go b/server/pipeline/helper.go index e8e3400a5..bc1417793 100644 --- a/server/pipeline/helper.go +++ b/server/pipeline/helper.go @@ -19,8 +19,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func updatePipelineStatus(ctx context.Context, forge forge.Forge, pipeline *model.Pipeline, repo *model.Repo, user *model.User) { diff --git a/server/pipeline/items.go b/server/pipeline/items.go index c34ffa96e..72080414b 100644 --- a/server/pipeline/items.go +++ b/server/pipeline/items.go @@ -21,14 +21,14 @@ import ( "github.com/rs/zerolog/log" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - 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/pipeline/stepbuilder" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + 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/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func parsePipeline(forge forge.Forge, store store.Store, currentPipeline *model.Pipeline, user *model.User, repo *model.Repo, yamls []*forge_types.FileMeta, envs map[string]string) ([]*stepbuilder.Item, error) { diff --git a/server/pipeline/items_test.go b/server/pipeline/items_test.go index bec0c2337..53b9db126 100644 --- a/server/pipeline/items_test.go +++ b/server/pipeline/items_test.go @@ -3,9 +3,9 @@ package pipeline import ( "testing" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - sharedPipeline "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + sharedPipeline "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" ) func TestSetPipelineStepsOnPipeline(t *testing.T) { diff --git a/server/pipeline/pipeline_status.go b/server/pipeline/pipeline_status.go index 95ed21817..fbac2776f 100644 --- a/server/pipeline/pipeline_status.go +++ b/server/pipeline/pipeline_status.go @@ -18,9 +18,9 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateToStatusRunning(store store.Store, pipeline model.Pipeline, started int64) (*model.Pipeline, error) { diff --git a/server/pipeline/pipeline_status_test.go b/server/pipeline/pipeline_status_test.go index ce4ba657b..1f9b87580 100644 --- a/server/pipeline/pipeline_status_test.go +++ b/server/pipeline/pipeline_status_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/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/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func mockStorePipeline(t *testing.T) store.Store { diff --git a/server/pipeline/queue.go b/server/pipeline/queue.go index a17669a1f..002dbf3a9 100644 --- a/server/pipeline/queue.go +++ b/server/pipeline/queue.go @@ -20,10 +20,10 @@ import ( "fmt" "maps" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" ) func queuePipeline(ctx context.Context, repo *model.Repo, pipelineItems []*stepbuilder.Item) error { diff --git a/server/pipeline/restart.go b/server/pipeline/restart.go index 3c997a290..844f437b3 100644 --- a/server/pipeline/restart.go +++ b/server/pipeline/restart.go @@ -21,10 +21,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - 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/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + 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/store" ) // Restart a pipeline by creating a new one out of the old and start it. diff --git a/server/pipeline/start.go b/server/pipeline/start.go index ae4a24a62..82625319f 100644 --- a/server/pipeline/start.go +++ b/server/pipeline/start.go @@ -19,10 +19,10 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pipeline/stepbuilder" - "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/pipeline/stepbuilder" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // start a pipeline, make sure it was stored persistent in the store before. diff --git a/server/pipeline/step_status.go b/server/pipeline/step_status.go index 8ee5b83ba..364384a05 100644 --- a/server/pipeline/step_status.go +++ b/server/pipeline/step_status.go @@ -18,10 +18,10 @@ package pipeline import ( "time" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateStepStatus(store store.Store, step *model.Step, state rpc.StepState) error { diff --git a/server/pipeline/step_status_test.go b/server/pipeline/step_status_test.go index c2e9564cf..1d6212880 100644 --- a/server/pipeline/step_status_test.go +++ b/server/pipeline/step_status_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "go.woodpecker-ci.org/woodpecker/v2/pipeline" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/mocks" + "go.woodpecker-ci.org/woodpecker/v3/pipeline" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/mocks" ) func mockStoreStep(t *testing.T) store.Store { diff --git a/server/pipeline/stepbuilder/metadata.go b/server/pipeline/stepbuilder/metadata.go index 52d79b4bb..116f661c1 100644 --- a/server/pipeline/stepbuilder/metadata.go +++ b/server/pipeline/stepbuilder/metadata.go @@ -19,9 +19,9 @@ import ( "net/url" "strings" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // MetadataFromStruct return the metadata from a pipeline will run with. diff --git a/server/pipeline/stepbuilder/metadata_test.go b/server/pipeline/stepbuilder/metadata_test.go index 005d7b6cd..891a29a21 100644 --- a/server/pipeline/stepbuilder/metadata_test.go +++ b/server/pipeline/stepbuilder/metadata_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/server/forge/mocks" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/server/forge/mocks" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestMetadataFromStruct(t *testing.T) { diff --git a/server/pipeline/stepbuilder/stepBuilder.go b/server/pipeline/stepbuilder/stepBuilder.go index 8145bf9e4..3d0b55e7e 100644 --- a/server/pipeline/stepbuilder/stepBuilder.go +++ b/server/pipeline/stepbuilder/stepBuilder.go @@ -25,18 +25,18 @@ import ( "github.com/rs/zerolog/log" "go.uber.org/multierr" - backend_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" - pipeline_errors "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors/types" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/compiler" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/linter" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/matrix" - yaml_types "go.woodpecker-ci.org/woodpecker/v2/pipeline/frontend/yaml/types" - "go.woodpecker-ci.org/woodpecker/v2/server" - forge_types "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + backend_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + pipeline_errors "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors" + errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/metadata" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/compiler" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/linter" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/matrix" + yaml_types "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + forge_types "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // StepBuilder Takes the hook data and the yaml and returns in internal data model. diff --git a/server/pipeline/stepbuilder/stepBuilder_test.go b/server/pipeline/stepbuilder/stepBuilder_test.go index c9b616e4d..bca38e798 100644 --- a/server/pipeline/stepbuilder/stepBuilder_test.go +++ b/server/pipeline/stepbuilder/stepBuilder_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "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/v3/pipeline/errors" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "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" ) func TestGlobalEnvsubst(t *testing.T) { diff --git a/server/pipeline/topic.go b/server/pipeline/topic.go index 26c9f432b..8bcb52efd 100644 --- a/server/pipeline/topic.go +++ b/server/pipeline/topic.go @@ -20,9 +20,9 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/pubsub" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/pubsub" ) // publishToTopic publishes message to UI clients. diff --git a/server/pipeline/workflow_status.go b/server/pipeline/workflow_status.go index a99ef8ddd..12d2c15a7 100644 --- a/server/pipeline/workflow_status.go +++ b/server/pipeline/workflow_status.go @@ -15,9 +15,9 @@ package pipeline import ( - "go.woodpecker-ci.org/woodpecker/v2/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func UpdateWorkflowStatusToRunning(store store.Store, workflow model.Workflow, state rpc.WorkflowState) (*model.Workflow, error) { diff --git a/server/queue/fifo.go b/server/queue/fifo.go index d9acc66a4..1ee07370d 100644 --- a/server/queue/fifo.go +++ b/server/queue/fifo.go @@ -23,8 +23,8 @@ import ( "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/shared/constant" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/shared/constant" ) type entry struct { diff --git a/server/queue/fifo_test.go b/server/queue/fifo_test.go index 90361255d..c25d4a966 100644 --- a/server/queue/fifo_test.go +++ b/server/queue/fifo_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/queue/mocks/queue.go b/server/queue/mocks/queue.go index d56f19d5e..a851b782b 100644 --- a/server/queue/mocks/queue.go +++ b/server/queue/mocks/queue.go @@ -9,9 +9,9 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" - queue "go.woodpecker-ci.org/woodpecker/v2/server/queue" + queue "go.woodpecker-ci.org/woodpecker/v3/server/queue" ) // Queue is an autogenerated mock type for the Queue type diff --git a/server/queue/persistent.go b/server/queue/persistent.go index e87f7c7b2..0f2ae4ae2 100644 --- a/server/queue/persistent.go +++ b/server/queue/persistent.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog/log" - "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" ) // WithTaskStore returns a queue that is backed by the TaskStore. This diff --git a/server/queue/queue.go b/server/queue/queue.go index cc856b6e1..e575bafcd 100644 --- a/server/queue/queue.go +++ b/server/queue/queue.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "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" ) var ( diff --git a/server/router/api.go b/server/router/api.go index 591c9a7d3..23f306aa3 100644 --- a/server/router/api.go +++ b/server/router/api.go @@ -18,10 +18,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - "go.woodpecker-ci.org/woodpecker/v2/server/api/debug" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + "go.woodpecker-ci.org/woodpecker/v3/server/api/debug" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" ) func apiRoutes(e *gin.RouterGroup) { diff --git a/server/router/middleware/session/agent.go b/server/router/middleware/session/agent.go index 0cbfa2a33..24d9bae39 100644 --- a/server/router/middleware/session/agent.go +++ b/server/router/middleware/session/agent.go @@ -20,7 +20,7 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) // AuthorizeAgent authorizes requests from agent to access the queue. diff --git a/server/router/middleware/session/org.go b/server/router/middleware/session/org.go index 0ce2af2ab..a02f0e50f 100644 --- a/server/router/middleware/session/org.go +++ b/server/router/middleware/session/org.go @@ -21,9 +21,9 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "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/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func Org(c *gin.Context) *model.Org { diff --git a/server/router/middleware/session/pagination.go b/server/router/middleware/session/pagination.go index 9bf4455c1..a9bffcd5f 100644 --- a/server/router/middleware/session/pagination.go +++ b/server/router/middleware/session/pagination.go @@ -19,7 +19,7 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const maxPageSize = 50 diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index 0ec3cfd65..788ae1792 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -24,10 +24,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func Repo(c *gin.Context) *model.Repo { diff --git a/server/router/middleware/session/user.go b/server/router/middleware/session/user.go index 862d82df6..7cc35de66 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -21,10 +21,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/model" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func User(c *gin.Context) *model.User { diff --git a/server/router/middleware/store.go b/server/router/middleware/store.go index 6ab61167e..915b1a33c 100644 --- a/server/router/middleware/store.go +++ b/server/router/middleware/store.go @@ -17,7 +17,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) // Store is a middleware function that initializes the Datastore and attaches to diff --git a/server/router/middleware/token/token.go b/server/router/middleware/token/token.go index 8d45adda6..600e4fb15 100644 --- a/server/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -19,10 +19,10 @@ import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/forge" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/forge" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/store" ) func Refresh(c *gin.Context) { diff --git a/server/router/middleware/version.go b/server/router/middleware/version.go index b5c8ec1e2..0fac8225a 100644 --- a/server/router/middleware/version.go +++ b/server/router/middleware/version.go @@ -17,7 +17,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/version" ) // Version is a middleware function that appends the Woodpecker version information diff --git a/server/router/router.go b/server/router/router.go index ea154fe4a..041876d1a 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -23,14 +23,14 @@ import ( openapi_files "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - "go.woodpecker-ci.org/woodpecker/v2/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/api" - "go.woodpecker-ci.org/woodpecker/v2/server/api/metrics" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/header" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/token" - "go.woodpecker-ci.org/woodpecker/v2/server/web" + "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/api" + "go.woodpecker-ci.org/woodpecker/v3/server/api/metrics" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/header" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/token" + "go.woodpecker-ci.org/woodpecker/v3/server/web" ) // Load loads the router. diff --git a/server/services/config/combined.go b/server/services/config/combined.go index 5daebb281..5a6936eb5 100644 --- 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 { diff --git a/server/services/config/combined_test.go b/server/services/config/combined_test.go index 2d0910c6a..6097f9805 100644 --- 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) { diff --git a/server/services/config/forge.go b/server/services/config/forge.go index d7c5d2758..93affef73 100644 --- 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 { diff --git a/server/services/config/forge_test.go b/server/services/config/forge_test.go index 43ff794c3..898d511e4 100644 --- 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) { diff --git a/server/services/config/http.go b/server/services/config/http.go index 33dcfc756..9e6c04f8e 100644 --- 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 { diff --git a/server/services/config/mocks/service.go b/server/services/config/mocks/service.go index 3f08d71c7..ca6989af1 100644 --- 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 diff --git a/server/services/config/service.go b/server/services/config/service.go index 9f857a796..b1d100d7a 100644 --- 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 diff --git a/server/services/encryption/aes.go b/server/services/encryption/aes.go index 1cae9dd38..00d6e3983 100644 --- 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 { diff --git a/server/services/encryption/aes_builder.go b/server/services/encryption/aes_builder.go index bd6800e5d..e742b2e6c 100644 --- 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 { diff --git a/server/services/encryption/aes_encryption.go b/server/services/encryption/aes_encryption.go index b7b5016ff..3eb1ce1c8 100644 --- 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 { diff --git a/server/services/encryption/encryption.go b/server/services/encryption/encryption.go index 4312a5ae5..a6c9ded1e 100644 --- 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 { diff --git a/server/services/encryption/encryption_builder.go b/server/services/encryption/encryption_builder.go index b59606360..2ccf14b8f 100644 --- 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) { diff --git a/server/services/encryption/no_encryption.go b/server/services/encryption/no_encryption.go index 6bc9230d0..dd81865ba 100644 --- 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 diff --git a/server/services/encryption/tink.go b/server/services/encryption/tink.go index 3c210ac7a..033315be7 100644 --- 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 { diff --git a/server/services/encryption/tink_builder.go b/server/services/encryption/tink_builder.go index ccb10cb53..6bb9457c1 100644 --- 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 { diff --git a/server/services/encryption/tink_keyset.go b/server/services/encryption/tink_keyset.go index aaf7b84ae..a3e7ae4b3 100644 --- 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 { diff --git a/server/services/encryption/wrapper/store/secret_store.go b/server/services/encryption/wrapper/store/secret_store.go index b2ba26a38..36f58c194 100644 --- 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) { diff --git a/server/services/encryption/wrapper/store/secret_store_wrapper.go b/server/services/encryption/wrapper/store/secret_store_wrapper.go index e88cc51e3..92707ebc1 100644 --- 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 { diff --git a/server/services/environment/mocks/service.go b/server/services/environment/mocks/service.go index b7cb0776d..9d85dff54 100644 --- 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 diff --git a/server/services/environment/parse.go b/server/services/environment/parse.go index 0a1ccb0c9..e7cbe7e74 100644 --- 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 { diff --git a/server/services/environment/service.go b/server/services/environment/service.go index 0b63471fd..ac8bfff98 100644 --- 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 diff --git a/server/services/log/file/file.go b/server/services/log/file/file.go index f19931beb..7a24dc5f7 100644 --- 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 ( diff --git a/server/services/log/service.go b/server/services/log/service.go index da8f98146..e922b89ee 100644 --- 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) diff --git a/server/services/manager.go b/server/services/manager.go index e38b140e9..ca101f2bf 100644 --- 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" diff --git a/server/services/mocks/manager.go b/server/services/mocks/manager.go index df1000ca6..c2e071296 100644 --- 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 diff --git a/server/services/permissions/admins.go b/server/services/permissions/admins.go index cccad77c8..86bd5500a 100644 --- 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 { diff --git a/server/services/permissions/admins_test.go b/server/services/permissions/admins_test.go index d1e590580..f7cbb55b9 100644 --- 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) { diff --git a/server/services/permissions/orgs.go b/server/services/permissions/orgs.go index 370b6e170..312ed8ea9 100644 --- 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 { diff --git a/server/services/permissions/orgs_test.go b/server/services/permissions/orgs_test.go index 431a52c96..e7ead62b6 100644 --- 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) { diff --git a/server/services/permissions/repo_owners.go b/server/services/permissions/repo_owners.go index 2610ce8a3..07db15a1e 100644 --- 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 { diff --git a/server/services/permissions/repo_owners_test.go b/server/services/permissions/repo_owners_test.go index c34821255..77206eb79 100644 --- 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) { diff --git a/server/services/registry/combined.go b/server/services/registry/combined.go index bdb249bcd..0cb551156 100644 --- 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 { diff --git a/server/services/registry/db.go b/server/services/registry/db.go index 6e566d27c..efdb2c8c4 100644 --- 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 { diff --git a/server/services/registry/filesystem.go b/server/services/registry/filesystem.go index 959c69834..cfcb0c883 100644 --- 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 { diff --git a/server/services/registry/mocks/service.go b/server/services/registry/mocks/service.go index ecce0a414..49cf1e8e2 100644 --- 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 diff --git a/server/services/registry/service.go b/server/services/registry/service.go index 39e1e3fa9..a2fc03979 100644 --- 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 diff --git a/server/services/secret/db.go b/server/services/secret/db.go index 52231ca9e..25e779e3d 100644 --- 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 { diff --git a/server/services/secret/db_test.go b/server/services/secret/db_test.go index cd1112373..08e1a5f16 100644 --- 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) { diff --git a/server/services/secret/mocks/service.go b/server/services/secret/mocks/service.go index 37f301d53..d918d625b 100644 --- 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 diff --git a/server/services/secret/service.go b/server/services/secret/service.go index c2b25ba0f..8bc691d2e 100644 --- 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 diff --git a/server/services/setup.go b/server/services/setup.go index 751a30ddd..dca0c4195 100644 --- 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 { diff --git a/server/store/datastore/agent.go b/server/store/datastore/agent.go index 18e035e76..d3289abd9 100644 --- a/server/store/datastore/agent.go +++ b/server/store/datastore/agent.go @@ -17,7 +17,7 @@ package datastore import ( "errors" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ErrNoTokenProvided = errors.New("please provide a token") diff --git a/server/store/datastore/agent_test.go b/server/store/datastore/agent_test.go index c94d46719..71495b460 100644 --- a/server/store/datastore/agent_test.go +++ b/server/store/datastore/agent_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestAgentFindByToken(t *testing.T) { diff --git a/server/store/datastore/config.go b/server/store/datastore/config.go index b16c415a8..765d5ed86 100644 --- a/server/store/datastore/config.go +++ b/server/store/datastore/config.go @@ -22,8 +22,8 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "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" ) func (s storage) ConfigsForPipeline(pipelineID int64) ([]*model.Config, error) { diff --git a/server/store/datastore/config_test.go b/server/store/datastore/config_test.go index a08c789df..81a0114d0 100644 --- a/server/store/datastore/config_test.go +++ b/server/store/datastore/config_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/store/datastore/cron.go b/server/store/datastore/cron.go index 89cf91e3e..e790c74c9 100644 --- a/server/store/datastore/cron.go +++ b/server/store/datastore/cron.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) CronCreate(cron *model.Cron) error { diff --git a/server/store/datastore/cron_test.go b/server/store/datastore/cron_test.go index 28d9a7a59..88710f91f 100644 --- a/server/store/datastore/cron_test.go +++ b/server/store/datastore/cron_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCronCreate(t *testing.T) { diff --git a/server/store/datastore/engine.go b/server/store/datastore/engine.go index 316347591..e7494b484 100644 --- a/server/store/datastore/engine.go +++ b/server/store/datastore/engine.go @@ -21,8 +21,8 @@ import ( "xorm.io/xorm" xlog "xorm.io/xorm/log" - "go.woodpecker-ci.org/woodpecker/v2/server/store" - "go.woodpecker-ci.org/woodpecker/v2/server/store/datastore/migration" + "go.woodpecker-ci.org/woodpecker/v3/server/store" + "go.woodpecker-ci.org/woodpecker/v3/server/store/datastore/migration" ) type storage struct { diff --git a/server/store/datastore/errors.go b/server/store/datastore/errors.go index a7d89388a..c2668e8aa 100644 --- a/server/store/datastore/errors.go +++ b/server/store/datastore/errors.go @@ -17,7 +17,7 @@ package datastore import ( "fmt" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) type ErrorRepoNotExist struct { diff --git a/server/store/datastore/feed.go b/server/store/datastore/feed.go index d06897bf8..8be597f05 100644 --- a/server/store/datastore/feed.go +++ b/server/store/datastore/feed.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var feedItemSelect = `repos.id as repo_id, diff --git a/server/store/datastore/feed_test.go b/server/store/datastore/feed_test.go index fb4b0e52f..d8adb8c53 100644 --- a/server/store/datastore/feed_test.go +++ b/server/store/datastore/feed_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestGetPipelineQueue(t *testing.T) { diff --git a/server/store/datastore/forge.go b/server/store/datastore/forge.go index 5c1a29efc..8e30bd974 100644 --- a/server/store/datastore/forge.go +++ b/server/store/datastore/forge.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) ForgeGet(id int64) (*model.Forge, error) { diff --git a/server/store/datastore/forge_test.go b/server/store/datastore/forge_test.go index a7583d8db..1f163bf08 100644 --- a/server/store/datastore/forge_test.go +++ b/server/store/datastore/forge_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestForgeCRUD(t *testing.T) { diff --git a/server/store/datastore/helper.go b/server/store/datastore/helper.go index 4ba698b88..4f2c2650a 100644 --- a/server/store/datastore/helper.go +++ b/server/store/datastore/helper.go @@ -21,8 +21,8 @@ import ( "xorm.io/xorm" - "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" ) // wrapGet return error if err not nil or if requested entry do not exist. diff --git a/server/store/datastore/helper_test.go b/server/store/datastore/helper_test.go index be8b835e6..c694d46bf 100644 --- a/server/store/datastore/helper_test.go +++ b/server/store/datastore/helper_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/store/types" + "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func TestWrapGet(t *testing.T) { diff --git a/server/store/datastore/log.go b/server/store/datastore/log.go index ad5d511ae..ade01c08c 100644 --- a/server/store/datastore/log.go +++ b/server/store/datastore/log.go @@ -18,7 +18,7 @@ import ( "github.com/rs/zerolog/log" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Maximum number of records to store in one PostgreSQL statement. diff --git a/server/store/datastore/log_test.go b/server/store/datastore/log_test.go index 94897268c..1c331ff78 100644 --- a/server/store/datastore/log_test.go +++ b/server/store/datastore/log_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestLogCreateFindDelete(t *testing.T) { diff --git a/server/store/datastore/migration/008_set_default_forge_id.go b/server/store/datastore/migration/008_set_default_forge_id.go index d430dbda2..7eaf113c2 100644 --- a/server/store/datastore/migration/008_set_default_forge_id.go +++ b/server/store/datastore/migration/008_set_default_forge_id.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) type userV008 struct { diff --git a/server/store/datastore/migration/011_cron_without_sec.go b/server/store/datastore/migration/011_cron_without_sec.go index 12e5b257f..c99290259 100644 --- a/server/store/datastore/migration/011_cron_without_sec.go +++ b/server/store/datastore/migration/011_cron_without_sec.go @@ -21,7 +21,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var cronWithoutSec = xormigrate.Migration{ diff --git a/server/store/datastore/migration/015_add_org_agents.go b/server/store/datastore/migration/015_add_org_agents.go index 83348f32c..045ce980e 100644 --- a/server/store/datastore/migration/015_add_org_agents.go +++ b/server/store/datastore/migration/015_add_org_agents.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var addOrgAgents = xormigrate.Migration{ diff --git a/server/store/datastore/migration/017_split_trusted.go b/server/store/datastore/migration/017_split_trusted.go index e7ea7b8d5..a03fa86c2 100644 --- a/server/store/datastore/migration/017_split_trusted.go +++ b/server/store/datastore/migration/017_split_trusted.go @@ -20,7 +20,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var splitTrusted = xormigrate.Migration{ diff --git a/server/store/datastore/migration/migration.go b/server/store/datastore/migration/migration.go index df0cd8280..cc948e27c 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -22,7 +22,7 @@ import ( "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // APPEND NEW MIGRATIONS diff --git a/server/store/datastore/org.go b/server/store/datastore/org.go index b432fb65c..eb18ac8df 100644 --- a/server/store/datastore/org.go +++ b/server/store/datastore/org.go @@ -20,7 +20,7 @@ import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) OrgCreate(org *model.Org) error { diff --git a/server/store/datastore/org_test.go b/server/store/datastore/org_test.go index a2a06f868..5136708f5 100644 --- a/server/store/datastore/org_test.go +++ b/server/store/datastore/org_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestOrgCRUD(t *testing.T) { diff --git a/server/store/datastore/permission.go b/server/store/datastore/permission.go index 22736fdc3..63a6e3dc6 100644 --- a/server/store/datastore/permission.go +++ b/server/store/datastore/permission.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) PermFind(user *model.User, repo *model.Repo) (*model.Perm, error) { diff --git a/server/store/datastore/permission_test.go b/server/store/datastore/permission_test.go index 2e7e8107a..45882c7c2 100644 --- a/server/store/datastore/permission_test.go +++ b/server/store/datastore/permission_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestPermFind(t *testing.T) { diff --git a/server/store/datastore/pipeline.go b/server/store/datastore/pipeline.go index a22ff4834..14eff95c8 100644 --- a/server/store/datastore/pipeline.go +++ b/server/store/datastore/pipeline.go @@ -20,7 +20,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) GetPipeline(id int64) (*model.Pipeline, error) { diff --git a/server/store/datastore/pipeline_test.go b/server/store/datastore/pipeline_test.go index 3382faf73..c4a81c632 100644 --- a/server/store/datastore/pipeline_test.go +++ b/server/store/datastore/pipeline_test.go @@ -23,8 +23,8 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "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" ) func TestPipelines(t *testing.T) { diff --git a/server/store/datastore/redirection.go b/server/store/datastore/redirection.go index f9dd1a34a..637c36d65 100644 --- a/server/store/datastore/redirection.go +++ b/server/store/datastore/redirection.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) getRedirection(e *xorm.Session, fullName string) (*model.Redirection, error) { diff --git a/server/store/datastore/redirection_test.go b/server/store/datastore/redirection_test.go index 8e72cd048..ba59c6a24 100644 --- a/server/store/datastore/redirection_test.go +++ b/server/store/datastore/redirection_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCreateRedirection(t *testing.T) { diff --git a/server/store/datastore/registry.go b/server/store/datastore/registry.go index 49687783e..e1ba9368a 100644 --- a/server/store/datastore/registry.go +++ b/server/store/datastore/registry.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const orderRegistriesBy = "id" diff --git a/server/store/datastore/registry_test.go b/server/store/datastore/registry_test.go index e6f3f5f05..a1cbfa0d8 100644 --- a/server/store/datastore/registry_test.go +++ b/server/store/datastore/registry_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" ) func TestRegistryFind(t *testing.T) { diff --git a/server/store/datastore/repo.go b/server/store/datastore/repo.go index f373b17cd..559591bd4 100644 --- a/server/store/datastore/repo.go +++ b/server/store/datastore/repo.go @@ -22,8 +22,8 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "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" ) func (s storage) GetRepo(id int64) (*model.Repo, error) { diff --git a/server/store/datastore/repo_test.go b/server/store/datastore/repo_test.go index aabd31afa..90b5dfac4 100644 --- a/server/store/datastore/repo_test.go +++ b/server/store/datastore/repo_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestRepos(t *testing.T) { diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go index 9a481ab1b..0b508c85b 100644 --- a/server/store/datastore/secret.go +++ b/server/store/datastore/secret.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/builder" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) const orderSecretsBy = "name" diff --git a/server/store/datastore/secret_test.go b/server/store/datastore/secret_test.go index 88171ea9c..d96438660 100644 --- a/server/store/datastore/secret_test.go +++ b/server/store/datastore/secret_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestSecretFind(t *testing.T) { diff --git a/server/store/datastore/server_config.go b/server/store/datastore/server_config.go index a18517edb..c1985deb5 100644 --- a/server/store/datastore/server_config.go +++ b/server/store/datastore/server_config.go @@ -14,7 +14,7 @@ package datastore -import "go.woodpecker-ci.org/woodpecker/v2/server/model" +import "go.woodpecker-ci.org/woodpecker/v3/server/model" func (s storage) ServerConfigGet(key string) (string, error) { config := new(model.ServerConfig) diff --git a/server/store/datastore/server_config_test.go b/server/store/datastore/server_config_test.go index dbbeddde9..f37ef4c68 100644 --- a/server/store/datastore/server_config_test.go +++ b/server/store/datastore/server_config_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestServerConfigGetSet(t *testing.T) { diff --git a/server/store/datastore/step.go b/server/store/datastore/step.go index 0ccab240d..6f81bea11 100644 --- a/server/store/datastore/step.go +++ b/server/store/datastore/step.go @@ -18,7 +18,7 @@ import ( "xorm.io/builder" "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) StepLoad(id int64) (*model.Step, error) { diff --git a/server/store/datastore/step_test.go b/server/store/datastore/step_test.go index 74840d2e2..95d7bba88 100644 --- a/server/store/datastore/step_test.go +++ b/server/store/datastore/step_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/assert" - "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" ) func TestStepFind(t *testing.T) { diff --git a/server/store/datastore/task.go b/server/store/datastore/task.go index 44296dff1..40f95963b 100644 --- a/server/store/datastore/task.go +++ b/server/store/datastore/task.go @@ -15,7 +15,7 @@ package datastore import ( - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) TaskList() ([]*model.Task, error) { diff --git a/server/store/datastore/task_test.go b/server/store/datastore/task_test.go index 61e16bb81..c32ae191b 100644 --- a/server/store/datastore/task_test.go +++ b/server/store/datastore/task_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestTaskList(t *testing.T) { diff --git a/server/store/datastore/user.go b/server/store/datastore/user.go index c1900062e..aa3d35f7d 100644 --- a/server/store/datastore/user.go +++ b/server/store/datastore/user.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) GetUser(id int64) (*model.User, error) { diff --git a/server/store/datastore/users_test.go b/server/store/datastore/users_test.go index 04016af1c..a26ebecca 100644 --- a/server/store/datastore/users_test.go +++ b/server/store/datastore/users_test.go @@ -20,7 +20,7 @@ import ( "github.com/franela/goblin" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestUsers(t *testing.T) { diff --git a/server/store/datastore/workflow.go b/server/store/datastore/workflow.go index 8e76df90c..714c7a674 100644 --- a/server/store/datastore/workflow.go +++ b/server/store/datastore/workflow.go @@ -17,7 +17,7 @@ package datastore import ( "xorm.io/xorm" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func (s storage) WorkflowGetTree(pipeline *model.Pipeline) ([]*model.Workflow, error) { diff --git a/server/store/datastore/workflow_test.go b/server/store/datastore/workflow_test.go index b0a6e2b68..5a31646a2 100644 --- a/server/store/datastore/workflow_test.go +++ b/server/store/datastore/workflow_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestWorkflowLoad(t *testing.T) { diff --git a/server/store/mocks/store.go b/server/store/mocks/store.go index ff50ab0f5..a35d8a655 100644 --- a/server/store/mocks/store.go +++ b/server/store/mocks/store.go @@ -9,7 +9,7 @@ import ( context "context" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v2/server/model" + model "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // Store is an autogenerated mock type for the Store type diff --git a/server/store/store.go b/server/store/store.go index 5618deb9a..18a6f766a 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -19,7 +19,7 @@ package store import ( "context" - "go.woodpecker-ci.org/woodpecker/v2/server/model" + "go.woodpecker-ci.org/woodpecker/v3/server/model" ) // TODO: CreateX func should return new object to not indirect let storage change an existing object (alter ID etc...) diff --git a/server/web/config.go b/server/web/config.go index 2d204d277..48fed96ea 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -23,10 +23,10 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/server/router/middleware/session" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" - "go.woodpecker-ci.org/woodpecker/v2/version" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/version" ) func Config(c *gin.Context) { diff --git a/server/web/web.go b/server/web/web.go index f827ab60e..68a7be487 100644 --- a/server/web/web.go +++ b/server/web/web.go @@ -27,8 +27,8 @@ import ( "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - "go.woodpecker-ci.org/woodpecker/v2/server" - "go.woodpecker-ci.org/woodpecker/v2/web" + "go.woodpecker-ci.org/woodpecker/v3/server" + "go.woodpecker-ci.org/woodpecker/v3/web" ) var indexHTML []byte diff --git a/server/web/web_test.go b/server/web/web_test.go index 52e7b255e..c23c704d1 100644 --- a/server/web/web_test.go +++ b/server/web/web_test.go @@ -23,7 +23,7 @@ import ( "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/server" + "go.woodpecker-ci.org/woodpecker/v3/server" ) func Test_custom_file_returns_OK_and_empty_content_and_fitting_mimetype(t *testing.T) { diff --git a/shared/token/token_test.go b/shared/token/token_test.go index fb77ef609..5c321e4d9 100644 --- a/shared/token/token_test.go +++ b/shared/token/token_test.go @@ -8,7 +8,7 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" - "go.woodpecker-ci.org/woodpecker/v2/shared/token" + "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) func TestToken(t *testing.T) { diff --git a/woodpecker-go/README.md b/woodpecker-go/README.md index 8c1faa43f..9ff1cfc8a 100644 --- a/woodpecker-go/README.md +++ b/woodpecker-go/README.md @@ -2,7 +2,7 @@ ```Go import ( - "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" "golang.org/x/oauth2" ) diff --git a/woodpecker-go/woodpecker/mocks/client.go b/woodpecker-go/woodpecker/mocks/client.go index 97313d34f..14472581c 100644 --- a/woodpecker-go/woodpecker/mocks/client.go +++ b/woodpecker-go/woodpecker/mocks/client.go @@ -9,7 +9,7 @@ import ( http "net/http" mock "github.com/stretchr/testify/mock" - woodpecker "go.woodpecker-ci.org/woodpecker/v2/woodpecker-go/woodpecker" + woodpecker "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Client is an autogenerated mock type for the Client type