From 5e0dc2688f02e24a22317d1f250fc5ff51831c41 Mon Sep 17 00:00:00 2001 From: Patrick Schratz Date: Fri, 17 Jan 2025 00:36:19 +0100 Subject: [PATCH] refactor: use own import paths (#5) --- .woodpecker/test.yaml | 2 +- Justfile | 89 +++++++++++++------ Makefile | 46 +++++----- agent/logger.go | 9 +- agent/rpc/auth_client_grpc.go | 3 +- agent/rpc/client_grpc.go | 7 +- agent/runner.go | 11 ++- agent/tracer.go | 5 +- cli/admin/admin.go | 9 +- cli/admin/loglevel/loglevel.go | 5 +- cli/admin/registry/registry_add.go | 5 +- cli/admin/registry/registry_list.go | 7 +- cli/admin/registry/registry_rm.go | 3 +- cli/admin/registry/registry_set.go | 7 +- cli/admin/registry/registry_show.go | 5 +- cli/admin/secret/secret_add.go | 5 +- cli/admin/secret/secret_list.go | 7 +- cli/admin/secret/secret_rm.go | 3 +- cli/admin/secret/secret_set.go | 5 +- cli/admin/secret/secret_show.go | 5 +- cli/admin/user/user_add.go | 5 +- cli/admin/user/user_list.go | 7 +- cli/admin/user/user_rm.go | 3 +- cli/admin/user/user_show.go | 5 +- cli/common/flags.go | 3 +- cli/common/hooks.go | 5 +- cli/common/pipeline.go | 3 +- cli/common/zerologger.go | 3 +- cli/exec/dummy.go | 2 +- cli/exec/exec.go | 33 ++++--- cli/exec/metadata.go | 7 +- cli/exec/metadata_test.go | 5 +- cli/info/info.go | 5 +- cli/internal/util.go | 3 +- cli/lint/lint.go | 9 +- cli/lint/utils.go | 3 +- cli/org/org.go | 5 +- cli/org/registry/registry.go | 3 +- cli/org/registry/registry_add.go | 7 +- cli/org/registry/registry_list.go | 7 +- cli/org/registry/registry_rm.go | 5 +- cli/org/registry/registry_set.go | 7 +- cli/org/registry/registry_show.go | 5 +- cli/org/secret/secret.go | 3 +- cli/org/secret/secret_add.go | 7 +- cli/org/secret/secret_list.go | 7 +- cli/org/secret/secret_rm.go | 5 +- cli/org/secret/secret_set.go | 7 +- cli/org/secret/secret_show.go | 5 +- cli/pipeline/approve.go | 3 +- cli/pipeline/create.go | 7 +- cli/pipeline/decline.go | 3 +- cli/pipeline/deploy/deploy.go | 7 +- cli/pipeline/kill.go | 3 +- cli/pipeline/last.go | 7 +- cli/pipeline/list.go | 9 +- cli/pipeline/list_test.go | 5 +- cli/pipeline/log/log_purge.go | 3 +- cli/pipeline/log/log_show.go | 5 +- cli/pipeline/pipeline.go | 9 +- cli/pipeline/pipeline_test.go | 5 +- cli/pipeline/ps.go | 7 +- cli/pipeline/purge.go | 7 +- cli/pipeline/purge_test.go | 5 +- cli/pipeline/queue.go | 5 +- cli/pipeline/show.go | 7 +- cli/pipeline/start.go | 5 +- cli/pipeline/stop.go | 3 +- cli/repo/cron/cron_add.go | 7 +- cli/repo/cron/cron_list.go | 7 +- cli/repo/cron/cron_rm.go | 5 +- cli/repo/cron/cron_show.go | 5 +- cli/repo/cron/cron_update.go | 7 +- cli/repo/registry/registry.go | 5 +- cli/repo/registry/registry_add.go | 7 +- cli/repo/registry/registry_list.go | 7 +- cli/repo/registry/registry_rm.go | 5 +- cli/repo/registry/registry_set.go | 7 +- cli/repo/registry/registry_show.go | 5 +- cli/repo/repo.go | 7 +- cli/repo/repo_add.go | 5 +- cli/repo/repo_chown.go | 3 +- cli/repo/repo_list.go | 7 +- cli/repo/repo_repair.go | 3 +- cli/repo/repo_rm.go | 3 +- cli/repo/repo_show.go | 5 +- cli/repo/repo_sync.go | 7 +- cli/repo/repo_update.go | 5 +- cli/repo/secret/secret.go | 5 +- cli/repo/secret/secret_add.go | 7 +- cli/repo/secret/secret_list.go | 7 +- cli/repo/secret/secret_rm.go | 5 +- cli/repo/secret/secret_set.go | 7 +- cli/repo/secret/secret_show.go | 5 +- cli/setup/setup.go | 5 +- cli/update/updater.go | 3 +- cli/update/updater_test.go | 2 +- cmd/agent/core/agent.go | 17 ++-- cmd/agent/core/health.go | 5 +- cmd/agent/core/health_test.go | 3 +- cmd/agent/core/run.go | 9 +- cmd/agent/dummy.go | 2 +- cmd/agent/main.go | 13 ++- cmd/cli/app.go | 23 +++-- cmd/cli/main.go | 3 +- cmd/server/flags.go | 5 +- cmd/server/grpc_server.go | 9 +- cmd/server/main.go | 7 +- cmd/server/metrics_server.go | 5 +- cmd/server/openapi.go | 4 +- cmd/server/openapi_json_gen.go | 3 +- cmd/server/openapi_test.go | 3 +- cmd/server/server.go | 15 ++-- cmd/server/setup.go | 29 +++--- .../30-administration/11-forges/100-addon.md | 12 +-- .../22-backends/50-custom-backends.md | 4 +- .../docs/92-development/01-getting-started.md | 2 +- go.mod | 2 +- pipeline/backend/backend.go | 2 +- pipeline/backend/docker/backend_options.go | 3 +- .../backend/docker/backend_options_test.go | 3 +- pipeline/backend/docker/convert.go | 5 +- pipeline/backend/docker/convert_test.go | 3 +- pipeline/backend/docker/convert_win.go | 2 +- pipeline/backend/docker/docker.go | 5 +- pipeline/backend/dummy/dummy.go | 3 +- pipeline/backend/dummy/dummy_test.go | 5 +- .../backend/kubernetes/backend_options.go | 3 +- .../kubernetes/backend_options_test.go | 3 +- pipeline/backend/kubernetes/kubernetes.go | 3 +- pipeline/backend/kubernetes/pod.go | 5 +- pipeline/backend/kubernetes/pod_test.go | 3 +- pipeline/backend/kubernetes/secrets.go | 5 +- pipeline/backend/kubernetes/secrets_test.go | 3 +- pipeline/backend/kubernetes/service.go | 3 +- pipeline/backend/kubernetes/service_test.go | 3 +- pipeline/backend/local/clone.go | 3 +- pipeline/backend/local/local.go | 3 +- pipeline/errors/error.go | 3 +- pipeline/errors/error_test.go | 5 +- .../metadata/drone_compatibility_test.go | 3 +- pipeline/frontend/yaml/compiler/compiler.go | 10 +-- .../frontend/yaml/compiler/compiler_test.go | 11 ++- pipeline/frontend/yaml/compiler/convert.go | 11 ++- .../frontend/yaml/compiler/convert_test.go | 3 +- pipeline/frontend/yaml/compiler/dag.go | 2 +- pipeline/frontend/yaml/compiler/dag_test.go | 3 +- pipeline/frontend/yaml/compiler/option.go | 2 +- .../frontend/yaml/compiler/option_test.go | 5 +- .../frontend/yaml/constraint/constraint.go | 5 +- .../yaml/constraint/constraint_test.go | 3 +- pipeline/frontend/yaml/linter/error.go | 4 +- pipeline/frontend/yaml/linter/linter.go | 13 ++- pipeline/frontend/yaml/linter/linter_test.go | 7 +- .../yaml/linter/schema/schema_test.go | 3 +- pipeline/frontend/yaml/matrix/matrix.go | 3 +- pipeline/frontend/yaml/parse.go | 3 +- pipeline/frontend/yaml/parse_test.go | 5 +- pipeline/frontend/yaml/types/container.go | 7 +- .../frontend/yaml/types/container_test.go | 5 +- pipeline/frontend/yaml/types/workflow.go | 2 +- pipeline/log/line_writer.go | 5 +- pipeline/log/line_writer_test.go | 7 +- pipeline/log/utils_test.go | 3 +- pipeline/logger.go | 2 +- pipeline/option.go | 2 +- pipeline/pipeline.go | 5 +- pipeline/rpc/mocks/peer.go | 2 +- pipeline/rpc/peer.go | 2 +- pipeline/rpc/proto/woodpecker.pb.go | 5 +- pipeline/rpc/proto/woodpecker_grpc.pb.go | 1 + server/api/agent.go | 9 +- server/api/agent_test.go | 15 ++-- server/api/badge.go | 13 ++- server/api/cron.go | 13 ++- server/api/forge.go | 7 +- server/api/global_registry.go | 7 +- server/api/global_secret.go | 7 +- server/api/helper.go | 13 ++- server/api/helper_test.go | 3 +- server/api/hook.go | 15 ++-- server/api/hook_test.go | 23 +++-- server/api/login.go | 17 ++-- server/api/login_test.go | 21 +++-- server/api/metrics/prometheus.go | 3 +- server/api/org.go | 9 +- server/api/org_registry.go | 7 +- server/api/org_secret.go | 7 +- server/api/pipeline.go | 15 ++-- server/api/pipeline_test.go | 15 ++-- server/api/registry.go | 7 +- server/api/repo.go | 15 ++-- server/api/repo_secret.go | 7 +- server/api/signature_public_key.go | 3 +- server/api/stream.go | 13 ++- server/api/user.go | 11 ++- server/api/users.go | 7 +- server/api/z.go | 5 +- server/badges/badges.go | 2 +- server/badges/badges_test.go | 3 +- server/cache/membership.go | 7 +- server/ccmenu/cc.go | 2 +- server/ccmenu/cc_test.go | 3 +- server/config.go | 16 ++-- server/cron/cron.go | 11 ++- server/cron/cron_test.go | 11 ++- server/forge/addon/args.go | 2 +- server/forge/addon/client.go | 7 +- server/forge/addon/plugin.go | 3 +- server/forge/addon/server.go | 5 +- server/forge/bitbucket/bitbucket.go | 15 ++-- server/forge/bitbucket/bitbucket_test.go | 9 +- server/forge/bitbucket/convert.go | 5 +- server/forge/bitbucket/convert_test.go | 5 +- server/forge/bitbucket/internal/client.go | 3 +- server/forge/bitbucket/parse.go | 6 +- server/forge/bitbucket/parse_test.go | 7 +- .../bitbucketdatacenter.go | 15 ++-- .../bitbucketdatacenter_test.go | 5 +- server/forge/bitbucketdatacenter/convert.go | 3 +- .../forge/bitbucketdatacenter/convert_test.go | 3 +- server/forge/common/status.go | 5 +- server/forge/common/status_test.go | 5 +- server/forge/common/utils.go | 5 +- server/forge/common/utils_test.go | 3 +- server/forge/forge.go | 4 +- server/forge/forgejo/forgejo.go | 15 ++-- server/forge/forgejo/forgejo_test.go | 9 +- server/forge/forgejo/helper.go | 5 +- server/forge/forgejo/helper_test.go | 5 +- server/forge/forgejo/parse.go | 5 +- server/forge/forgejo/parse_test.go | 7 +- server/forge/gitea/gitea.go | 15 ++-- server/forge/gitea/gitea_test.go | 9 +- server/forge/gitea/helper.go | 5 +- server/forge/gitea/helper_test.go | 5 +- server/forge/gitea/parse.go | 5 +- server/forge/gitea/parse_test.go | 7 +- server/forge/github/convert.go | 3 +- server/forge/github/convert_test.go | 3 +- server/forge/github/github.go | 15 ++-- server/forge/github/github_test.go | 5 +- server/forge/github/parse.go | 7 +- server/forge/github/parse_test.go | 7 +- server/forge/gitlab/convert.go | 7 +- server/forge/gitlab/gitlab.go | 17 ++-- server/forge/gitlab/gitlab_test.go | 7 +- server/forge/gitlab/status.go | 5 +- server/forge/mocks/forge.go | 7 +- server/forge/refresh.go | 5 +- server/forge/setup/setup.go | 19 ++-- server/grpc/auth_server.go | 9 +- server/grpc/filter.go | 6 +- server/grpc/filter_test.go | 5 +- server/grpc/rpc.go | 19 ++-- server/grpc/rpc_test.go | 7 +- server/grpc/server.go | 15 ++-- server/logging/log.go | 3 +- server/logging/log_test.go | 3 +- server/logging/logging.go | 2 +- server/model/pipeline.go | 2 +- server/pipeline/approve.go | 9 +- server/pipeline/cancel.go | 11 ++- server/pipeline/config.go | 8 +- server/pipeline/create.go | 13 ++- server/pipeline/decline.go | 7 +- server/pipeline/gated.go | 2 +- server/pipeline/gated_test.go | 3 +- server/pipeline/helper.go | 5 +- server/pipeline/items.go | 17 ++-- server/pipeline/items_test.go | 6 +- server/pipeline/pipeline_status.go | 6 +- server/pipeline/pipeline_status_test.go | 7 +- server/pipeline/queue.go | 8 +- server/pipeline/restart.go | 9 +- server/pipeline/start.go | 9 +- server/pipeline/step_status.go | 8 +- server/pipeline/step_status_test.go | 11 ++- server/pipeline/stepbuilder/metadata.go | 6 +- server/pipeline/stepbuilder/metadata_test.go | 7 +- server/pipeline/stepbuilder/stepBuilder.go | 25 +++--- .../pipeline/stepbuilder/stepBuilder_test.go | 11 ++- server/pipeline/topic.go | 7 +- server/pipeline/workflow_status.go | 6 +- server/queue/fifo.go | 5 +- server/queue/fifo_test.go | 3 +- server/queue/mocks/queue.go | 5 +- server/queue/persistent.go | 5 +- server/queue/queue.go | 4 +- server/router/api.go | 9 +- server/router/middleware/session/agent.go | 3 +- server/router/middleware/session/org.go | 7 +- .../router/middleware/session/pagination.go | 3 +- server/router/middleware/session/repo.go | 9 +- server/router/middleware/session/user.go | 9 +- server/router/middleware/store.go | 3 +- server/router/middleware/token/token.go | 9 +- server/router/middleware/version.go | 3 +- server/router/router.go | 17 ++-- server/services/config/combined.go | 6 +- server/services/config/combined_test.go | 9 +- server/services/config/forge.go | 9 +- server/services/config/forge_test.go | 9 +- server/services/config/http.go | 8 +- server/services/config/mocks/service.go | 8 +- server/services/config/service.go | 6 +- server/services/encryption/aes.go | 5 +- server/services/encryption/aes_builder.go | 5 +- server/services/encryption/aes_encryption.go | 3 +- server/services/encryption/encryption.go | 5 +- .../services/encryption/encryption_builder.go | 4 +- server/services/encryption/no_encryption.go | 2 +- server/services/encryption/tink.go | 5 +- server/services/encryption/tink_builder.go | 5 +- server/services/encryption/tink_keyset.go | 3 +- .../encryption/wrapper/store/secret_store.go | 2 +- .../wrapper/store/secret_store_wrapper.go | 5 +- server/services/environment/mocks/service.go | 2 +- server/services/environment/parse.go | 3 +- server/services/environment/service.go | 2 +- server/services/log/file/file.go | 7 +- server/services/log/service.go | 2 +- server/services/manager.go | 15 ++-- server/services/mocks/manager.go | 18 ++-- server/services/permissions/admins.go | 4 +- server/services/permissions/admins_test.go | 3 +- server/services/permissions/orgs.go | 4 +- server/services/permissions/orgs_test.go | 3 +- server/services/permissions/repo_owners.go | 4 +- .../services/permissions/repo_owners_test.go | 3 +- server/services/registry/combined.go | 4 +- server/services/registry/db.go | 4 +- server/services/registry/filesystem.go | 5 +- server/services/registry/mocks/service.go | 2 +- server/services/registry/service.go | 2 +- server/services/secret/db.go | 4 +- server/services/secret/db_test.go | 7 +- server/services/secret/mocks/service.go | 2 +- server/services/secret/service.go | 2 +- server/services/setup.go | 13 ++- server/store/datastore/agent.go | 2 +- server/store/datastore/agent_test.go | 3 +- server/store/datastore/config.go | 5 +- server/store/datastore/config_test.go | 3 +- server/store/datastore/cron.go | 3 +- server/store/datastore/cron_test.go | 3 +- server/store/datastore/engine.go | 5 +- server/store/datastore/errors.go | 2 +- server/store/datastore/feed.go | 3 +- server/store/datastore/feed_test.go | 3 +- server/store/datastore/forge.go | 2 +- server/store/datastore/forge_test.go | 3 +- server/store/datastore/helper.go | 5 +- server/store/datastore/helper_test.go | 3 +- server/store/datastore/log.go | 3 +- server/store/datastore/log_test.go | 3 +- .../migration/008_set_default_forge_id.go | 3 +- .../migration/011_cron_without_sec.go | 3 +- .../datastore/migration/015_add_org_agents.go | 3 +- .../datastore/migration/017_split_trusted.go | 3 +- server/store/datastore/migration/migration.go | 3 +- server/store/datastore/org.go | 3 +- server/store/datastore/org_test.go | 3 +- server/store/datastore/permission.go | 3 +- server/store/datastore/permission_test.go | 3 +- server/store/datastore/pipeline.go | 3 +- server/store/datastore/pipeline_test.go | 5 +- server/store/datastore/redirection.go | 3 +- server/store/datastore/redirection_test.go | 3 +- server/store/datastore/registry.go | 3 +- server/store/datastore/registry_test.go | 5 +- server/store/datastore/repo.go | 5 +- server/store/datastore/repo_test.go | 3 +- server/store/datastore/secret.go | 3 +- server/store/datastore/secret_test.go | 3 +- server/store/datastore/server_config.go | 2 +- server/store/datastore/server_config_test.go | 3 +- server/store/datastore/step.go | 3 +- server/store/datastore/step_test.go | 5 +- server/store/datastore/task.go | 2 +- server/store/datastore/task_test.go | 3 +- server/store/datastore/user.go | 5 +- server/store/datastore/user_test.go | 3 +- server/store/datastore/workflow.go | 3 +- server/store/datastore/workflow_test.go | 3 +- server/store/mocks/store.go | 2 +- server/store/store.go | 2 +- server/web/config.go | 9 +- server/web/web.go | 5 +- server/web/web_test.go | 3 +- shared/token/token_test.go | 3 +- woodpecker-go/README.md | 2 +- woodpecker-go/woodpecker/mocks/client.go | 2 +- 393 files changed, 1094 insertions(+), 1386 deletions(-) diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index edd95170b..cfb2afa2d 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -32,7 +32,7 @@ steps: - vendor image: *golang_image commands: - - go run go.woodpecker-ci.org/woodpecker/v3/cmd/cli lint + - go run github.com/crowci/crow/v3/cmd/cli lint environment: WOODPECKER_DISABLE_UPDATE_CHECK: true WOODPECKER_LINT_STRICT: true diff --git a/Justfile b/Justfile index ed775e6c0..dce62dc1e 100644 --- a/Justfile +++ b/Justfile @@ -24,6 +24,40 @@ XGO_VERSION := if HAS_GO == "GO" { "go-1.23.x" } else { "" } CGO_CFLAGS := if HAS_GO == "GO" { `go env CGO_CFLAGS` } else { "" } ### Recipes +## general + +fmt: + find . -name '*.go' -not -path './vendor/*' -exec gci write {} \; + +test: test-agent test-server test-server-datastore test-cli test-lib + +test-agent: + go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test {{ TAGS }}' github.com/crowci/crow/v3/cmd/agent github.com/crowci/crow/v3/agent/... + +test-server: + go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test {{ TAGS }}' github.com/crowci/crow/v3/cmd/server `go list github.com/crowci/crow/v3/server/... | grep -v '/store'` + +test-cli: + go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test {{ TAGS }}' github.com/crowci/crow/v3/cmd/cli github.com/crowci/crow/v3/cli/... + +test-server-datastore: + go test -timeout 300s -tags 'test {{ TAGS }}' -run TestMigrate github.com/crowci/crow/v3/server/store/... + go test -race -timeout 100s -tags 'test {{ TAGS }}' -skip TestMigrate github.com/crowci/crow/v3/server/store/... + +test-server-datastore-coverage: + go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test {{ TAGS }}' github.com/crowci/crow/v3/server/store/... + +[working-directory('web')] +test-ui: + pnpm install --frozen-lockfile + pnpm run lint + pnpm run format:check + pnpm run typecheck + pnpm run test + +test-lib: + go test -race -cover -coverprofile coverage.out -timeout 60s -tags 'test {{ TAGS }}' `go list ./... | grep -v '/cmd\|/agent\|/cli\|/server'` + ## docs docs-venv-fish: @@ -46,16 +80,19 @@ cherry-pick COMMIT: ## build +lint: + golangci-lint run + [working-directory('web')] build-ui: pnpm install --frozen-lockfile pnpm build build-agent: - CGO_ENABLED=0 GOOS={{ TARGETOS }} GOARCH={{ TARGETARCH }} go build -tags '{{ TAGS }}' -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/crow-agent{{ BIN_SUFFIX }} go.woodpecker-ci.org/woodpecker/v3/cmd/agent + CGO_ENABLED=0 GOOS={{ TARGETOS }} GOARCH={{ TARGETARCH }} go build -tags '{{ TAGS }}' -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/crow-agent{{ BIN_SUFFIX }} github.com/crowci/crow/v3/cmd/agent build-cli: - CGO_ENABLED=0 GOOS={{ TARGETOS }} GOARCH={{ TARGETARCH }} go build -tags '{{ TAGS }}' -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/crow-cli{{ BIN_SUFFIX }} go.woodpecker-ci.org/woodpecker/v3/cmd/cli + CGO_ENABLED=0 GOOS={{ TARGETOS }} GOARCH={{ TARGETARCH }} go build -tags '{{ TAGS }}' -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/crow-cli{{ BIN_SUFFIX }} github.com/crowci/crow/v3/cmd/cli # build-server @@ -102,7 +139,7 @@ release-server-xgo: check-xgo @echo "- os: ${TARGETOS}" @echo "- arch (xgo): ${TARGETARCH}" @echo "------------------" - CGO_CFLAGS="{{ CGO_CFLAGS }}" xgo -go {{ XGO_VERSION }} -dest {{ DIST_DIR }}/server/${TARGETOS}_${TARGETARCH} -tags 'netgo osusergo grpcnotrace {{ TAGS }}' -ldflags '-linkmode external {{ LDFLAGS }} -X go.woodpecker-ci.org/woodpecker/v3/version.Version={{ VERSION }}' -targets ${TARGETOS}/${TARGETARCH} -out crow-server -pkg cmd/server . + CGO_CFLAGS="{{ CGO_CFLAGS }}" xgo -go {{ XGO_VERSION }} -dest {{ DIST_DIR }}/server/${TARGETOS}_${TARGETARCH} -tags 'netgo osusergo grpcnotrace {{ TAGS }}' -ldflags '-linkmode external {{ LDFLAGS }} -X github.com/crowci/crow/v3/version.Version={{ VERSION }}' -targets ${TARGETOS}/${TARGETARCH} -out crow-server -pkg cmd/server . # move binary into subfolder depending on target os and arch if [ "${XGO_IN_XGO:-0}" -eq "1" ]; then \ echo "inside xgo image"; \ @@ -117,12 +154,12 @@ release-server-xgo: check-xgo ## agent release-agent: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/linux_amd64/crow-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/crow-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/crow-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/crow-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/crow-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/crow-agent go.woodpecker-ci.org/woodpecker/v3/cmd/agent + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/linux_amd64/crow-agent github.com/crowci/crow/v3/cmd/agent + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/linux_arm64/crow-agent github.com/crowci/crow/v3/cmd/agent + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/linux_arm/crow-agent github.com/crowci/crow/v3/cmd/agent + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/windows_amd64/crow-agent.exe github.com/crowci/crow/v3/cmd/agent + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/darwin_amd64/crow-agent github.com/crowci/crow/v3/cmd/agent + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -tags 'grpcnotrace {{ TAGS }}' -o {{ DIST_DIR }}/agent/darwin_arm64/crow-agent github.com/crowci/crow/v3/cmd/agent # tar binary files tar -cvzf {{ DIST_DIR }}/crow-agent_linux_amd64.tar.gz -C {{ DIST_DIR }}/agent/linux_amd64 crow-agent tar -cvzf {{ DIST_DIR }}/crow-agent_linux_arm64.tar.gz -C {{ DIST_DIR }}/agent/linux_arm64 crow-agent @@ -136,12 +173,12 @@ release-agent: ## cli release-cli: - GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/linux_amd64/crow-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/crow-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/crow-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/crow-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/crow-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/crow-cli go.woodpecker-ci.org/woodpecker/v3/cmd/cli + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/linux_amd64/crow-cli github.com/crowci/crow/v3/cmd/cli + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/linux_arm64/crow-cli github.com/crowci/crow/v3/cmd/cli + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/linux_arm/crow-cli github.com/crowci/crow/v3/cmd/cli + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/windows_amd64/crow-cli.exe github.com/crowci/crow/v3/cmd/cli + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/darwin_amd64/crow-cli github.com/crowci/crow/v3/cmd/cli + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '{{ LDFLAGS }}' -o {{ DIST_DIR }}/cli/darwin_arm64/crow-cli github.com/crowci/crow/v3/cmd/cli # tar binary files tar -cvzf {{ DIST_DIR }}/crow-cli_linux_amd64.tar.gz -C {{ DIST_DIR }}/cli/linux_amd64 crow-cli tar -cvzf {{ DIST_DIR }}/crow-cli_linux_arm64.tar.gz -C {{ DIST_DIR }}/cli/linux_arm64 crow-cli @@ -154,19 +191,19 @@ release-cli: # Build tar archive build-tarball: - mkdir -p {{DIST_DIR}} && tar chzvf {{DIST_DIR}}/crow-src.tar.gz \ - --exclude="*.exe" \ - --exclude="./.pnpm-store" \ - --exclude="node_modules" \ - --exclude="./dist" \ - --exclude="./data" \ - --exclude="./build" \ - --exclude="./.git" \ - . + mkdir -p {{ DIST_DIR }} && tar chzvf {{ DIST_DIR }}/crow-src.tar.gz \ + --exclude="*.exe" \ + --exclude="./.pnpm-store" \ + --exclude="node_modules" \ + --exclude="./dist" \ + --exclude="./data" \ + --exclude="./build" \ + --exclude="./.git" \ + . -## Create checksums for all release files +# # Create checksums for all release files release-checksums: - (cd {{DIST_DIR}}/; sha256sum *.* > checksums.txt) + (cd {{ DIST_DIR }}/; sha256sum *.* > checksums.txt) ## images # platforms must be handed over via this syntax for the underlying cross-compile-server step which applies some string splitting on a list of items diff --git a/Makefile b/Makefile index ddbd0805e..9a3b522da 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ else endif TAGS ?= -LDFLAGS := -X go.woodpecker-ci.org/woodpecker/v3/version.Version=${VERSION} +LDFLAGS := -X github.com/crowci/crow/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/v3/cmd/agent go.woodpecker-ci.org/woodpecker/v3/agent/... + go test -race -cover -coverprofile agent-coverage.out -timeout 60s -tags 'test $(TAGS)' github.com/crowci/crow/v3/cmd/agent github.com/crowci/crow/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/v3/cmd/server $(shell go list go.woodpecker-ci.org/woodpecker/v3/server/... | grep -v '/store') + go test -race -cover -coverprofile server-coverage.out -timeout 60s -tags 'test $(TAGS)' github.com/crowci/crow/v3/cmd/server $(shell go list github.com/crowci/crow/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/v3/cmd/cli go.woodpecker-ci.org/woodpecker/v3/cli/... + go test -race -cover -coverprofile cli-coverage.out -timeout 60s -tags 'test $(TAGS)' github.com/crowci/crow/v3/cmd/cli github.com/crowci/crow/v3/cli/... test-server-datastore: ## Test server datastore - 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/... + go test -timeout 300s -tags 'test $(TAGS)' -run TestMigrate github.com/crowci/crow/v3/server/store/... + go test -race -timeout 100s -tags 'test $(TAGS)' -skip TestMigrate github.com/crowci/crow/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/v3/server/store/... + go test -race -cover -coverprofile datastore-coverage.out -timeout 300s -tags 'test $(TAGS)' github.com/crowci/crow/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/v3/cmd/server + CGO_ENABLED=${CGO_ENABLED} GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-server${BIN_SUFFIX} github.com/crowci/crow/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/v3/cmd/agent + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-agent${BIN_SUFFIX} github.com/crowci/crow/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/v3/cmd/cli + CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -tags '$(TAGS)' -ldflags '${LDFLAGS}' -o ${DIST_DIR}/woodpecker-cli${BIN_SUFFIX} github.com/crowci/crow/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/v3/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) github.com/crowci/crow/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/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 + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -tags 'grpcnotrace $(TAGS)' -o ${DIST_DIR}/agent/linux_amd64/woodpecker-agent github.com/crowci/crow/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 github.com/crowci/crow/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 github.com/crowci/crow/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 github.com/crowci/crow/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 github.com/crowci/crow/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 github.com/crowci/crow/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/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 + GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_amd64/woodpecker-cli github.com/crowci/crow/v3/cmd/cli + GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm64/woodpecker-cli github.com/crowci/crow/v3/cmd/cli + GOOS=linux GOARCH=arm CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/linux_arm/woodpecker-cli github.com/crowci/crow/v3/cmd/cli + GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/windows_amd64/woodpecker-cli.exe github.com/crowci/crow/v3/cmd/cli + GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_amd64/woodpecker-cli github.com/crowci/crow/v3/cmd/cli + GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -ldflags '${LDFLAGS}' -o ${DIST_DIR}/cli/darwin_arm64/woodpecker-cli github.com/crowci/crow/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/agent/logger.go b/agent/logger.go index 47413df90..a80cd8e02 100644 --- a/agent/logger.go +++ b/agent/logger.go @@ -18,12 +18,11 @@ import ( "io" "sync" + "github.com/crowci/crow/v3/pipeline" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/log" + "github.com/crowci/crow/v3/pipeline/rpc" "github.com/rs/zerolog" - - "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 7abc7835d..ab6ce654f 100644 --- a/agent/rpc/auth_client_grpc.go +++ b/agent/rpc/auth_client_grpc.go @@ -18,9 +18,8 @@ import ( "context" "time" + "github.com/crowci/crow/v3/pipeline/rpc/proto" "google.golang.org/grpc" - - "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 29c552e2a..fe945bee7 100644 --- a/agent/rpc/client_grpc.go +++ b/agent/rpc/client_grpc.go @@ -21,15 +21,14 @@ import ( "time" "github.com/cenkalti/backoff/v5" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/pipeline/rpc/proto" "github.com/rs/zerolog/log" "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" grpcproto "google.golang.org/protobuf/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 f5640982e..8d7bf7f21 100644 --- a/agent/runner.go +++ b/agent/runner.go @@ -22,14 +22,13 @@ import ( "sync" "time" + "github.com/crowci/crow/v3/pipeline" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/shared/constant" + "github.com/crowci/crow/v3/shared/utils" "github.com/rs/zerolog/log" "google.golang.org/grpc/metadata" - - "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 a3af590d3..652beb221 100644 --- a/agent/tracer.go +++ b/agent/tracer.go @@ -21,10 +21,9 @@ import ( "sync" "time" + "github.com/crowci/crow/v3/pipeline" + "github.com/crowci/crow/v3/pipeline/rpc" "github.com/rs/zerolog" - - "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 110c210d4..4cb27395a 100644 --- a/cli/admin/admin.go +++ b/cli/admin/admin.go @@ -15,12 +15,11 @@ package admin import ( + "github.com/crowci/crow/v3/cli/admin/loglevel" + "github.com/crowci/crow/v3/cli/admin/registry" + "github.com/crowci/crow/v3/cli/admin/secret" + "github.com/crowci/crow/v3/cli/admin/user" "github.com/urfave/cli/v3" - - "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 aac46af36..6cfce1801 100644 --- a/cli/admin/loglevel/loglevel.go +++ b/cli/admin/loglevel/loglevel.go @@ -17,12 +17,11 @@ package loglevel import ( "context" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 756bcc9dd..bc53ee420 100644 --- a/cli/admin/registry/registry_add.go +++ b/cli/admin/registry/registry_add.go @@ -19,10 +19,9 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 cef4af5b4..49a105e28 100644 --- a/cli/admin/registry/registry_list.go +++ b/cli/admin/registry/registry_list.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 296135694..1d78608b3 100644 --- a/cli/admin/registry/registry_rm.go +++ b/cli/admin/registry/registry_rm.go @@ -17,9 +17,8 @@ package registry import ( "context" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 dca865e93..91cadc784 100644 --- a/cli/admin/registry/registry_set.go +++ b/cli/admin/registry/registry_set.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 bf6561ed7..943e424e8 100644 --- a/cli/admin/registry/registry_show.go +++ b/cli/admin/registry/registry_show.go @@ -19,10 +19,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 ad65c00db..c69ef9a7b 100644 --- a/cli/admin/secret/secret_add.go +++ b/cli/admin/secret/secret_add.go @@ -19,10 +19,9 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 ee00567fc..fbee9697f 100644 --- a/cli/admin/secret/secret_list.go +++ b/cli/admin/secret/secret_list.go @@ -20,11 +20,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 596672d3a..bf5437416 100644 --- a/cli/admin/secret/secret_rm.go +++ b/cli/admin/secret/secret_rm.go @@ -17,9 +17,8 @@ package secret import ( "context" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 7e86d66e2..f0586e246 100644 --- a/cli/admin/secret/secret_set.go +++ b/cli/admin/secret/secret_set.go @@ -19,10 +19,9 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 b5b9855b9..a63321050 100644 --- a/cli/admin/secret/secret_show.go +++ b/cli/admin/secret/secret_show.go @@ -20,10 +20,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 aecf11e9d..1d3da40fb 100644 --- a/cli/admin/user/user_add.go +++ b/cli/admin/user/user_add.go @@ -18,10 +18,9 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 baa436861..95d1b685b 100644 --- a/cli/admin/user/user_list.go +++ b/cli/admin/user/user_list.go @@ -19,11 +19,10 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 f6f4a7cdc..9ce5483c8 100644 --- a/cli/admin/user/user_rm.go +++ b/cli/admin/user/user_rm.go @@ -18,9 +18,8 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 9f45d5a13..25ccd97fa 100644 --- a/cli/admin/user/user_show.go +++ b/cli/admin/user/user_show.go @@ -20,10 +20,9 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 5cada2671..e8fb58222 100644 --- a/cli/common/flags.go +++ b/cli/common/flags.go @@ -15,9 +15,8 @@ package common import ( + "github.com/crowci/crow/v3/shared/logger" "github.com/urfave/cli/v3" - - "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 fb7a4b4c7..41f67d7a4 100644 --- a/cli/common/hooks.go +++ b/cli/common/hooks.go @@ -5,11 +5,10 @@ import ( "errors" "time" + "github.com/crowci/crow/v3/cli/internal/config" + "github.com/crowci/crow/v3/cli/update" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 ba560ba1e..dee665847 100644 --- a/cli/common/pipeline.go +++ b/cli/common/pipeline.go @@ -20,9 +20,8 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/shared/constant" "github.com/urfave/cli/v3" - - "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 e27682023..cc6e88c2f 100644 --- a/cli/common/zerologger.go +++ b/cli/common/zerologger.go @@ -17,9 +17,8 @@ package common import ( "context" + "github.com/crowci/crow/v3/shared/logger" "github.com/urfave/cli/v3" - - "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 757bd9519..8da81b696 100644 --- a/cli/exec/dummy.go +++ b/cli/exec/dummy.go @@ -17,7 +17,7 @@ package exec -import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" +import "github.com/crowci/crow/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 43bd57388..f54632ddb 100644 --- a/cli/exec/exec.go +++ b/cli/exec/exec.go @@ -24,27 +24,26 @@ import ( "runtime" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/lint" + "github.com/crowci/crow/v3/pipeline" + "github.com/crowci/crow/v3/pipeline/backend" + "github.com/crowci/crow/v3/pipeline/backend/docker" + "github.com/crowci/crow/v3/pipeline/backend/kubernetes" + "github.com/crowci/crow/v3/pipeline/backend/local" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/pipeline/frontend/yaml" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/compiler" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/matrix" + pipelineLog "github.com/crowci/crow/v3/pipeline/log" + "github.com/crowci/crow/v3/shared/constant" + "github.com/crowci/crow/v3/shared/utils" "github.com/drone/envsubst" "github.com/oklog/ulid/v2" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 8664ec2c4..a5b9eda10 100644 --- a/cli/exec/metadata.go +++ b/cli/exec/metadata.go @@ -22,11 +22,10 @@ import ( "runtime" "strings" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/matrix" + "github.com/crowci/crow/v3/version" "github.com/urfave/cli/v3" - - "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 231dc9cb2..2336c0c61 100644 --- a/cli/exec/metadata_test.go +++ b/cli/exec/metadata_test.go @@ -20,12 +20,11 @@ import ( "os" "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/matrix" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/urfave/cli/v3" - - "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 06f81e1c4..cc4ba6db1 100644 --- a/cli/info/info.go +++ b/cli/info/info.go @@ -19,10 +19,9 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 e1367dfd5..2d08bf6c7 100644 --- a/cli/internal/util.go +++ b/cli/internal/util.go @@ -24,13 +24,12 @@ import ( "strconv" "strings" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" vsc_url "github.com/gitsight/go-vcsurl" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "golang.org/x/net/proxy" "golang.org/x/oauth2" - - "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 832a508bd..f490e8c60 100644 --- a/cli/lint/lint.go +++ b/cli/lint/lint.go @@ -22,12 +22,11 @@ import ( "path/filepath" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/pipeline/frontend/yaml" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter" + "github.com/crowci/crow/v3/shared/constant" "github.com/urfave/cli/v3" - - "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 bfa29c6c0..91cc43cf5 100644 --- a/cli/lint/utils.go +++ b/cli/lint/utils.go @@ -5,9 +5,8 @@ import ( "fmt" "os" + pipeline_errors "github.com/crowci/crow/v3/pipeline/errors" term_env "github.com/muesli/termenv" - - 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 1c03978df..15fb05257 100644 --- a/cli/org/org.go +++ b/cli/org/org.go @@ -15,10 +15,9 @@ package org import ( + "github.com/crowci/crow/v3/cli/org/registry" + "github.com/crowci/crow/v3/cli/org/secret" "github.com/urfave/cli/v3" - - "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 4788deb91..81847b773 100644 --- a/cli/org/registry/registry.go +++ b/cli/org/registry/registry.go @@ -17,9 +17,8 @@ package registry import ( "strconv" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 c15990b42..a3b277471 100644 --- a/cli/org/registry/registry_add.go +++ b/cli/org/registry/registry_add.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 ca036a806..79b8c1942 100644 --- a/cli/org/registry/registry_list.go +++ b/cli/org/registry/registry_list.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 151cf1b9d..d69995624 100644 --- a/cli/org/registry/registry_rm.go +++ b/cli/org/registry/registry_rm.go @@ -17,10 +17,9 @@ package registry import ( "context" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 08d8f829f..2ee8b6224 100644 --- a/cli/org/registry/registry_set.go +++ b/cli/org/registry/registry_set.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 ede2994e5..b9452e0cf 100644 --- a/cli/org/registry/registry_show.go +++ b/cli/org/registry/registry_show.go @@ -19,10 +19,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 af53be6ed..77da52031 100644 --- a/cli/org/secret/secret.go +++ b/cli/org/secret/secret.go @@ -17,9 +17,8 @@ package secret import ( "strconv" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 a0a83ef80..8b4cd4407 100644 --- a/cli/org/secret/secret_add.go +++ b/cli/org/secret/secret_add.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 bba6079e9..cd17553fd 100644 --- a/cli/org/secret/secret_list.go +++ b/cli/org/secret/secret_list.go @@ -20,11 +20,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 37b2fe8fa..5ef078bfb 100644 --- a/cli/org/secret/secret_rm.go +++ b/cli/org/secret/secret_rm.go @@ -17,10 +17,9 @@ package secret import ( "context" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 cb784c316..9d1e3bd6f 100644 --- a/cli/org/secret/secret_set.go +++ b/cli/org/secret/secret_set.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 86790c42b..ffd71231f 100644 --- a/cli/org/secret/secret_show.go +++ b/cli/org/secret/secret_show.go @@ -20,10 +20,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 299d7c10d..77cf268d4 100644 --- a/cli/pipeline/approve.go +++ b/cli/pipeline/approve.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 b317d4b3c..609708652 100644 --- a/cli/pipeline/create.go +++ b/cli/pipeline/create.go @@ -18,11 +18,10 @@ import ( "context" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 330515314..47c62e197 100644 --- a/cli/pipeline/decline.go +++ b/cli/pipeline/decline.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 110c675c5..989274edf 100644 --- a/cli/pipeline/deploy/deploy.go +++ b/cli/pipeline/deploy/deploy.go @@ -21,11 +21,10 @@ import ( "os" "strconv" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 ac72899b7..2a2b79c64 100644 --- a/cli/pipeline/kill.go +++ b/cli/pipeline/kill.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 3b3b4e315..0da9a94a4 100644 --- a/cli/pipeline/last.go +++ b/cli/pipeline/last.go @@ -17,11 +17,10 @@ package pipeline import ( "context" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 312456a7a..f7e318e48 100644 --- a/cli/pipeline/list.go +++ b/cli/pipeline/list.go @@ -18,12 +18,11 @@ import ( "context" "time" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + shared_utils "github.com/crowci/crow/v3/shared/utils" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 969e06794..ac029e7b4 100644 --- a/cli/pipeline/list_test.go +++ b/cli/pipeline/list_test.go @@ -6,12 +6,11 @@ import ( "io" "testing" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - - "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 80cd0d55f..18cbdfb84 100644 --- a/cli/pipeline/log/log_purge.go +++ b/cli/pipeline/log/log_purge.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 86931e31e..f3c4e9b73 100644 --- a/cli/pipeline/log/log_show.go +++ b/cli/pipeline/log/log_show.go @@ -21,10 +21,9 @@ import ( "strconv" "text/template" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 efcae8553..3c7676198 100644 --- a/cli/pipeline/pipeline.go +++ b/cli/pipeline/pipeline.go @@ -20,12 +20,11 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/output" + "github.com/crowci/crow/v3/cli/pipeline/deploy" + "github.com/crowci/crow/v3/cli/pipeline/log" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 5238a19fe..a3d0cfb11 100644 --- a/cli/pipeline/pipeline_test.go +++ b/cli/pipeline/pipeline_test.go @@ -6,11 +6,10 @@ import ( "io" "testing" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/stretchr/testify/assert" "github.com/urfave/cli/v3" - - "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 f2836d7c3..b9a98edd2 100644 --- a/cli/pipeline/ps.go +++ b/cli/pipeline/ps.go @@ -21,11 +21,10 @@ import ( "strconv" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 0e22537f3..3590fbd5e 100644 --- a/cli/pipeline/purge.go +++ b/cli/pipeline/purge.go @@ -21,12 +21,11 @@ import ( "net/http" "time" + "github.com/crowci/crow/v3/cli/internal" + shared_utils "github.com/crowci/crow/v3/shared/utils" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 b6e285492..c20dd5add 100644 --- a/cli/pipeline/purge_test.go +++ b/cli/pipeline/purge_test.go @@ -6,12 +6,11 @@ import ( "io" "testing" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/urfave/cli/v3" - - "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 239179456..7b7cdd944 100644 --- a/cli/pipeline/queue.go +++ b/cli/pipeline/queue.go @@ -20,10 +20,9 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 2b9a25d4a..e15d25872 100644 --- a/cli/pipeline/show.go +++ b/cli/pipeline/show.go @@ -18,11 +18,10 @@ import ( "context" "strconv" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 694295fae..edb081fbf 100644 --- a/cli/pipeline/start.go +++ b/cli/pipeline/start.go @@ -20,10 +20,9 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 af2fa7b4d..3167728d1 100644 --- a/cli/pipeline/stop.go +++ b/cli/pipeline/stop.go @@ -19,9 +19,8 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 df86ef483..488b3dcf3 100644 --- a/cli/repo/cron/cron_add.go +++ b/cli/repo/cron/cron_add.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 45b1d4fb4..8b9bca2d6 100644 --- a/cli/repo/cron/cron_list.go +++ b/cli/repo/cron/cron_list.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 89a6fcb7b..90bcf516f 100644 --- a/cli/repo/cron/cron_rm.go +++ b/cli/repo/cron/cron_rm.go @@ -18,10 +18,9 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 c2bc9c36b..b2effc595 100644 --- a/cli/repo/cron/cron_show.go +++ b/cli/repo/cron/cron_show.go @@ -19,10 +19,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 987505b84..a504f844b 100644 --- a/cli/repo/cron/cron_update.go +++ b/cli/repo/cron/cron_update.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 475d7564f..92cb336f6 100644 --- a/cli/repo/registry/registry.go +++ b/cli/repo/registry/registry.go @@ -15,10 +15,9 @@ package registry import ( + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 87202244b..abf770ace 100644 --- a/cli/repo/registry/registry_add.go +++ b/cli/repo/registry/registry_add.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 8d41457b3..5baeca937 100644 --- a/cli/repo/registry/registry_list.go +++ b/cli/repo/registry/registry_list.go @@ -19,11 +19,10 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 94613e8d0..280120f1f 100644 --- a/cli/repo/registry/registry_rm.go +++ b/cli/repo/registry/registry_rm.go @@ -17,10 +17,9 @@ package registry import ( "context" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 131269f9c..40be66fcd 100644 --- a/cli/repo/registry/registry_set.go +++ b/cli/repo/registry/registry_set.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 b3b7869a5..869aba5f3 100644 --- a/cli/repo/registry/registry_show.go +++ b/cli/repo/registry/registry_show.go @@ -19,10 +19,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 f64f6a280..665970500 100644 --- a/cli/repo/repo.go +++ b/cli/repo/repo.go @@ -15,11 +15,10 @@ package repo import ( + "github.com/crowci/crow/v3/cli/repo/cron" + "github.com/crowci/crow/v3/cli/repo/registry" + "github.com/crowci/crow/v3/cli/repo/secret" "github.com/urfave/cli/v3" - - "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 c9cd60a73..841e930af 100644 --- a/cli/repo/repo_add.go +++ b/cli/repo/repo_add.go @@ -19,10 +19,9 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 f294ab277..27ebe24b9 100644 --- a/cli/repo/repo_chown.go +++ b/cli/repo/repo_chown.go @@ -18,9 +18,8 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 92e5b73d5..c35a288a0 100644 --- a/cli/repo/repo_list.go +++ b/cli/repo/repo_list.go @@ -19,11 +19,10 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 850d97357..dd994e618 100644 --- a/cli/repo/repo_repair.go +++ b/cli/repo/repo_repair.go @@ -18,9 +18,8 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 0b56c70e7..c9f0a2032 100644 --- a/cli/repo/repo_rm.go +++ b/cli/repo/repo_rm.go @@ -18,9 +18,8 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 c9c9ce87c..c9fa8b712 100644 --- a/cli/repo/repo_show.go +++ b/cli/repo/repo_show.go @@ -19,10 +19,9 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 d7802c92e..3688eef07 100644 --- a/cli/repo/repo_sync.go +++ b/cli/repo/repo_sync.go @@ -19,11 +19,10 @@ import ( "os" "text/template" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 dd28e3d28..f5957b9a4 100644 --- a/cli/repo/repo_update.go +++ b/cli/repo/repo_update.go @@ -19,10 +19,9 @@ import ( "fmt" "time" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 4bdbf674b..d04b954a8 100644 --- a/cli/repo/secret/secret.go +++ b/cli/repo/secret/secret.go @@ -15,10 +15,9 @@ package secret import ( + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 fb6e21383..1b98460f5 100644 --- a/cli/repo/secret/secret_add.go +++ b/cli/repo/secret/secret_add.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 b6bf0145f..e6b5f2e8c 100644 --- a/cli/repo/secret/secret_list.go +++ b/cli/repo/secret/secret_list.go @@ -20,11 +20,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 b2fb8c07b..4ab896108 100644 --- a/cli/repo/secret/secret_rm.go +++ b/cli/repo/secret/secret_rm.go @@ -17,10 +17,9 @@ package secret import ( "context" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 b28473527..48470a3ce 100644 --- a/cli/repo/secret/secret_set.go +++ b/cli/repo/secret/secret_set.go @@ -19,11 +19,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" + "github.com/crowci/crow/v3/woodpecker-go/woodpecker" "github.com/urfave/cli/v3" - - "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 15515fdb8..d1f010e24 100644 --- a/cli/repo/secret/secret_show.go +++ b/cli/repo/secret/secret_show.go @@ -20,10 +20,9 @@ import ( "html/template" "os" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/internal" "github.com/urfave/cli/v3" - - "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 8b00467cf..945f6ed48 100644 --- a/cli/setup/setup.go +++ b/cli/setup/setup.go @@ -5,11 +5,10 @@ import ( "errors" "strings" + "github.com/crowci/crow/v3/cli/internal/config" + "github.com/crowci/crow/v3/cli/setup/ui" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 2810989ee..848bea7e2 100644 --- a/cli/update/updater.go +++ b/cli/update/updater.go @@ -12,9 +12,8 @@ import ( "runtime" "strings" + "github.com/crowci/crow/v3/version" "github.com/rs/zerolog/log" - - "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 9de9001af..39347dec8 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/v3/version" + "github.com/crowci/crow/v3/version" ) func TestCheckForUpdate(t *testing.T) { diff --git a/cmd/agent/core/agent.go b/cmd/agent/core/agent.go index a9f858300..3ded03abb 100644 --- a/cmd/agent/core/agent.go +++ b/cmd/agent/core/agent.go @@ -27,6 +27,14 @@ import ( "sync/atomic" "time" + "github.com/crowci/crow/v3/agent" + agent_rpc "github.com/crowci/crow/v3/agent/rpc" + "github.com/crowci/crow/v3/pipeline/backend" + "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/shared/logger" + "github.com/crowci/crow/v3/shared/utils" + "github.com/crowci/crow/v3/version" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" @@ -37,15 +45,6 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/metadata" "google.golang.org/grpc/status" - - "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 7997c570f..0fb49ca31 100644 --- a/cmd/agent/core/health.go +++ b/cmd/agent/core/health.go @@ -21,11 +21,10 @@ import ( "net/http" "strings" + "github.com/crowci/crow/v3/agent" + "github.com/crowci/crow/v3/version" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 30bea8cc9..03d8b6b5a 100644 --- a/cmd/agent/core/health_test.go +++ b/cmd/agent/core/health_test.go @@ -18,9 +18,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/agent" "github.com/stretchr/testify/assert" - - "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 f3175c5b4..a6c614ddc 100644 --- a/cmd/agent/core/run.go +++ b/cmd/agent/core/run.go @@ -18,15 +18,14 @@ import ( "context" "os" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/shared/logger" + "github.com/crowci/crow/v3/shared/utils" + "github.com/crowci/crow/v3/version" // Load config from .env file. _ "github.com/joho/godotenv/autoload" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - 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 f2da7c105..15384f4fa 100644 --- a/cmd/agent/dummy.go +++ b/cmd/agent/dummy.go @@ -17,7 +17,7 @@ package main -import "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/dummy" +import "github.com/crowci/crow/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 8b1854aec..1ccbfc18a 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -17,14 +17,13 @@ package main import ( "context" + "github.com/crowci/crow/v3/cmd/agent/core" + "github.com/crowci/crow/v3/pipeline/backend/docker" + "github.com/crowci/crow/v3/pipeline/backend/kubernetes" + "github.com/crowci/crow/v3/pipeline/backend/local" + backendTypes "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/shared/utils" "github.com/rs/zerolog/log" - - "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 301ec61f4..7987cfe13 100644 --- a/cmd/cli/app.go +++ b/cmd/cli/app.go @@ -15,19 +15,18 @@ package main import ( + "github.com/crowci/crow/v3/cli/admin" + "github.com/crowci/crow/v3/cli/common" + "github.com/crowci/crow/v3/cli/exec" + "github.com/crowci/crow/v3/cli/info" + "github.com/crowci/crow/v3/cli/lint" + "github.com/crowci/crow/v3/cli/org" + "github.com/crowci/crow/v3/cli/pipeline" + "github.com/crowci/crow/v3/cli/repo" + "github.com/crowci/crow/v3/cli/setup" + "github.com/crowci/crow/v3/cli/update" + "github.com/crowci/crow/v3/version" "github.com/urfave/cli/v3" - - "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 d6670dadc..718bcdae9 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -18,10 +18,9 @@ import ( "context" "os" + "github.com/crowci/crow/v3/shared/utils" _ "github.com/joho/godotenv/autoload" "github.com/rs/zerolog/log" - - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" ) func main() { diff --git a/cmd/server/flags.go b/cmd/server/flags.go index 7e63e7f51..2eb64f269 100644 --- a/cmd/server/flags.go +++ b/cmd/server/flags.go @@ -19,10 +19,9 @@ import ( "os" "time" + "github.com/crowci/crow/v3/shared/constant" + "github.com/crowci/crow/v3/shared/logger" "github.com/urfave/cli/v3" - - "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 7e7cf2a1a..e46d562bf 100644 --- a/cmd/server/grpc_server.go +++ b/cmd/server/grpc_server.go @@ -19,15 +19,14 @@ import ( "fmt" "net" + "github.com/crowci/crow/v3/pipeline/rpc/proto" + "github.com/crowci/crow/v3/server" + woodpeckerGrpcServer "github.com/crowci/crow/v3/server/grpc" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - - "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 5ac49ff27..587488718 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -21,13 +21,12 @@ import ( "context" "os" + _ "github.com/crowci/crow/v3/cmd/server/openapi" + "github.com/crowci/crow/v3/shared/utils" + "github.com/crowci/crow/v3/version" _ "github.com/joho/godotenv/autoload" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - _ "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 078099b3b..9ff3949d2 100644 --- a/cmd/server/metrics_server.go +++ b/cmd/server/metrics_server.go @@ -19,12 +19,11 @@ import ( "errors" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/store" "github.com/prometheus/client_golang/prometheus" prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - - "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 1d37fc1f1..d3c09ae54 100644 --- a/cmd/server/openapi.go +++ b/cmd/server/openapi.go @@ -15,8 +15,8 @@ package main import ( - "go.woodpecker-ci.org/woodpecker/v3/cmd/server/openapi" - "go.woodpecker-ci.org/woodpecker/v3/version" + "github.com/crowci/crow/v3/cmd/server/openapi" + "github.com/crowci/crow/v3/version" ) // Generate docs/openapi.json via: diff --git a/cmd/server/openapi_json_gen.go b/cmd/server/openapi_json_gen.go index 73474b8e3..3fe373e8d 100644 --- a/cmd/server/openapi_json_gen.go +++ b/cmd/server/openapi_json_gen.go @@ -28,10 +28,9 @@ import ( "os" "path" + "github.com/crowci/crow/v3/cmd/server/openapi" "github.com/getkin/kin-openapi/openapi2" "github.com/getkin/kin-openapi/openapi2conv" - - "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 448aa1fad..11f8a125e 100644 --- a/cmd/server/openapi_test.go +++ b/cmd/server/openapi_test.go @@ -3,9 +3,8 @@ package main import ( "testing" + "github.com/crowci/crow/v3/cmd/server/openapi" "github.com/stretchr/testify/assert" - - "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 b6ab3c3b7..1a72332d3 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -25,20 +25,19 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/cron" + "github.com/crowci/crow/v3/server/router" + "github.com/crowci/crow/v3/server/router/middleware" + "github.com/crowci/crow/v3/server/web" + "github.com/crowci/crow/v3/shared/logger" + "github.com/crowci/crow/v3/version" "github.com/gin-gonic/gin" prometheus_http "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "golang.org/x/sync/errgroup" - - "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 b36c83dbd..0c19921eb 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -25,24 +25,23 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/cache" + "github.com/crowci/crow/v3/server/forge/setup" + "github.com/crowci/crow/v3/server/logging" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pubsub" + "github.com/crowci/crow/v3/server/queue" + "github.com/crowci/crow/v3/server/services" + logService "github.com/crowci/crow/v3/server/services/log" + "github.com/crowci/crow/v3/server/services/log/file" + "github.com/crowci/crow/v3/server/services/permissions" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/datastore" + "github.com/crowci/crow/v3/server/store/types" "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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_old/docs/30-administration/11-forges/100-addon.md b/docs_old/docs/30-administration/11-forges/100-addon.md index b1bd6ca9f..7fff86168 100644 --- a/docs_old/docs/30-administration/11-forges/100-addon.md +++ b/docs_old/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/v3`) and use the interfaces and types defined there. +Directly import Woodpecker's Go packages (`github.com/crowci/crow/v3`) and use the interfaces and types defined there. -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. +In the `main` function, just call `"github.com/crowci/crow/v3/server/forge/addon".Serve` with a `"github.com/crowci/crow/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/v3/server/forge/addon" - forgeTypes "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/forge/addon" + forgeTypes "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" ) func main() { @@ -64,5 +64,5 @@ func main() { type config struct { } -// `config` must implement `"go.woodpecker-ci.org/woodpecker/v3/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. +// `config` must implement `"github.com/crowci/crow/v3/server/forge".Forge`. You must directly use Woodpecker's packages - see imports above. ``` diff --git a/docs_old/docs/30-administration/22-backends/50-custom-backends.md b/docs_old/docs/30-administration/22-backends/50-custom-backends.md index c95956559..79bd201da 100644 --- a/docs_old/docs/30-administration/22-backends/50-custom-backends.md +++ b/docs_old/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/v3/cmd/agent/core" - backendTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/cmd/agent/core" + backendTypes "github.com/crowci/crow/v3/pipeline/backend/types" ) func main() { diff --git a/docs_old/docs/92-development/01-getting-started.md b/docs_old/docs/92-development/01-getting-started.md index 4e1322955..cba928b30 100644 --- a/docs_old/docs/92-development/01-getting-started.md +++ b/docs_old/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/v3/ +go test -race -timeout 30s github.com/crowci/crow/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 5ebae2d48..e7e111da9 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.woodpecker-ci.org/woodpecker/v3 +module github.com/crowci/crow/v3 go 1.23.4 diff --git a/pipeline/backend/backend.go b/pipeline/backend/backend.go index 960808d9c..4bbd0a6cf 100644 --- a/pipeline/backend/backend.go +++ b/pipeline/backend/backend.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + "github.com/crowci/crow/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 b7b2a10e1..8648bc4dc 100644 --- a/pipeline/backend/docker/backend_options.go +++ b/pipeline/backend/docker/backend_options.go @@ -1,9 +1,8 @@ package docker import ( + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/go-viper/mapstructure/v2" - - 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 50fb7f73e..b0eb93a84 100644 --- a/pipeline/backend/docker/backend_options_test.go +++ b/pipeline/backend/docker/backend_options_test.go @@ -3,9 +3,8 @@ package docker import ( "testing" + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - 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 5e20c7149..2cfa10d92 100644 --- a/pipeline/backend/docker/convert.go +++ b/pipeline/backend/docker/convert.go @@ -21,10 +21,9 @@ import ( "regexp" "strings" + "github.com/crowci/crow/v3/pipeline/backend/common" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/docker/docker/api/types/container" - - "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 f2948a4a7..16bf21411 100644 --- a/pipeline/backend/docker/convert_test.go +++ b/pipeline/backend/docker/convert_test.go @@ -21,11 +21,10 @@ import ( "strings" "testing" + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/system" "github.com/stretchr/testify/assert" - - 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 19cda5116..be29b7603 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/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/backend/types" ) const ( diff --git a/pipeline/backend/docker/docker.go b/pipeline/backend/docker/docker.go index eacc59d5a..294d938c2 100644 --- a/pipeline/backend/docker/docker.go +++ b/pipeline/backend/docker/docker.go @@ -22,6 +22,8 @@ import ( "path/filepath" "strings" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/shared/utils" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/image" "github.com/docker/docker/api/types/network" @@ -34,9 +36,6 @@ import ( "github.com/moby/term" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - 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 5e56f7fbb..d8cf1cec8 100644 --- a/pipeline/backend/dummy/dummy.go +++ b/pipeline/backend/dummy/dummy.go @@ -26,10 +26,9 @@ import ( "sync" "time" + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - 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 44e4034ae..886385648 100644 --- a/pipeline/backend/dummy/dummy_test.go +++ b/pipeline/backend/dummy/dummy_test.go @@ -19,10 +19,9 @@ import ( "io" "testing" + "github.com/crowci/crow/v3/pipeline/backend/dummy" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - "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 4dbc2c14a..2f6404edc 100644 --- a/pipeline/backend/kubernetes/backend_options.go +++ b/pipeline/backend/kubernetes/backend_options.go @@ -1,9 +1,8 @@ package kubernetes import ( + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/go-viper/mapstructure/v2" - - 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 ff44202c8..a9b88e5ce 100644 --- a/pipeline/backend/kubernetes/backend_options_test.go +++ b/pipeline/backend/kubernetes/backend_options_test.go @@ -3,9 +3,8 @@ package kubernetes import ( "testing" + backend "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - 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 7902b3785..c50e717ce 100644 --- a/pipeline/backend/kubernetes/kubernetes.go +++ b/pipeline/backend/kubernetes/kubernetes.go @@ -25,6 +25,7 @@ import ( "slices" "time" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "gopkg.in/yaml.v3" @@ -36,8 +37,6 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/gcp" // To authenticate to GCP K8s clusters "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - - "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 42a04356c..4b4a5ba65 100644 --- a/pipeline/backend/kubernetes/pod.go +++ b/pipeline/backend/kubernetes/pod.go @@ -20,14 +20,13 @@ import ( "maps" "strings" + "github.com/crowci/crow/v3/pipeline/backend/common" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "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 01aa95ecb..ba87c9ef2 100644 --- a/pipeline/backend/kubernetes/pod_test.go +++ b/pipeline/backend/kubernetes/pod_test.go @@ -18,11 +18,10 @@ import ( "encoding/json" "testing" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/kinbiko/jsonassert" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - - "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 3acba1e07..4cffc3706 100644 --- a/pipeline/backend/kubernetes/secrets.go +++ b/pipeline/backend/kubernetes/secrets.go @@ -20,6 +20,8 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/utils" "github.com/distribution/reference" config_file "github.com/docker/cli/cli/config/configfile" config_file_types "github.com/docker/cli/cli/config/types" @@ -27,9 +29,6 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - - "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 c918fc741..536f29edb 100644 --- a/pipeline/backend/kubernetes/secrets_test.go +++ b/pipeline/backend/kubernetes/secrets_test.go @@ -18,11 +18,10 @@ import ( "encoding/json" "testing" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/kinbiko/jsonassert" "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" - - "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 428684648..9fc711ae2 100644 --- a/pipeline/backend/kubernetes/service.go +++ b/pipeline/backend/kubernetes/service.go @@ -19,13 +19,12 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" int_str "k8s.io/apimachinery/pkg/util/intstr" - - "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 ab0217534..e7ea89a84 100644 --- a/pipeline/backend/kubernetes/service_test.go +++ b/pipeline/backend/kubernetes/service_test.go @@ -18,9 +18,8 @@ import ( "encoding/json" "testing" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - "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 53fa15034..9a2bcda52 100644 --- a/pipeline/backend/local/clone.go +++ b/pipeline/backend/local/clone.go @@ -25,9 +25,8 @@ import ( "path/filepath" "strings" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" - - "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 ab5eff802..707971856 100644 --- a/pipeline/backend/local/local.go +++ b/pipeline/backend/local/local.go @@ -26,12 +26,11 @@ import ( "slices" "sync" + "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" "golang.org/x/text/encoding/unicode" "golang.org/x/text/transform" - - "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 4adf7fc62..75d44ca4e 100644 --- a/pipeline/errors/error.go +++ b/pipeline/errors/error.go @@ -3,9 +3,8 @@ package errors import ( "errors" + "github.com/crowci/crow/v3/pipeline/errors/types" "go.uber.org/multierr" - - "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 a1658a797..8bd80f10f 100644 --- a/pipeline/errors/error_test.go +++ b/pipeline/errors/error_test.go @@ -4,11 +4,10 @@ import ( "errors" "testing" + pipeline_errors "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/pipeline/errors/types" "github.com/stretchr/testify/assert" "go.uber.org/multierr" - - 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 e31d0a7ac..f5ac546a6 100644 --- a/pipeline/frontend/metadata/drone_compatibility_test.go +++ b/pipeline/frontend/metadata/drone_compatibility_test.go @@ -18,9 +18,8 @@ import ( "strings" "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" "github.com/stretchr/testify/assert" - - "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 76ccf3c97..d3a444f91 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/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" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + yaml_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/utils" + "github.com/crowci/crow/v3/shared/constant" ) const ( diff --git a/pipeline/frontend/yaml/compiler/compiler_test.go b/pipeline/frontend/yaml/compiler/compiler_test.go index f8179e7c3..060be8005 100644 --- a/pipeline/frontend/yaml/compiler/compiler_test.go +++ b/pipeline/frontend/yaml/compiler/compiler_test.go @@ -17,13 +17,12 @@ package compiler import ( "testing" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + yaml_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types" + yaml_base_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types/base" + "github.com/crowci/crow/v3/shared/constant" "github.com/stretchr/testify/assert" - - 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 57042d68f..95cf79fa4 100644 --- a/pipeline/frontend/yaml/compiler/convert.go +++ b/pipeline/frontend/yaml/compiler/convert.go @@ -21,13 +21,12 @@ import ( "strconv" "strings" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/compiler/settings" + yaml_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/utils" "github.com/oklog/ulid/v2" - - 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 051cb6a87..33e25bdb4 100644 --- a/pipeline/frontend/yaml/compiler/convert_test.go +++ b/pipeline/frontend/yaml/compiler/convert_test.go @@ -17,9 +17,8 @@ package compiler import ( "testing" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - 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 fc3e10efc..6ae48a6ee 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/v3/pipeline/backend/types" + backend_types "github.com/crowci/crow/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 d0360dab1..01011a28d 100644 --- a/pipeline/frontend/yaml/compiler/dag_test.go +++ b/pipeline/frontend/yaml/compiler/dag_test.go @@ -17,9 +17,8 @@ package compiler import ( "testing" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" "github.com/stretchr/testify/assert" - - 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 20b419364..7aa482c71 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/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/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 061d63e26..260e9640a 100644 --- a/pipeline/frontend/yaml/compiler/option_test.go +++ b/pipeline/frontend/yaml/compiler/option_test.go @@ -17,10 +17,9 @@ package compiler import ( "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/shared/constant" "github.com/stretchr/testify/assert" - - "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 891db304f..44f4aca4f 100644 --- a/pipeline/frontend/yaml/constraint/constraint.go +++ b/pipeline/frontend/yaml/constraint/constraint.go @@ -22,12 +22,11 @@ import ( "strings" "github.com/bmatcuk/doublestar/v4" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + yamlBaseTypes "github.com/crowci/crow/v3/pipeline/frontend/yaml/types/base" "github.com/expr-lang/expr" "go.uber.org/multierr" "gopkg.in/yaml.v3" - - "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 a6c68dffa..43fcabefe 100644 --- a/pipeline/frontend/yaml/constraint/constraint_test.go +++ b/pipeline/frontend/yaml/constraint/constraint_test.go @@ -17,10 +17,9 @@ package constraint import ( "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - - "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 96c96ddc0..cc6816a5f 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/v3/pipeline/errors" - errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "github.com/crowci/crow/v3/pipeline/errors" + errorTypes "github.com/crowci/crow/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 86d633c24..845b343bb 100644 --- a/pipeline/frontend/yaml/linter/linter.go +++ b/pipeline/frontend/yaml/linter/linter.go @@ -18,14 +18,13 @@ import ( "fmt" "codeberg.org/6543/xyaml" + "github.com/crowci/crow/v3/pipeline/errors" + errorTypes "github.com/crowci/crow/v3/pipeline/errors/types" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter/schema" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/types" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/utils" + "github.com/crowci/crow/v3/shared/constant" "go.uber.org/multierr" - - "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 836b44e0a..b40dc7851 100644 --- a/pipeline/frontend/yaml/linter/linter_test.go +++ b/pipeline/frontend/yaml/linter/linter_test.go @@ -17,11 +17,10 @@ package linter_test import ( "testing" + "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/pipeline/frontend/yaml" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter" "github.com/stretchr/testify/assert" - - "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 63ddcdb85..9b47a71f8 100644 --- a/pipeline/frontend/yaml/linter/schema/schema_test.go +++ b/pipeline/frontend/yaml/linter/schema/schema_test.go @@ -19,9 +19,8 @@ import ( "os" "testing" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter/schema" "github.com/stretchr/testify/assert" - - "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 a48ad31d8..2dd7f2385 100644 --- a/pipeline/frontend/yaml/matrix/matrix.go +++ b/pipeline/frontend/yaml/matrix/matrix.go @@ -18,8 +18,7 @@ import ( "strings" "codeberg.org/6543/xyaml" - - errorTypes "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + errorTypes "github.com/crowci/crow/v3/pipeline/errors/types" ) const ( diff --git a/pipeline/frontend/yaml/parse.go b/pipeline/frontend/yaml/parse.go index 07452b6d9..85aa19ce6 100644 --- a/pipeline/frontend/yaml/parse.go +++ b/pipeline/frontend/yaml/parse.go @@ -16,8 +16,7 @@ package yaml import ( "codeberg.org/6543/xyaml" - - "go.woodpecker-ci.org/woodpecker/v3/pipeline/frontend/yaml/types" + "github.com/crowci/crow/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 dc9eca5ef..b4fab619b 100644 --- a/pipeline/frontend/yaml/parse_test.go +++ b/pipeline/frontend/yaml/parse_test.go @@ -17,10 +17,9 @@ package yaml import ( "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + yaml_base_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types/base" "github.com/stretchr/testify/assert" - - "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 6b6b665d5..ddc079c2f 100644 --- a/pipeline/frontend/yaml/types/container.go +++ b/pipeline/frontend/yaml/types/container.go @@ -17,11 +17,10 @@ package types import ( "fmt" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/constraint" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/types/base" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/utils" "gopkg.in/yaml.v3" - - "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 537ba5089..c93fb0f89 100644 --- a/pipeline/frontend/yaml/types/container_test.go +++ b/pipeline/frontend/yaml/types/container_test.go @@ -17,12 +17,11 @@ package types import ( "testing" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/constraint" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/types/base" "github.com/docker/docker/api/types/strslice" "github.com/stretchr/testify/assert" "gopkg.in/yaml.v3" - - "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 134aa47c6..572452a8d 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/v3/pipeline/frontend/yaml/constraint" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/constraint" ) type ( diff --git a/pipeline/log/line_writer.go b/pipeline/log/line_writer.go index b88cbd671..29c4d52f1 100644 --- a/pipeline/log/line_writer.go +++ b/pipeline/log/line_writer.go @@ -21,10 +21,9 @@ import ( "sync" "time" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/pipeline/shared" "github.com/rs/zerolog/log" - - "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 bcff046da..8cab3efa2 100644 --- a/pipeline/log/line_writer_test.go +++ b/pipeline/log/line_writer_test.go @@ -17,12 +17,11 @@ package log_test import ( "testing" + "github.com/crowci/crow/v3/pipeline/log" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/pipeline/rpc/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 9dbd985f0..4f7e8bdad 100644 --- a/pipeline/log/utils_test.go +++ b/pipeline/log/utils_test.go @@ -21,9 +21,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/pipeline/log" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/pipeline/log" ) type testWriter struct { diff --git a/pipeline/logger.go b/pipeline/logger.go index 765a0333b..726b6d802 100644 --- a/pipeline/logger.go +++ b/pipeline/logger.go @@ -17,7 +17,7 @@ package pipeline import ( "io" - backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + backend "github.com/crowci/crow/v3/pipeline/backend/types" ) // Logger handles the process logging. diff --git a/pipeline/option.go b/pipeline/option.go index 784cfdbbd..e39b18e02 100644 --- a/pipeline/option.go +++ b/pipeline/option.go @@ -17,7 +17,7 @@ package pipeline import ( "context" - backend "go.woodpecker-ci.org/woodpecker/v3/pipeline/backend/types" + backend "github.com/crowci/crow/v3/pipeline/backend/types" ) // Option configures a runtime option. diff --git a/pipeline/pipeline.go b/pipeline/pipeline.go index c7429dbf3..a3c2b2bb2 100644 --- a/pipeline/pipeline.go +++ b/pipeline/pipeline.go @@ -21,13 +21,12 @@ import ( "sync" "time" + backend "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" "github.com/oklog/ulid/v2" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "golang.org/x/sync/errgroup" - - 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 e8383505b..c7f941b70 100644 --- a/pipeline/rpc/mocks/peer.go +++ b/pipeline/rpc/mocks/peer.go @@ -8,8 +8,8 @@ package mocks import ( context "context" + rpc "github.com/crowci/crow/v3/pipeline/rpc" mock "github.com/stretchr/testify/mock" - 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 06790ffec..27f18bc5a 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/v3/pipeline/backend/types" + backend "github.com/crowci/crow/v3/pipeline/backend/types" ) type ( diff --git a/pipeline/rpc/proto/woodpecker.pb.go b/pipeline/rpc/proto/woodpecker.pb.go index e3cf1040e..ee72e66c1 100644 --- a/pipeline/rpc/proto/woodpecker.pb.go +++ b/pipeline/rpc/proto/woodpecker.pb.go @@ -22,10 +22,11 @@ package proto import ( - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" ) const ( diff --git a/pipeline/rpc/proto/woodpecker_grpc.pb.go b/pipeline/rpc/proto/woodpecker_grpc.pb.go index fc0a478af..5bab0d519 100644 --- a/pipeline/rpc/proto/woodpecker_grpc.pb.go +++ b/pipeline/rpc/proto/woodpecker_grpc.pb.go @@ -23,6 +23,7 @@ package proto import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/server/api/agent.go b/server/api/agent.go index 116fe5cac..d2c1351b9 100644 --- a/server/api/agent.go +++ b/server/api/agent.go @@ -18,12 +18,11 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" - - "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 82d5e7c3f..54e838cb7 100644 --- a/server/api/agent_test.go +++ b/server/api/agent_test.go @@ -21,17 +21,16 @@ import ( "strings" "testing" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/queue" + queue_mocks "github.com/crowci/crow/v3/server/queue/mocks" + mocks_manager "github.com/crowci/crow/v3/server/services/mocks" + store_mocks "github.com/crowci/crow/v3/server/store/mocks" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 74378a7b5..a4333a424 100644 --- a/server/api/badge.go +++ b/server/api/badge.go @@ -22,15 +22,14 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/badges" + "github.com/crowci/crow/v3/server/ccmenu" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 78b05b6fe..1a13346d6 100644 --- a/server/api/cron.go +++ b/server/api/cron.go @@ -19,15 +19,14 @@ import ( "strconv" "time" + "github.com/crowci/crow/v3/server" + cronScheduler "github.com/crowci/crow/v3/server/cron" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 11981bc39..14d23354f 100644 --- a/server/api/forge.go +++ b/server/api/forge.go @@ -18,11 +18,10 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" - - "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 5108a76c0..d8bd46051 100644 --- a/server/api/global_registry.go +++ b/server/api/global_registry.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 1bcc6a825..aff7e0934 100644 --- a/server/api/global_secret.go +++ b/server/api/global_secret.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 591e8f621..f58af6e4f 100644 --- a/server/api/helper.go +++ b/server/api/helper.go @@ -18,15 +18,14 @@ import ( "errors" "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 4dd17b1b8..1e65b2b8f 100644 --- a/server/api/helper_test.go +++ b/server/api/helper_test.go @@ -5,10 +5,9 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/server/pipeline" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - - "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 fa79ff04f..778cf51a4 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -22,16 +22,15 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 6620440f3..56864f110 100644 --- a/server/api/hook_test.go +++ b/server/api/hook_test.go @@ -7,21 +7,20 @@ import ( "net/url" "testing" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/api" + mocks_forge "github.com/crowci/crow/v3/server/forge/mocks" + "github.com/crowci/crow/v3/server/model" + mocks_config_service "github.com/crowci/crow/v3/server/services/config/mocks" + mocks_services "github.com/crowci/crow/v3/server/services/mocks" + "github.com/crowci/crow/v3/server/services/permissions" + mocks_registry_service "github.com/crowci/crow/v3/server/services/registry/mocks" + mocks_secret_service "github.com/crowci/crow/v3/server/services/secret/mocks" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 06134b27d..d38677d7c 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -23,18 +23,17 @@ import ( "strconv" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" + "github.com/crowci/crow/v3/shared/httputil" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - - "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 cca5c991d..e8bee9ced 100644 --- a/server/api/login_test.go +++ b/server/api/login_test.go @@ -9,20 +9,19 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/api" + mocks_forge "github.com/crowci/crow/v3/server/forge/mocks" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + mocks_services "github.com/crowci/crow/v3/server/services/mocks" + "github.com/crowci/crow/v3/server/services/permissions" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" + "github.com/crowci/crow/v3/server/store/types" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 1564f3926..a61edc3aa 100644 --- a/server/api/metrics/prometheus.go +++ b/server/api/metrics/prometheus.go @@ -19,10 +19,9 @@ import ( "fmt" "net/http" + "github.com/crowci/crow/v3/server" "github.com/gin-gonic/gin" prometheus_http "github.com/prometheus/client_golang/prometheus/promhttp" - - "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 765ee3df8..0c78123e6 100644 --- a/server/api/org.go +++ b/server/api/org.go @@ -18,13 +18,12 @@ import ( "net/http" "strings" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 47c6c77c8..2c5559ec3 100644 --- a/server/api/org_registry.go +++ b/server/api/org_registry.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 47b9dfc53..8c55f30f7 100644 --- a/server/api/org_secret.go +++ b/server/api/org_secret.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 ce3d1396f..15255d66d 100644 --- a/server/api/pipeline.go +++ b/server/api/pipeline.go @@ -25,16 +25,15 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/pipeline/stepbuilder" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 04c1ba52c..9ea7b5a52 100644 --- a/server/api/pipeline_test.go +++ b/server/api/pipeline_test.go @@ -20,17 +20,16 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/server" + forge_mocks "github.com/crowci/crow/v3/server/forge/mocks" + "github.com/crowci/crow/v3/server/model" + mocks_manager "github.com/crowci/crow/v3/server/services/mocks" + store_mocks "github.com/crowci/crow/v3/server/store/mocks" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 79e1dad03..8078d5210 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 c9127c219..1c3906156 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -23,17 +23,16 @@ import ( "strconv" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - - "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 59c73b4ff..c6f950c85 100644 --- a/server/api/repo_secret.go +++ b/server/api/repo_secret.go @@ -17,11 +17,10 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" - - "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 c3dd717e3..65305965c 100644 --- a/server/api/signature_public_key.go +++ b/server/api/signature_public_key.go @@ -19,10 +19,9 @@ import ( "encoding/pem" "net/http" + "github.com/crowci/crow/v3/server" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "go.woodpecker-ci.org/woodpecker/v3/server" ) // GetSignaturePublicKey diff --git a/server/api/stream.go b/server/api/stream.go index c948af171..988f77fcc 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -24,15 +24,14 @@ import ( "strconv" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/logging" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pubsub" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 9b3690887..40bc25673 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -19,15 +19,14 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" "github.com/rs/zerolog/log" - - "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 35df2724a..f94dc7501 100644 --- a/server/api/users.go +++ b/server/api/users.go @@ -18,12 +18,11 @@ import ( "encoding/base32" "net/http" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" "github.com/gorilla/securecookie" - - "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 363040bfd..aa68bf1c3 100644 --- a/server/api/z.go +++ b/server/api/z.go @@ -17,12 +17,11 @@ package api import ( "net/http" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/version" "github.com/gin-gonic/gin" "github.com/rs/zerolog" "github.com/rs/zerolog/log" - - "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 e05b356fb..be7cbe2f4 100644 --- a/server/badges/badges.go +++ b/server/badges/badges.go @@ -14,7 +14,7 @@ package badges -import "go.woodpecker-ci.org/woodpecker/v3/server/model" +import "github.com/crowci/crow/v3/server/model" // cspell:words Verdana diff --git a/server/badges/badges_test.go b/server/badges/badges_test.go index 7829be16d..fb45b2b7d 100644 --- a/server/badges/badges_test.go +++ b/server/badges/badges_test.go @@ -17,9 +17,8 @@ package badges import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 0e7138eaa..c92142a51 100644 --- a/server/cache/membership.go +++ b/server/cache/membership.go @@ -19,11 +19,10 @@ import ( "fmt" "time" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/jellydator/ttlcache/v3" - - "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 bfaf015c0..17a41fac9 100644 --- a/server/ccmenu/cc.go +++ b/server/ccmenu/cc.go @@ -20,7 +20,7 @@ import ( "strconv" "time" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/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 7cecdad63..4e01be20c 100644 --- a/server/ccmenu/cc_test.go +++ b/server/ccmenu/cc_test.go @@ -19,9 +19,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCC(t *testing.T) { diff --git a/server/config.go b/server/config.go index 7f9d51a2e..b9d18dfdd 100644 --- a/server/config.go +++ b/server/config.go @@ -18,14 +18,14 @@ package server import ( "time" - "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" + "github.com/crowci/crow/v3/server/cache" + "github.com/crowci/crow/v3/server/logging" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pubsub" + "github.com/crowci/crow/v3/server/queue" + "github.com/crowci/crow/v3/server/services" + "github.com/crowci/crow/v3/server/services/log" + "github.com/crowci/crow/v3/server/services/permissions" ) var Config = struct { diff --git a/server/cron/cron.go b/server/cron/cron.go index 3460fbaa4..f96c3a337 100644 --- a/server/cron/cron.go +++ b/server/cron/cron.go @@ -19,14 +19,13 @@ import ( "fmt" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/store" "github.com/gdgvda/cron" "github.com/rs/zerolog/log" - - "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 ca39839f1..250145a63 100644 --- a/server/cron/cron_test.go +++ b/server/cron/cron_test.go @@ -19,14 +19,13 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server" + mocks_forge "github.com/crowci/crow/v3/server/forge/mocks" + "github.com/crowci/crow/v3/server/model" + mocks_manager "github.com/crowci/crow/v3/server/services/mocks" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 a8677c6b1..363d69267 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/v3/server/model" + "github.com/crowci/crow/v3/server/model" ) type argumentsAuth struct { diff --git a/server/forge/addon/client.go b/server/forge/addon/client.go index 9640eb782..518e03751 100644 --- a/server/forge/addon/client.go +++ b/server/forge/addon/client.go @@ -22,12 +22,11 @@ import ( "net/rpc" "os/exec" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/hashicorp/go-plugin" "github.com/rs/zerolog/log" - - "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 7c7faa833..76d151ee8 100644 --- a/server/forge/addon/plugin.go +++ b/server/forge/addon/plugin.go @@ -17,9 +17,8 @@ package addon import ( "net/rpc" + "github.com/crowci/crow/v3/server/forge" "github.com/hashicorp/go-plugin" - - "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 abf14e214..6d7c4e163 100644 --- a/server/forge/addon/server.go +++ b/server/forge/addon/server.go @@ -20,10 +20,9 @@ import ( "encoding/json" "net/http" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" "github.com/hashicorp/go-plugin" - - "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 bbb5ac43b..b61025108 100644 --- a/server/forge/bitbucket/bitbucket.go +++ b/server/forge/bitbucket/bitbucket.go @@ -24,15 +24,14 @@ import ( "path/filepath" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/bitbucket/internal" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + shared_utils "github.com/crowci/crow/v3/shared/utils" "golang.org/x/oauth2" - - "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 c074cfcf2..ffaef368c 100644 --- a/server/forge/bitbucket/bitbucket_test.go +++ b/server/forge/bitbucket/bitbucket_test.go @@ -22,13 +22,12 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/server/forge/bitbucket/fixtures" + "github.com/crowci/crow/v3/server/forge/bitbucket/internal" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - - "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 TestNew(t *testing.T) { diff --git a/server/forge/bitbucket/convert.go b/server/forge/bitbucket/convert.go index b7b13c6b4..53421dc3f 100644 --- a/server/forge/bitbucket/convert.go +++ b/server/forge/bitbucket/convert.go @@ -21,10 +21,9 @@ import ( "regexp" "strings" + "github.com/crowci/crow/v3/server/forge/bitbucket/internal" + "github.com/crowci/crow/v3/server/model" "golang.org/x/oauth2" - - "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 5f450cc03..ce2a40d3b 100644 --- a/server/forge/bitbucket/convert_test.go +++ b/server/forge/bitbucket/convert_test.go @@ -19,11 +19,10 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/forge/bitbucket/internal" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" "golang.org/x/oauth2" - - "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_convertStatus(t *testing.T) { diff --git a/server/forge/bitbucket/internal/client.go b/server/forge/bitbucket/internal/client.go index e7a5a74b0..4cb2831bf 100644 --- a/server/forge/bitbucket/internal/client.go +++ b/server/forge/bitbucket/internal/client.go @@ -23,10 +23,9 @@ import ( "net/http" "net/url" + shared_utils "github.com/crowci/crow/v3/shared/utils" "golang.org/x/oauth2" "golang.org/x/oauth2/bitbucket" - - 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 7f8b6710b..210606ddd 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/v3/server/forge/bitbucket/internal" - "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/forge/bitbucket/internal" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" ) const ( diff --git a/server/forge/bitbucket/parse_test.go b/server/forge/bitbucket/parse_test.go index f0afb5102..186cbaafa 100644 --- a/server/forge/bitbucket/parse_test.go +++ b/server/forge/bitbucket/parse_test.go @@ -19,11 +19,10 @@ import ( "net/http" "testing" + "github.com/crowci/crow/v3/server/forge/bitbucket/fixtures" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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_parseHook(t *testing.T) { diff --git a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go index 354df61b6..43bade36c 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter.go @@ -21,17 +21,16 @@ import ( "net/url" "strings" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/bitbucketdatacenter/internal" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" bb "github.com/neticdk/go-bitbucket/bitbucket" "github.com/rs/zerolog/log" "golang.org/x/oauth2" - - "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 b85c1ebd3..aa758ce4f 100644 --- a/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go +++ b/server/forge/bitbucketdatacenter/bitbucketdatacenter_test.go @@ -19,11 +19,10 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/forge/bitbucketdatacenter/fixtures" + "github.com/crowci/crow/v3/server/model" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/forge/bitbucketdatacenter/fixtures" - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestNew(t *testing.T) { diff --git a/server/forge/bitbucketdatacenter/convert.go b/server/forge/bitbucketdatacenter/convert.go index d1fa741d4..cb81393d0 100644 --- a/server/forge/bitbucketdatacenter/convert.go +++ b/server/forge/bitbucketdatacenter/convert.go @@ -20,10 +20,9 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server/model" bb "github.com/neticdk/go-bitbucket/bitbucket" "golang.org/x/oauth2" - - "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 74ee30b98..bff0581ec 100644 --- a/server/forge/bitbucketdatacenter/convert_test.go +++ b/server/forge/bitbucketdatacenter/convert_test.go @@ -19,10 +19,9 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" bb "github.com/neticdk/go-bitbucket/bitbucket" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_convertStatus(t *testing.T) { diff --git a/server/forge/common/status.go b/server/forge/common/status.go index 3e07f041b..68c32ae73 100644 --- a/server/forge/common/status.go +++ b/server/forge/common/status.go @@ -19,10 +19,9 @@ import ( "fmt" "text/template" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 04e834355..8498a75f8 100644 --- a/server/forge/common/status_test.go +++ b/server/forge/common/status_test.go @@ -17,10 +17,9 @@ package common import ( "testing" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 549e048cc..0fa3e25ed 100644 --- a/server/forge/common/utils.go +++ b/server/forge/common/utils.go @@ -20,10 +20,9 @@ import ( "net/url" "strings" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 c979b25b4..6c087d23f 100644 --- a/server/forge/common/utils_test.go +++ b/server/forge/common/utils_test.go @@ -17,9 +17,8 @@ package common_test import ( "testing" + "github.com/crowci/crow/v3/server/forge/common" "github.com/stretchr/testify/assert" - - "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 f5102a73e..c88a2d19f 100644 --- a/server/forge/forge.go +++ b/server/forge/forge.go @@ -21,8 +21,8 @@ import ( "context" "net/http" - "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" ) // TODO: use pagination diff --git a/server/forge/forgejo/forgejo.go b/server/forge/forgejo/forgejo.go index 1e5a0d418..73f09818e 100644 --- a/server/forge/forgejo/forgejo.go +++ b/server/forge/forgejo/forgejo.go @@ -27,16 +27,15 @@ import ( "time" "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + shared_utils "github.com/crowci/crow/v3/shared/utils" "github.com/rs/zerolog/log" "golang.org/x/oauth2" - - "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 0dcbc49fb..c5c1b3fc2 100644 --- a/server/forge/forgejo/forgejo_test.go +++ b/server/forge/forgejo/forgejo_test.go @@ -21,14 +21,13 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/server/forge/forgejo/fixtures" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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" ) func TestNew(t *testing.T) { diff --git a/server/forge/forgejo/helper.go b/server/forge/forgejo/helper.go index 394f6a133..49e1e8b0a 100644 --- a/server/forge/forgejo/helper.go +++ b/server/forge/forgejo/helper.go @@ -23,9 +23,8 @@ import ( "time" "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 b7414a504..a260194ef 100644 --- a/server/forge/forgejo/helper_test.go +++ b/server/forge/forgejo/helper_test.go @@ -19,10 +19,9 @@ import ( "testing" "codeberg.org/mvdkleijn/forgejo-sdk/forgejo" + "github.com/crowci/crow/v3/server/forge/forgejo/fixtures" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/forge/forgejo/fixtures" - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_parsePush(t *testing.T) { diff --git a/server/forge/forgejo/parse.go b/server/forge/forgejo/parse.go index 609c73a40..75e274212 100644 --- a/server/forge/forgejo/parse.go +++ b/server/forge/forgejo/parse.go @@ -19,10 +19,9 @@ import ( "net/http" "strings" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 a40777521..e52f281f3 100644 --- a/server/forge/forgejo/parse_test.go +++ b/server/forge/forgejo/parse_test.go @@ -19,11 +19,10 @@ import ( "net/http" "testing" + "github.com/crowci/crow/v3/server/forge/forgejo/fixtures" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 7b3788d06..b5e6cb232 100644 --- a/server/forge/gitea/gitea.go +++ b/server/forge/gitea/gitea.go @@ -29,16 +29,15 @@ import ( "time" "code.gitea.io/sdk/gitea" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + shared_utils "github.com/crowci/crow/v3/shared/utils" "github.com/rs/zerolog/log" "golang.org/x/oauth2" - - "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 1892c5fcc..798cf3ab8 100644 --- a/server/forge/gitea/gitea_test.go +++ b/server/forge/gitea/gitea_test.go @@ -22,14 +22,13 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/server/forge/gitea/fixtures" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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" ) func TestNew(t *testing.T) { diff --git a/server/forge/gitea/helper.go b/server/forge/gitea/helper.go index 9420d5fff..7d55d31f0 100644 --- a/server/forge/gitea/helper.go +++ b/server/forge/gitea/helper.go @@ -24,9 +24,8 @@ import ( "time" "code.gitea.io/sdk/gitea" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 b728699ae..b8f7cda3f 100644 --- a/server/forge/gitea/helper_test.go +++ b/server/forge/gitea/helper_test.go @@ -20,10 +20,9 @@ import ( "testing" "code.gitea.io/sdk/gitea" + "github.com/crowci/crow/v3/server/forge/gitea/fixtures" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/forge/gitea/fixtures" - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_parsePush(t *testing.T) { diff --git a/server/forge/gitea/parse.go b/server/forge/gitea/parse.go index ae873d64d..4220d99bd 100644 --- a/server/forge/gitea/parse.go +++ b/server/forge/gitea/parse.go @@ -21,10 +21,9 @@ import ( "net/http" "strings" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 437376611..d07833936 100644 --- a/server/forge/gitea/parse_test.go +++ b/server/forge/gitea/parse_test.go @@ -20,11 +20,10 @@ import ( "net/http" "testing" + "github.com/crowci/crow/v3/server/forge/gitea/fixtures" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 a21e7bd9a..e72ab8b57 100644 --- a/server/forge/github/convert.go +++ b/server/forge/github/convert.go @@ -18,9 +18,8 @@ package github import ( "fmt" + "github.com/crowci/crow/v3/server/model" "github.com/google/go-github/v68/github" - - "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 816cec9d0..093bbbf13 100644 --- a/server/forge/github/convert_test.go +++ b/server/forge/github/convert_test.go @@ -18,10 +18,9 @@ package github import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/google/go-github/v68/github" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func Test_convertStatus(t *testing.T) { diff --git a/server/forge/github/github.go b/server/forge/github/github.go index 4d416fc0d..b5fd803aa 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -27,17 +27,16 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/shared/utils" "github.com/google/go-github/v68/github" "github.com/rs/zerolog/log" "golang.org/x/oauth2" - - "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 59751978b..eccd7b198 100644 --- a/server/forge/github/github_test.go +++ b/server/forge/github/github_test.go @@ -20,11 +20,10 @@ import ( "net/http/httptest" "testing" + "github.com/crowci/crow/v3/server/forge/github/fixtures" + "github.com/crowci/crow/v3/server/model" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/forge/github/fixtures" - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestNew(t *testing.T) { diff --git a/server/forge/github/parse.go b/server/forge/github/parse.go index 7df728984..76afbb69f 100644 --- a/server/forge/github/parse.go +++ b/server/forge/github/parse.go @@ -22,11 +22,10 @@ import ( "net/http" "strings" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/shared/utils" "github.com/google/go-github/v68/github" - - "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 a48f0ff5a..8a060cabf 100644 --- a/server/forge/github/parse_test.go +++ b/server/forge/github/parse_test.go @@ -22,11 +22,10 @@ import ( "strings" "testing" + "github.com/crowci/crow/v3/server/forge/github/fixtures" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 c8ccdc119..a2999f49b 100644 --- a/server/forge/gitlab/convert.go +++ b/server/forge/gitlab/convert.go @@ -21,10 +21,9 @@ import ( "net/http" "strings" - "gitlab.com/gitlab-org/api/client-go" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/shared/utils" + gitlab "gitlab.com/gitlab-org/api/client-go" ) const ( diff --git a/server/forge/gitlab/gitlab.go b/server/forge/gitlab/gitlab.go index fbe145002..88db088fd 100644 --- a/server/forge/gitlab/gitlab.go +++ b/server/forge/gitlab/gitlab.go @@ -27,17 +27,16 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/common" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/shared/utils" "github.com/rs/zerolog/log" - "gitlab.com/gitlab-org/api/client-go" + gitlab "gitlab.com/gitlab-org/api/client-go" "golang.org/x/oauth2" - - "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 876696ca7..579e9978f 100644 --- a/server/forge/gitlab/gitlab_test.go +++ b/server/forge/gitlab/gitlab_test.go @@ -23,11 +23,10 @@ import ( "strconv" "testing" + "github.com/crowci/crow/v3/server/forge/gitlab/testdata" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 be03b7c9d..ec4b5d0f2 100644 --- a/server/forge/gitlab/status.go +++ b/server/forge/gitlab/status.go @@ -15,9 +15,8 @@ package gitlab import ( - "gitlab.com/gitlab-org/api/client-go" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/model" + gitlab "gitlab.com/gitlab-org/api/client-go" ) // 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 0c6ec4421..0fadb5591 100644 --- a/server/forge/mocks/forge.go +++ b/server/forge/mocks/forge.go @@ -7,14 +7,11 @@ package mocks import ( context "context" - http "net/http" + types "github.com/crowci/crow/v3/server/forge/types" + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - - model "go.woodpecker-ci.org/woodpecker/v3/server/model" - - 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 0b0e5fac5..e400d03ca 100644 --- a/server/forge/refresh.go +++ b/server/forge/refresh.go @@ -18,10 +18,9 @@ import ( "context" "time" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 e534ab112..1d913420d 100644 --- a/server/forge/setup/setup.go +++ b/server/forge/setup/setup.go @@ -5,17 +5,16 @@ import ( "net/url" "strings" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/addon" + "github.com/crowci/crow/v3/server/forge/bitbucket" + "github.com/crowci/crow/v3/server/forge/bitbucketdatacenter" + "github.com/crowci/crow/v3/server/forge/forgejo" + "github.com/crowci/crow/v3/server/forge/gitea" + "github.com/crowci/crow/v3/server/forge/github" + "github.com/crowci/crow/v3/server/forge/gitlab" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 c009b6eca..011c9dd3a 100644 --- a/server/grpc/auth_server.go +++ b/server/grpc/auth_server.go @@ -19,12 +19,11 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/pipeline/rpc/proto" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/rs/zerolog/log" - - "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 6df125bcd..bf3a62af7 100644 --- a/server/grpc/filter.go +++ b/server/grpc/filter.go @@ -15,9 +15,9 @@ package grpc import ( - "go.woodpecker-ci.org/woodpecker/v3/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/queue" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 1599a58ca..f725af208 100644 --- a/server/grpc/filter_test.go +++ b/server/grpc/filter_test.go @@ -17,10 +17,9 @@ package grpc import ( "testing" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 379fa7900..5319195cf 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -24,19 +24,18 @@ import ( "strconv" "time" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/logging" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline" + "github.com/crowci/crow/v3/server/pubsub" + "github.com/crowci/crow/v3/server/queue" + "github.com/crowci/crow/v3/server/store" "github.com/prometheus/client_golang/prometheus" "github.com/rs/zerolog/log" grpcMetadata "google.golang.org/grpc/metadata" - - "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 798c39e35..fdf202d2c 100644 --- a/server/grpc/rpc_test.go +++ b/server/grpc/rpc_test.go @@ -19,13 +19,12 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "google.golang.org/grpc/metadata" - - "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 4a79ef447..ccd808748 100644 --- a/server/grpc/server.go +++ b/server/grpc/server.go @@ -18,17 +18,16 @@ import ( "context" "encoding/json" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/pipeline/rpc/proto" + "github.com/crowci/crow/v3/server/logging" + "github.com/crowci/crow/v3/server/pubsub" + "github.com/crowci/crow/v3/server/queue" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/version" "github.com/prometheus/client_golang/prometheus" prometheus_auto "github.com/prometheus/client_golang/prometheus/promauto" "github.com/rs/zerolog/log" - - "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 ec7afe861..52df50d8c 100644 --- a/server/logging/log.go +++ b/server/logging/log.go @@ -18,9 +18,8 @@ import ( "context" "sync" + "github.com/crowci/crow/v3/server/model" logger "github.com/rs/zerolog/log" - - "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 52020e6cc..668027128 100644 --- a/server/logging/log_test.go +++ b/server/logging/log_test.go @@ -20,9 +20,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 80f1854f8..d9da918cf 100644 --- a/server/logging/logging.go +++ b/server/logging/logging.go @@ -18,7 +18,7 @@ import ( "context" "errors" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/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 b74e8184a..b8bf671d5 100644 --- a/server/model/pipeline.go +++ b/server/model/pipeline.go @@ -16,7 +16,7 @@ package model import ( - "go.woodpecker-ci.org/woodpecker/v3/pipeline/errors/types" + "github.com/crowci/crow/v3/pipeline/errors/types" ) type Pipeline struct { diff --git a/server/pipeline/approve.go b/server/pipeline/approve.go index d66b128ac..d7dbe21be 100644 --- a/server/pipeline/approve.go +++ b/server/pipeline/approve.go @@ -19,12 +19,11 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 e39c20010..a81cf5c53 100644 --- a/server/pipeline/cancel.go +++ b/server/pipeline/cancel.go @@ -18,13 +18,12 @@ import ( "context" "fmt" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/queue" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 0e550d54c..10d74f227 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/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" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline/stepbuilder" + "github.com/crowci/crow/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 2a5ebb6da..6ee599956 100644 --- a/server/pipeline/create.go +++ b/server/pipeline/create.go @@ -20,14 +20,13 @@ import ( "fmt" "regexp" + pipeline_errors "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - 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 d717f878f..59706b823 100644 --- a/server/pipeline/decline.go +++ b/server/pipeline/decline.go @@ -19,11 +19,10 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 4a4f3dc36..9d0d25d34 100644 --- a/server/pipeline/gated.go +++ b/server/pipeline/gated.go @@ -14,7 +14,7 @@ package pipeline -import "go.woodpecker-ci.org/woodpecker/v3/server/model" +import "github.com/crowci/crow/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 76004ff3d..1f6a8d2d4 100644 --- a/server/pipeline/gated_test.go +++ b/server/pipeline/gated_test.go @@ -3,9 +3,8 @@ package pipeline import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 bc1417793..ee0b5eacc 100644 --- a/server/pipeline/helper.go +++ b/server/pipeline/helper.go @@ -17,10 +17,9 @@ package pipeline import ( "context" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 72080414b..5ea53ebc9 100644 --- a/server/pipeline/items.go +++ b/server/pipeline/items.go @@ -19,16 +19,15 @@ import ( "database/sql" "errors" + pipeline_errors "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/compiler" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline/stepbuilder" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - 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 53b9db126..06debcbe7 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/v3/pipeline/backend/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - sharedPipeline "go.woodpecker-ci.org/woodpecker/v3/server/pipeline/stepbuilder" + "github.com/crowci/crow/v3/pipeline/backend/types" + "github.com/crowci/crow/v3/server/model" + sharedPipeline "github.com/crowci/crow/v3/server/pipeline/stepbuilder" ) func TestSetPipelineStepsOnPipeline(t *testing.T) { diff --git a/server/pipeline/pipeline_status.go b/server/pipeline/pipeline_status.go index fbac2776f..05940d39f 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/v3/pipeline/errors" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store" + "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 1f9b87580..895ed71b7 100644 --- a/server/pipeline/pipeline_status_test.go +++ b/server/pipeline/pipeline_status_test.go @@ -20,12 +20,11 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 002dbf3a9..d9b47cb0e 100644 --- a/server/pipeline/queue.go +++ b/server/pipeline/queue.go @@ -20,10 +20,10 @@ import ( "fmt" "maps" - "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" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 844f437b3..0cd7c9e2b 100644 --- a/server/pipeline/restart.go +++ b/server/pipeline/restart.go @@ -19,12 +19,11 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 82625319f..599ec4b7f 100644 --- a/server/pipeline/start.go +++ b/server/pipeline/start.go @@ -17,12 +17,11 @@ package pipeline import ( "context" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pipeline/stepbuilder" + "github.com/crowci/crow/v3/server/store" "github.com/rs/zerolog/log" - - "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 364384a05..f5cd2dd90 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/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" + "github.com/crowci/crow/v3/pipeline" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 1d6212880..7d1b171e1 100644 --- a/server/pipeline/step_status_test.go +++ b/server/pipeline/step_status_test.go @@ -19,14 +19,13 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/pipeline" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 8ceb0dbcd..f5811874a 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/v3/pipeline/frontend/metadata" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/version" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 c63680d94..5ccccb1ac 100644 --- a/server/pipeline/stepbuilder/metadata_test.go +++ b/server/pipeline/stepbuilder/metadata_test.go @@ -17,11 +17,10 @@ package stepbuilder import ( "testing" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/server/forge/mocks" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 3d0b55e7e..b13d88c59 100644 --- a/server/pipeline/stepbuilder/stepBuilder.go +++ b/server/pipeline/stepbuilder/stepBuilder.go @@ -21,22 +21,21 @@ import ( "path/filepath" "strings" + backend_types "github.com/crowci/crow/v3/pipeline/backend/types" + pipeline_errors "github.com/crowci/crow/v3/pipeline/errors" + errorTypes "github.com/crowci/crow/v3/pipeline/errors/types" + "github.com/crowci/crow/v3/pipeline/frontend/metadata" + "github.com/crowci/crow/v3/pipeline/frontend/yaml" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/compiler" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/linter" + "github.com/crowci/crow/v3/pipeline/frontend/yaml/matrix" + yaml_types "github.com/crowci/crow/v3/pipeline/frontend/yaml/types" + "github.com/crowci/crow/v3/server" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/oklog/ulid/v2" "github.com/rs/zerolog/log" "go.uber.org/multierr" - - 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 bca38e798..f4e6be34f 100644 --- a/server/pipeline/stepbuilder/stepBuilder_test.go +++ b/server/pipeline/stepbuilder/stepBuilder_test.go @@ -19,13 +19,12 @@ import ( "fmt" "testing" + "github.com/crowci/crow/v3/pipeline/errors" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/mocks" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 8bcb52efd..d66f22738 100644 --- a/server/pipeline/topic.go +++ b/server/pipeline/topic.go @@ -18,11 +18,10 @@ import ( "encoding/json" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/pubsub" "github.com/rs/zerolog/log" - - "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 12d2c15a7..cfd00b024 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/v3/pipeline/rpc" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store" + "github.com/crowci/crow/v3/pipeline/rpc" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 1ee07370d..0bf3ebfb7 100644 --- a/server/queue/fifo.go +++ b/server/queue/fifo.go @@ -21,10 +21,9 @@ import ( "sync" "time" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/shared/constant" "github.com/rs/zerolog/log" - - "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 c25d4a966..6f5157019 100644 --- a/server/queue/fifo_test.go +++ b/server/queue/fifo_test.go @@ -22,9 +22,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/queue/mocks/queue.go b/server/queue/mocks/queue.go index a851b782b..33ff2aa29 100644 --- a/server/queue/mocks/queue.go +++ b/server/queue/mocks/queue.go @@ -8,10 +8,9 @@ package mocks import ( context "context" + model "github.com/crowci/crow/v3/server/model" + queue "github.com/crowci/crow/v3/server/queue" mock "github.com/stretchr/testify/mock" - model "go.woodpecker-ci.org/woodpecker/v3/server/model" - - 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 0f2ae4ae2..ebef31ac8 100644 --- a/server/queue/persistent.go +++ b/server/queue/persistent.go @@ -18,11 +18,10 @@ package queue import ( "context" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" "github.com/pkg/errors" "github.com/rs/zerolog/log" - - "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 e575bafcd..ed1a5a50e 100644 --- a/server/queue/queue.go +++ b/server/queue/queue.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" ) var ( diff --git a/server/router/api.go b/server/router/api.go index 23f306aa3..0d2d882d9 100644 --- a/server/router/api.go +++ b/server/router/api.go @@ -15,13 +15,12 @@ package router import ( + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/api" + "github.com/crowci/crow/v3/server/api/debug" + "github.com/crowci/crow/v3/server/router/middleware/session" "github.com/gin-gonic/gin" "github.com/rs/zerolog" - - "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 24d9bae39..3b65b8169 100644 --- a/server/router/middleware/session/agent.go +++ b/server/router/middleware/session/agent.go @@ -18,9 +18,8 @@ package session import ( "net/http" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" - - "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 a02f0e50f..c87597002 100644 --- a/server/router/middleware/session/org.go +++ b/server/router/middleware/session/org.go @@ -19,11 +19,10 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" - - "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 a9bffcd5f..f0b136cc9 100644 --- a/server/router/middleware/session/pagination.go +++ b/server/router/middleware/session/pagination.go @@ -17,9 +17,8 @@ package session import ( "strconv" + "github.com/crowci/crow/v3/server/model" "github.com/gin-gonic/gin" - - "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 788ae1792..0ebdebf26 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -21,13 +21,12 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 7cc35de66..8a6a20142 100644 --- a/server/router/middleware/session/user.go +++ b/server/router/middleware/session/user.go @@ -18,13 +18,12 @@ import ( "net/http" "strconv" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/shared/token" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 915b1a33c..000c1e048 100644 --- a/server/router/middleware/store.go +++ b/server/router/middleware/store.go @@ -15,9 +15,8 @@ package middleware import ( + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" - - "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 600e4fb15..1187ee69a 100644 --- a/server/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -17,12 +17,11 @@ package token import ( "net/http" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/store" "github.com/gin-gonic/gin" - - "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 0fac8225a..f81929ae1 100644 --- a/server/router/middleware/version.go +++ b/server/router/middleware/version.go @@ -15,9 +15,8 @@ package middleware import ( + "github.com/crowci/crow/v3/version" "github.com/gin-gonic/gin" - - "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 041876d1a..1ab9091b6 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -18,19 +18,18 @@ import ( "net/http" "net/url" + "github.com/crowci/crow/v3/cmd/server/openapi" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/api" + "github.com/crowci/crow/v3/server/api/metrics" + "github.com/crowci/crow/v3/server/router/middleware/header" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/server/router/middleware/token" + "github.com/crowci/crow/v3/server/web" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" openapi_files "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" - - "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 5a6936eb5..4ac3c3603 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/v3/server/forge" - "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" ) type combined struct { diff --git a/server/services/config/combined_test.go b/server/services/config/combined_test.go index 6097f9805..0a15ba668 100644 --- a/server/services/config/combined_test.go +++ b/server/services/config/combined_test.go @@ -27,14 +27,13 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/forge/mocks" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/yaronf/httpsign" - - "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 93affef73..3c596acde 100644 --- a/server/services/config/forge.go +++ b/server/services/config/forge.go @@ -21,12 +21,11 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/shared/constant" "github.com/rs/zerolog/log" - - "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 898d511e4..e7f8eae3a 100644 --- a/server/services/config/forge_test.go +++ b/server/services/config/forge_test.go @@ -21,13 +21,12 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/forge/mocks" + forge_types "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/config" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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 9e6c04f8e..ccf9f7abd 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/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" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/utils" ) type http struct { diff --git a/server/services/config/mocks/service.go b/server/services/config/mocks/service.go index ca6989af1..f71445fc7 100644 --- a/server/services/config/mocks/service.go +++ b/server/services/config/mocks/service.go @@ -5,12 +5,10 @@ package mocks import ( context "context" + forge "github.com/crowci/crow/v3/server/forge" + types "github.com/crowci/crow/v3/server/forge/types" + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - forge "go.woodpecker-ci.org/woodpecker/v3/server/forge" - - model "go.woodpecker-ci.org/woodpecker/v3/server/model" - - 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 b1d100d7a..aecee87bd 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/v3/server/forge" - "go.woodpecker-ci.org/woodpecker/v3/server/forge/types" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/forge/types" + "github.com/crowci/crow/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 00d6e3983..b5866a009 100644 --- a/server/services/encryption/aes.go +++ b/server/services/encryption/aes.go @@ -19,10 +19,9 @@ import ( "encoding/base64" "fmt" + "github.com/crowci/crow/v3/server/services/encryption/types" + "github.com/crowci/crow/v3/server/store" "github.com/google/tink/go/subtle/random" - - "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 e742b2e6c..f69948826 100644 --- a/server/services/encryption/aes_builder.go +++ b/server/services/encryption/aes_builder.go @@ -18,10 +18,9 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server/services/encryption/types" + "github.com/crowci/crow/v3/server/store" "github.com/urfave/cli/v3" - - "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 3eb1ce1c8..3e8f547cb 100644 --- a/server/services/encryption/aes_encryption.go +++ b/server/services/encryption/aes_encryption.go @@ -20,10 +20,9 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server/store/types" "golang.org/x/crypto/bcrypt" "golang.org/x/crypto/sha3" - - "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 a6c9ded1e..bbadbd2ec 100644 --- a/server/services/encryption/encryption.go +++ b/server/services/encryption/encryption.go @@ -17,10 +17,9 @@ package encryption import ( "fmt" + "github.com/crowci/crow/v3/server/services/encryption/types" + "github.com/crowci/crow/v3/server/store" "github.com/urfave/cli/v3" - - "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 2ccf14b8f..f6812dc8c 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/v3/server/services/encryption/types" - storeTypes "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "github.com/crowci/crow/v3/server/services/encryption/types" + storeTypes "github.com/crowci/crow/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 dd81865ba..424c6d581 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/v3/server/services/encryption/types" +import "github.com/crowci/crow/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 033315be7..da0923025 100644 --- a/server/services/encryption/tink.go +++ b/server/services/encryption/tink.go @@ -18,11 +18,10 @@ import ( "encoding/base64" "fmt" + "github.com/crowci/crow/v3/server/services/encryption/types" + "github.com/crowci/crow/v3/server/store" "github.com/fsnotify/fsnotify" "github.com/google/tink/go/tink" - - "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 6bb9457c1..50986424d 100644 --- a/server/services/encryption/tink_builder.go +++ b/server/services/encryption/tink_builder.go @@ -18,10 +18,9 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server/services/encryption/types" + "github.com/crowci/crow/v3/server/store" "github.com/urfave/cli/v3" - - "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 a3e7ae4b3..63d48b1bb 100644 --- a/server/services/encryption/tink_keyset.go +++ b/server/services/encryption/tink_keyset.go @@ -20,12 +20,11 @@ import ( "os" "strconv" + "github.com/crowci/crow/v3/server/store/types" "github.com/google/tink/go/aead" insecure_clear_text_keyset "github.com/google/tink/go/insecurecleartextkeyset" "github.com/google/tink/go/keyset" "github.com/rs/zerolog/log" - - "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 36f58c194..372871302 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/v3/server/model" + "github.com/crowci/crow/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 92707ebc1..ec3f3920f 100644 --- a/server/services/encryption/wrapper/store/secret_store_wrapper.go +++ b/server/services/encryption/wrapper/store/secret_store_wrapper.go @@ -19,10 +19,9 @@ import ( "fmt" "strconv" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/encryption/types" "github.com/rs/zerolog/log" - - "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 9d85dff54..fb280ef75 100644 --- a/server/services/environment/mocks/service.go +++ b/server/services/environment/mocks/service.go @@ -3,8 +3,8 @@ package mocks import ( + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - 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 e7cbe7e74..1b51ac693 100644 --- a/server/services/environment/parse.go +++ b/server/services/environment/parse.go @@ -17,9 +17,8 @@ package environment import ( "strings" + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" - - "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 ac8bfff98..a41ccae35 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/v3/server/model" +import "github.com/crowci/crow/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 7a24dc5f7..4b2117a4e 100644 --- a/server/services/log/file/file.go +++ b/server/services/log/file/file.go @@ -8,11 +8,10 @@ import ( "path/filepath" "strings" + "github.com/crowci/crow/v3/pipeline" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/log" logger "github.com/rs/zerolog/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 e922b89ee..cbb112912 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/v3/server/model" +import "github.com/crowci/crow/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 ca101f2bf..01f0017ed 100644 --- a/server/services/manager.go +++ b/server/services/manager.go @@ -18,16 +18,15 @@ import ( "crypto" "time" + "github.com/crowci/crow/v3/server/forge" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/config" + "github.com/crowci/crow/v3/server/services/environment" + "github.com/crowci/crow/v3/server/services/registry" + "github.com/crowci/crow/v3/server/services/secret" + "github.com/crowci/crow/v3/server/store" "github.com/jellydator/ttlcache/v3" "github.com/urfave/cli/v3" - - "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 c2e071296..6000d6d3b 100644 --- a/server/services/mocks/manager.go +++ b/server/services/mocks/manager.go @@ -8,19 +8,13 @@ package mocks import ( crypto "crypto" - config "go.woodpecker-ci.org/woodpecker/v3/server/services/config" - - environment "go.woodpecker-ci.org/woodpecker/v3/server/services/environment" - - forge "go.woodpecker-ci.org/woodpecker/v3/server/forge" - + forge "github.com/crowci/crow/v3/server/forge" + model "github.com/crowci/crow/v3/server/model" + config "github.com/crowci/crow/v3/server/services/config" + environment "github.com/crowci/crow/v3/server/services/environment" + registry "github.com/crowci/crow/v3/server/services/registry" + secret "github.com/crowci/crow/v3/server/services/secret" mock "github.com/stretchr/testify/mock" - - model "go.woodpecker-ci.org/woodpecker/v3/server/model" - - registry "go.woodpecker-ci.org/woodpecker/v3/server/services/registry" - - 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 86bd5500a..79ce40a5d 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 f7cbb55b9..4d5254748 100644 --- a/server/services/permissions/admins_test.go +++ b/server/services/permissions/admins_test.go @@ -3,9 +3,8 @@ package permissions import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 312ed8ea9..49001bb7b 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 e7ead62b6..ca5ea867b 100644 --- a/server/services/permissions/orgs_test.go +++ b/server/services/permissions/orgs_test.go @@ -3,9 +3,8 @@ package permissions import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 07db15a1e..88fff7aa5 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/shared/utils" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/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 77206eb79..52e520570 100644 --- a/server/services/permissions/repo_owners_test.go +++ b/server/services/permissions/repo_owners_test.go @@ -3,9 +3,8 @@ package permissions import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 0cb551156..16097914a 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store/types" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" ) type combined struct { diff --git a/server/services/registry/db.go b/server/services/registry/db.go index efdb2c8c4..3c451d491 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" ) type db struct { diff --git a/server/services/registry/filesystem.go b/server/services/registry/filesystem.go index cfcb0c883..b09da9384 100644 --- a/server/services/registry/filesystem.go +++ b/server/services/registry/filesystem.go @@ -21,11 +21,10 @@ import ( "os" "strings" + "github.com/crowci/crow/v3/server/model" + model_types "github.com/crowci/crow/v3/server/store/types" config_file "github.com/docker/cli/cli/config/configfile" "github.com/docker/cli/cli/config/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 49cf1e8e2..427363071 100644 --- a/server/services/registry/mocks/service.go +++ b/server/services/registry/mocks/service.go @@ -3,8 +3,8 @@ package mocks import ( + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - 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 a2fc03979..f3b4f4c50 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/v3/server/model" +import "github.com/crowci/crow/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 25e779e3d..5504ff515 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/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store" ) type db struct { diff --git a/server/services/secret/db_test.go b/server/services/secret/db_test.go index c966a7f9b..46fbbddf3 100644 --- a/server/services/secret/db_test.go +++ b/server/services/secret/db_test.go @@ -17,12 +17,11 @@ package secret_test import ( "testing" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/secret" + mocks_store "github.com/crowci/crow/v3/server/store/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - - "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" ) var ( diff --git a/server/services/secret/mocks/service.go b/server/services/secret/mocks/service.go index d918d625b..77b235c98 100644 --- a/server/services/secret/mocks/service.go +++ b/server/services/secret/mocks/service.go @@ -3,8 +3,8 @@ package mocks import ( + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - 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 8bc691d2e..70dffd539 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/v3/server/model" +import "github.com/crowci/crow/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 dca0c4195..b054bcf0b 100644 --- a/server/services/setup.go +++ b/server/services/setup.go @@ -23,15 +23,14 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/services/config" + "github.com/crowci/crow/v3/server/services/registry" + "github.com/crowci/crow/v3/server/services/secret" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/types" "github.com/rs/zerolog/log" "github.com/urfave/cli/v3" - - "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 d3289abd9..5324db5e8 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/v3/server/model" + "github.com/crowci/crow/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 71495b460..7a1892f16 100644 --- a/server/store/datastore/agent_test.go +++ b/server/store/datastore/agent_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 765d5ed86..c1f3ffbcf 100644 --- a/server/store/datastore/config.go +++ b/server/store/datastore/config.go @@ -19,11 +19,10 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "xorm.io/builder" "xorm.io/xorm" - - "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 81a0114d0..a17a0ba44 100644 --- a/server/store/datastore/config_test.go +++ b/server/store/datastore/config_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) var ( diff --git a/server/store/datastore/cron.go b/server/store/datastore/cron.go index e790c74c9..d1e05990f 100644 --- a/server/store/datastore/cron.go +++ b/server/store/datastore/cron.go @@ -15,9 +15,8 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" - - "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 88710f91f..da1b8306c 100644 --- a/server/store/datastore/cron_test.go +++ b/server/store/datastore/cron_test.go @@ -18,9 +18,8 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 e7494b484..359a54f80 100644 --- a/server/store/datastore/engine.go +++ b/server/store/datastore/engine.go @@ -17,12 +17,11 @@ package datastore import ( "context" + "github.com/crowci/crow/v3/server/store" + "github.com/crowci/crow/v3/server/store/datastore/migration" "github.com/rs/zerolog" "xorm.io/xorm" xlog "xorm.io/xorm/log" - - "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 c2668e8aa..ad506ede2 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/v3/server/store/types" + "github.com/crowci/crow/v3/server/store/types" ) type ErrorRepoNotExist struct { diff --git a/server/store/datastore/feed.go b/server/store/datastore/feed.go index 8be597f05..0be3fea0a 100644 --- a/server/store/datastore/feed.go +++ b/server/store/datastore/feed.go @@ -15,9 +15,8 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" - - "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 d8adb8c53..bc8860667 100644 --- a/server/store/datastore/feed_test.go +++ b/server/store/datastore/feed_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 8e30bd974..66d1ec09d 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/v3/server/model" + "github.com/crowci/crow/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 1f163bf08..d64a0554c 100644 --- a/server/store/datastore/forge_test.go +++ b/server/store/datastore/forge_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 4f2c2650a..649af4bbe 100644 --- a/server/store/datastore/helper.go +++ b/server/store/datastore/helper.go @@ -19,10 +19,9 @@ import ( "runtime" "strings" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "xorm.io/xorm" - - "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 c694d46bf..0be86f500 100644 --- a/server/store/datastore/helper_test.go +++ b/server/store/datastore/helper_test.go @@ -18,9 +18,8 @@ import ( "errors" "testing" + "github.com/crowci/crow/v3/server/store/types" "github.com/stretchr/testify/assert" - - "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 ade01c08c..8b6dded27 100644 --- a/server/store/datastore/log.go +++ b/server/store/datastore/log.go @@ -15,10 +15,9 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "github.com/rs/zerolog/log" "xorm.io/xorm" - - "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 1c331ff78..e7ecc66c2 100644 --- a/server/store/datastore/log_test.go +++ b/server/store/datastore/log_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 5387a8ae0..02badc8ae 100644 --- a/server/store/datastore/migration/008_set_default_forge_id.go +++ b/server/store/datastore/migration/008_set_default_forge_id.go @@ -17,10 +17,9 @@ package migration import ( "fmt" + "github.com/crowci/crow/v3/server/model" "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - - "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 c99290259..377ed1574 100644 --- a/server/store/datastore/migration/011_cron_without_sec.go +++ b/server/store/datastore/migration/011_cron_without_sec.go @@ -18,10 +18,9 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/server/model" "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - - "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 045ce980e..d8e8db26f 100644 --- a/server/store/datastore/migration/015_add_org_agents.go +++ b/server/store/datastore/migration/015_add_org_agents.go @@ -17,10 +17,9 @@ package migration import ( "fmt" + "github.com/crowci/crow/v3/server/model" "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - - "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 a03fa86c2..c0ccce00d 100644 --- a/server/store/datastore/migration/017_split_trusted.go +++ b/server/store/datastore/migration/017_split_trusted.go @@ -17,10 +17,9 @@ package migration import ( "fmt" + "github.com/crowci/crow/v3/server/model" "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - - "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 d056aad56..0c91e9fe5 100644 --- a/server/store/datastore/migration/migration.go +++ b/server/store/datastore/migration/migration.go @@ -19,10 +19,9 @@ import ( "fmt" "reflect" + "github.com/crowci/crow/v3/server/model" "src.techknowlogick.com/xormigrate" "xorm.io/xorm" - - "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 e9d305d51..e8bb3e4cd 100644 --- a/server/store/datastore/org.go +++ b/server/store/datastore/org.go @@ -18,9 +18,8 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/server/model" "xorm.io/xorm" - - "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 5136708f5..ec274151e 100644 --- a/server/store/datastore/org_test.go +++ b/server/store/datastore/org_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 63a6e3dc6..fa964eda5 100644 --- a/server/store/datastore/permission.go +++ b/server/store/datastore/permission.go @@ -17,10 +17,9 @@ package datastore import ( "fmt" + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" "xorm.io/xorm" - - "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 45882c7c2..42145b61d 100644 --- a/server/store/datastore/permission_test.go +++ b/server/store/datastore/permission_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 14eff95c8..b2582f5c7 100644 --- a/server/store/datastore/pipeline.go +++ b/server/store/datastore/pipeline.go @@ -17,10 +17,9 @@ package datastore import ( "time" + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" "xorm.io/xorm" - - "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 fed95149b..4a8cde552 100644 --- a/server/store/datastore/pipeline_test.go +++ b/server/store/datastore/pipeline_test.go @@ -19,10 +19,9 @@ import ( "testing" "time" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "github.com/stretchr/testify/assert" - - "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 637c36d65..6bb6fcd27 100644 --- a/server/store/datastore/redirection.go +++ b/server/store/datastore/redirection.go @@ -15,10 +15,9 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" "xorm.io/xorm" - - "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 ba59c6a24..a9b478f68 100644 --- a/server/store/datastore/redirection_test.go +++ b/server/store/datastore/redirection_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 e1ba9368a..357e93f22 100644 --- a/server/store/datastore/registry.go +++ b/server/store/datastore/registry.go @@ -15,9 +15,8 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" - - "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 a1cbfa0d8..a4e872919 100644 --- a/server/store/datastore/registry_test.go +++ b/server/store/datastore/registry_test.go @@ -17,11 +17,10 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - - "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 559591bd4..f04e7d7b0 100644 --- a/server/store/datastore/repo.go +++ b/server/store/datastore/repo.go @@ -19,11 +19,10 @@ import ( "fmt" "strings" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "xorm.io/builder" "xorm.io/xorm" - - "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 97ac3723f..3b9767a52 100644 --- a/server/store/datastore/repo_test.go +++ b/server/store/datastore/repo_test.go @@ -18,9 +18,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" ) func TestCreateRepo(t *testing.T) { diff --git a/server/store/datastore/secret.go b/server/store/datastore/secret.go index 0b508c85b..73456963d 100644 --- a/server/store/datastore/secret.go +++ b/server/store/datastore/secret.go @@ -15,9 +15,8 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" - - "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 d96438660..24e48dafd 100644 --- a/server/store/datastore/secret_test.go +++ b/server/store/datastore/secret_test.go @@ -18,9 +18,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 c1985deb5..4edd5b5c8 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/v3/server/model" +import "github.com/crowci/crow/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 f37ef4c68..7e6d98c1e 100644 --- a/server/store/datastore/server_config_test.go +++ b/server/store/datastore/server_config_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 6f81bea11..c6607798e 100644 --- a/server/store/datastore/step.go +++ b/server/store/datastore/step.go @@ -15,10 +15,9 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/builder" "xorm.io/xorm" - - "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 95d7bba88..4ea958f27 100644 --- a/server/store/datastore/step_test.go +++ b/server/store/datastore/step_test.go @@ -18,10 +18,9 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "github.com/stretchr/testify/assert" - - "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 40f95963b..2d5b49ed3 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/v3/server/model" + "github.com/crowci/crow/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 c32ae191b..432ac6ffc 100644 --- a/server/store/datastore/task_test.go +++ b/server/store/datastore/task_test.go @@ -17,9 +17,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 990e7894f..4c7a23ce0 100644 --- a/server/store/datastore/user.go +++ b/server/store/datastore/user.go @@ -18,10 +18,9 @@ import ( "errors" "fmt" + "github.com/crowci/crow/v3/server/model" + "github.com/crowci/crow/v3/server/store/types" "xorm.io/xorm" - - "go.woodpecker-ci.org/woodpecker/v3/server/model" - "go.woodpecker-ci.org/woodpecker/v3/server/store/types" ) func (s storage) GetUser(id int64) (*model.User, error) { diff --git a/server/store/datastore/user_test.go b/server/store/datastore/user_test.go index 410daa36f..ed4cc96ee 100644 --- a/server/store/datastore/user_test.go +++ b/server/store/datastore/user_test.go @@ -18,9 +18,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 714c7a674..c97860807 100644 --- a/server/store/datastore/workflow.go +++ b/server/store/datastore/workflow.go @@ -15,9 +15,8 @@ package datastore import ( + "github.com/crowci/crow/v3/server/model" "xorm.io/xorm" - - "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 5a31646a2..4a69ffa7c 100644 --- a/server/store/datastore/workflow_test.go +++ b/server/store/datastore/workflow_test.go @@ -18,9 +18,8 @@ package datastore import ( "testing" + "github.com/crowci/crow/v3/server/model" "github.com/stretchr/testify/assert" - - "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 a35d8a655..22eca74b9 100644 --- a/server/store/mocks/store.go +++ b/server/store/mocks/store.go @@ -8,8 +8,8 @@ package mocks import ( context "context" + model "github.com/crowci/crow/v3/server/model" mock "github.com/stretchr/testify/mock" - 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 18a6f766a..90ea240e7 100644 --- a/server/store/store.go +++ b/server/store/store.go @@ -19,7 +19,7 @@ package store import ( "context" - "go.woodpecker-ci.org/woodpecker/v3/server/model" + "github.com/crowci/crow/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 48fed96ea..ef959b786 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -20,13 +20,12 @@ import ( "strconv" "text/template" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/server/router/middleware/session" + "github.com/crowci/crow/v3/shared/token" + "github.com/crowci/crow/v3/version" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 68a7be487..d8bf21de2 100644 --- a/server/web/web.go +++ b/server/web/web.go @@ -24,11 +24,10 @@ import ( "strings" "time" + "github.com/crowci/crow/v3/server" + "github.com/crowci/crow/v3/web" "github.com/gin-gonic/gin" "github.com/rs/zerolog/log" - - "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 c23c704d1..5d0fc3abc 100644 --- a/server/web/web_test.go +++ b/server/web/web_test.go @@ -20,10 +20,9 @@ import ( "os" "testing" + "github.com/crowci/crow/v3/server" "github.com/gin-gonic/gin" "github.com/stretchr/testify/assert" - - "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 0c1f3b973..0478b1668 100644 --- a/shared/token/token_test.go +++ b/shared/token/token_test.go @@ -3,10 +3,9 @@ package token_test import ( "testing" + "github.com/crowci/crow/v3/shared/token" "github.com/golang-jwt/jwt/v5" "github.com/stretchr/testify/assert" - - "go.woodpecker-ci.org/woodpecker/v3/shared/token" ) const jwtSecret = "secret-to-sign-the-token" diff --git a/woodpecker-go/README.md b/woodpecker-go/README.md index 9ff1cfc8a..f549177a9 100644 --- a/woodpecker-go/README.md +++ b/woodpecker-go/README.md @@ -2,7 +2,7 @@ ```Go import ( - "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" + "github.com/crowci/crow/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 14472581c..fbfb07684 100644 --- a/woodpecker-go/woodpecker/mocks/client.go +++ b/woodpecker-go/woodpecker/mocks/client.go @@ -8,8 +8,8 @@ package mocks import ( http "net/http" + woodpecker "github.com/crowci/crow/v3/woodpecker-go/woodpecker" mock "github.com/stretchr/testify/mock" - woodpecker "go.woodpecker-ci.org/woodpecker/v3/woodpecker-go/woodpecker" ) // Client is an autogenerated mock type for the Client type