From 780c902a6b837b239e2e3515ab613bbc61666b0f Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Thu, 23 Sep 2021 11:25:51 -0500 Subject: [PATCH] Refactor: move remote/ to server/remote/ (#344) --- cmd/server/server.go | 2 +- cmd/server/setup.go | 18 +++++++++--------- server/api/build.go | 2 +- server/api/hook.go | 2 +- server/api/login.go | 2 +- server/api/repo.go | 2 +- server/api/user.go | 2 +- server/grpc/rpc.go | 2 +- .../remote}/bitbucket/bitbucket.go | 4 ++-- .../remote}/bitbucket/bitbucket_test.go | 4 ++-- {remote => server/remote}/bitbucket/convert.go | 2 +- .../remote}/bitbucket/convert_test.go | 2 +- .../remote}/bitbucket/fixtures/handler.go | 0 .../remote}/bitbucket/fixtures/hooks.go | 0 .../remote}/bitbucket/internal/client.go | 0 .../remote}/bitbucket/internal/types.go | 0 {remote => server/remote}/bitbucket/parse.go | 2 +- .../remote}/bitbucket/parse_test.go | 2 +- .../remote}/bitbucketserver/bitbucketserver.go | 4 ++-- .../remote}/bitbucketserver/convert.go | 2 +- .../remote}/bitbucketserver/convert_test.go | 2 +- .../remote}/bitbucketserver/internal/client.go | 0 .../remote}/bitbucketserver/internal/types.go | 0 .../remote}/bitbucketserver/parse.go | 2 +- {remote => server/remote}/coding/coding.go | 4 ++-- .../remote}/coding/coding_test.go | 2 +- .../remote}/coding/fixtures/handler.go | 0 .../remote}/coding/fixtures/hooks.go | 0 {remote => server/remote}/coding/hook.go | 0 {remote => server/remote}/coding/hook_test.go | 2 +- .../remote}/coding/internal/coding.go | 0 .../remote}/coding/internal/error.go | 0 .../remote}/coding/internal/file.go | 0 .../remote}/coding/internal/project.go | 0 .../remote}/coding/internal/user.go | 0 .../remote}/coding/internal/webhook.go | 0 {remote => server/remote}/coding/util.go | 0 {remote => server/remote}/coding/util_test.go | 0 {remote => server/remote}/context.go | 0 {remote => server/remote}/errors.go | 0 {remote => server/remote}/gerrit/gerrit.go | 2 +- .../remote}/gitea/fixtures/handler.go | 0 .../remote}/gitea/fixtures/hooks.go | 0 {remote => server/remote}/gitea/gitea.go | 2 +- {remote => server/remote}/gitea/gitea_oauth.go | 2 +- {remote => server/remote}/gitea/gitea_test.go | 2 +- {remote => server/remote}/gitea/helper.go | 0 {remote => server/remote}/gitea/helper_test.go | 2 +- {remote => server/remote}/gitea/parse.go | 0 {remote => server/remote}/gitea/parse_test.go | 2 +- {remote => server/remote}/gitea/types.go | 0 {remote => server/remote}/github/convert.go | 0 .../remote}/github/convert_test.go | 0 .../remote}/github/fixtures/handler.go | 0 .../remote}/github/fixtures/hooks.go | 0 {remote => server/remote}/github/github.go | 2 +- .../remote}/github/github_test.go | 2 +- {remote => server/remote}/github/parse.go | 0 {remote => server/remote}/github/parse_test.go | 2 +- {remote => server/remote}/github/types.go | 0 .../remote}/gitlab/client/drone.go | 0 .../remote}/gitlab/client/gitlab.go | 0 .../remote}/gitlab/client/groups.go | 0 .../remote}/gitlab/client/hook.go | 0 .../remote}/gitlab/client/project.go | 0 .../remote}/gitlab/client/types.go | 0 .../remote}/gitlab/client/user.go | 0 .../remote}/gitlab/client/util.go | 0 {remote => server/remote}/gitlab/gitlab.go | 4 ++-- .../remote}/gitlab/gitlab_test.go | 2 +- {remote => server/remote}/gitlab/helper.go | 2 +- .../remote}/gitlab/testdata/hooks.go | 0 .../remote}/gitlab/testdata/oauth.go | 0 .../remote}/gitlab/testdata/projects.go | 0 .../remote}/gitlab/testdata/testdata.go | 0 .../remote}/gitlab/testdata/users.go | 0 .../remote}/gitlab3/client/drone.go | 0 .../remote}/gitlab3/client/gitlab.go | 0 .../remote}/gitlab3/client/groups.go | 0 .../remote}/gitlab3/client/hook.go | 0 .../remote}/gitlab3/client/project.go | 0 .../remote}/gitlab3/client/types.go | 0 .../remote}/gitlab3/client/user.go | 0 .../remote}/gitlab3/client/util.go | 0 {remote => server/remote}/gitlab3/gitlab.go | 4 ++-- .../remote}/gitlab3/gitlab_test.go | 2 +- {remote => server/remote}/gitlab3/helper.go | 2 +- .../remote}/gitlab3/testdata/hooks.go | 0 .../remote}/gitlab3/testdata/oauth.go | 0 .../remote}/gitlab3/testdata/projects.go | 0 .../remote}/gitlab3/testdata/testdata.go | 0 .../remote}/gitlab3/testdata/users.go | 0 .../remote}/gogs/fixtures/handler.go | 0 .../remote}/gogs/fixtures/hooks.go | 0 {remote => server/remote}/gogs/gogs.go | 2 +- {remote => server/remote}/gogs/gogs_test.go | 2 +- {remote => server/remote}/gogs/helper.go | 0 {remote => server/remote}/gogs/helper_test.go | 2 +- {remote => server/remote}/gogs/parse.go | 0 {remote => server/remote}/gogs/parse_test.go | 0 {remote => server/remote}/gogs/types.go | 0 {remote => server/remote}/mocks/Remote.go | 2 +- {remote => server/remote}/remote.go | 0 server/router/middleware/remote.go | 2 +- server/router/middleware/session/repo.go | 2 +- server/router/middleware/token/token.go | 2 +- server/shared/configFetcher.go | 2 +- server/shared/configFetcher_test.go | 4 ++-- server/shared/procBuilder.go | 2 +- server/shared/procBuilder_test.go | 2 +- server/shared/userSyncer.go | 2 +- 111 files changed, 63 insertions(+), 63 deletions(-) rename {remote => server/remote}/bitbucket/bitbucket.go (98%) rename {remote => server/remote}/bitbucket/bitbucket_test.go (98%) rename {remote => server/remote}/bitbucket/convert.go (98%) rename {remote => server/remote}/bitbucket/convert_test.go (98%) rename {remote => server/remote}/bitbucket/fixtures/handler.go (100%) rename {remote => server/remote}/bitbucket/fixtures/hooks.go (100%) rename {remote => server/remote}/bitbucket/internal/client.go (100%) rename {remote => server/remote}/bitbucket/internal/types.go (100%) rename {remote => server/remote}/bitbucket/parse.go (97%) rename {remote => server/remote}/bitbucket/parse_test.go (97%) rename {remote => server/remote}/bitbucketserver/bitbucketserver.go (98%) rename {remote => server/remote}/bitbucketserver/convert.go (98%) rename {remote => server/remote}/bitbucketserver/convert_test.go (98%) rename {remote => server/remote}/bitbucketserver/internal/client.go (100%) rename {remote => server/remote}/bitbucketserver/internal/types.go (100%) rename {remote => server/remote}/bitbucketserver/parse.go (94%) rename {remote => server/remote}/coding/coding.go (98%) rename {remote => server/remote}/coding/coding_test.go (99%) rename {remote => server/remote}/coding/fixtures/handler.go (100%) rename {remote => server/remote}/coding/fixtures/hooks.go (100%) rename {remote => server/remote}/coding/hook.go (100%) rename {remote => server/remote}/coding/hook_test.go (98%) rename {remote => server/remote}/coding/internal/coding.go (100%) rename {remote => server/remote}/coding/internal/error.go (100%) rename {remote => server/remote}/coding/internal/file.go (100%) rename {remote => server/remote}/coding/internal/project.go (100%) rename {remote => server/remote}/coding/internal/user.go (100%) rename {remote => server/remote}/coding/internal/webhook.go (100%) rename {remote => server/remote}/coding/util.go (100%) rename {remote => server/remote}/coding/util_test.go (100%) rename {remote => server/remote}/context.go (100%) rename {remote => server/remote}/errors.go (100%) rename {remote => server/remote}/gerrit/gerrit.go (98%) rename {remote => server/remote}/gitea/fixtures/handler.go (100%) rename {remote => server/remote}/gitea/fixtures/hooks.go (100%) rename {remote => server/remote}/gitea/gitea.go (99%) rename {remote => server/remote}/gitea/gitea_oauth.go (99%) rename {remote => server/remote}/gitea/gitea_test.go (98%) rename {remote => server/remote}/gitea/helper.go (100%) rename {remote => server/remote}/gitea/helper_test.go (99%) rename {remote => server/remote}/gitea/parse.go (100%) rename {remote => server/remote}/gitea/parse_test.go (96%) rename {remote => server/remote}/gitea/types.go (100%) rename {remote => server/remote}/github/convert.go (100%) rename {remote => server/remote}/github/convert_test.go (100%) rename {remote => server/remote}/github/fixtures/handler.go (100%) rename {remote => server/remote}/github/fixtures/hooks.go (100%) rename {remote => server/remote}/github/github.go (99%) rename {remote => server/remote}/github/github_test.go (98%) rename {remote => server/remote}/github/parse.go (100%) rename {remote => server/remote}/github/parse_test.go (98%) rename {remote => server/remote}/github/types.go (100%) rename {remote => server/remote}/gitlab/client/drone.go (100%) rename {remote => server/remote}/gitlab/client/gitlab.go (100%) rename {remote => server/remote}/gitlab/client/groups.go (100%) rename {remote => server/remote}/gitlab/client/hook.go (100%) rename {remote => server/remote}/gitlab/client/project.go (100%) rename {remote => server/remote}/gitlab/client/types.go (100%) rename {remote => server/remote}/gitlab/client/user.go (100%) rename {remote => server/remote}/gitlab/client/util.go (100%) rename {remote => server/remote}/gitlab/gitlab.go (99%) rename {remote => server/remote}/gitlab/gitlab_test.go (99%) rename {remote => server/remote}/gitlab/helper.go (98%) rename {remote => server/remote}/gitlab/testdata/hooks.go (100%) rename {remote => server/remote}/gitlab/testdata/oauth.go (100%) rename {remote => server/remote}/gitlab/testdata/projects.go (100%) rename {remote => server/remote}/gitlab/testdata/testdata.go (100%) rename {remote => server/remote}/gitlab/testdata/users.go (100%) rename {remote => server/remote}/gitlab3/client/drone.go (100%) rename {remote => server/remote}/gitlab3/client/gitlab.go (100%) rename {remote => server/remote}/gitlab3/client/groups.go (100%) rename {remote => server/remote}/gitlab3/client/hook.go (100%) rename {remote => server/remote}/gitlab3/client/project.go (100%) rename {remote => server/remote}/gitlab3/client/types.go (100%) rename {remote => server/remote}/gitlab3/client/user.go (100%) rename {remote => server/remote}/gitlab3/client/util.go (100%) rename {remote => server/remote}/gitlab3/gitlab.go (99%) rename {remote => server/remote}/gitlab3/gitlab_test.go (99%) rename {remote => server/remote}/gitlab3/helper.go (98%) rename {remote => server/remote}/gitlab3/testdata/hooks.go (100%) rename {remote => server/remote}/gitlab3/testdata/oauth.go (100%) rename {remote => server/remote}/gitlab3/testdata/projects.go (100%) rename {remote => server/remote}/gitlab3/testdata/testdata.go (100%) rename {remote => server/remote}/gitlab3/testdata/users.go (100%) rename {remote => server/remote}/gogs/fixtures/handler.go (100%) rename {remote => server/remote}/gogs/fixtures/hooks.go (100%) rename {remote => server/remote}/gogs/gogs.go (99%) rename {remote => server/remote}/gogs/gogs_test.go (98%) rename {remote => server/remote}/gogs/helper.go (100%) rename {remote => server/remote}/gogs/helper_test.go (99%) rename {remote => server/remote}/gogs/parse.go (100%) rename {remote => server/remote}/gogs/parse_test.go (100%) rename {remote => server/remote}/gogs/types.go (100%) rename {remote => server/remote}/mocks/Remote.go (99%) rename {remote => server/remote}/remote.go (100%) diff --git a/cmd/server/server.go b/cmd/server/server.go index 3b1f4436b..80631de65 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -36,10 +36,10 @@ import ( "github.com/woodpecker-ci/woodpecker/cncd/logging" "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto" "github.com/woodpecker-ci/woodpecker/cncd/pubsub" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc" "github.com/woodpecker-ci/woodpecker/server/plugins/sender" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router" "github.com/woodpecker-ci/woodpecker/server/router/middleware" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/cmd/server/setup.go b/cmd/server/setup.go index bac326425..b2e26fd3e 100644 --- a/cmd/server/setup.go +++ b/cmd/server/setup.go @@ -23,19 +23,19 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/woodpecker-ci/woodpecker/cncd/queue" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket" - "github.com/woodpecker-ci/woodpecker/remote/bitbucketserver" - "github.com/woodpecker-ci/woodpecker/remote/coding" - "github.com/woodpecker-ci/woodpecker/remote/gitea" - "github.com/woodpecker-ci/woodpecker/remote/github" - "github.com/woodpecker-ci/woodpecker/remote/gitlab" - "github.com/woodpecker-ci/woodpecker/remote/gitlab3" - "github.com/woodpecker-ci/woodpecker/remote/gogs" "github.com/woodpecker-ci/woodpecker/server" "github.com/woodpecker-ci/woodpecker/server/plugins/environments" "github.com/woodpecker-ci/woodpecker/server/plugins/registry" "github.com/woodpecker-ci/woodpecker/server/plugins/secrets" + "github.com/woodpecker-ci/woodpecker/server/remote" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver" + "github.com/woodpecker-ci/woodpecker/server/remote/coding" + "github.com/woodpecker-ci/woodpecker/server/remote/gitea" + "github.com/woodpecker-ci/woodpecker/server/remote/github" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab3" + "github.com/woodpecker-ci/woodpecker/server/remote/gogs" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/server/store/datastore" "github.com/woodpecker-ci/woodpecker/server/web" diff --git a/server/api/build.go b/server/api/build.go index 19660e677..9254a28d3 100644 --- a/server/api/build.go +++ b/server/api/build.go @@ -31,8 +31,8 @@ import ( "github.com/sirupsen/logrus" "github.com/woodpecker-ci/woodpecker/cncd/queue" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/shared" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/api/hook.go b/server/api/hook.go index 12d9844ff..d8a9b52e1 100644 --- a/server/api/hook.go +++ b/server/api/hook.go @@ -32,7 +32,6 @@ import ( "github.com/sirupsen/logrus" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/shared/token" "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml" @@ -40,6 +39,7 @@ import ( "github.com/woodpecker-ci/woodpecker/cncd/pubsub" "github.com/woodpecker-ci/woodpecker/cncd/queue" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/shared" "github.com/woodpecker-ci/woodpecker/server/store" ) diff --git a/server/api/login.go b/server/api/login.go index 221640fe7..842e21a49 100644 --- a/server/api/login.go +++ b/server/api/login.go @@ -21,8 +21,8 @@ import ( "github.com/gorilla/securecookie" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/shared/httputil" "github.com/woodpecker-ci/woodpecker/shared/token" diff --git a/server/api/repo.go b/server/api/repo.go index c2331d921..b89ebb023 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -24,8 +24,8 @@ import ( "github.com/gorilla/securecookie" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/woodpecker/shared/token" diff --git a/server/api/user.go b/server/api/user.go index 9c7fe7c1d..8dcab69a5 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -25,7 +25,7 @@ import ( "github.com/sirupsen/logrus" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/shared" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/grpc/rpc.go b/server/grpc/rpc.go index a2c64353d..26d4b6b7b 100644 --- a/server/grpc/rpc.go +++ b/server/grpc/rpc.go @@ -41,7 +41,7 @@ import ( "github.com/woodpecker-ci/woodpecker/server/shared" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/woodpecker-ci/expr" diff --git a/remote/bitbucket/bitbucket.go b/server/remote/bitbucket/bitbucket.go similarity index 98% rename from remote/bitbucket/bitbucket.go rename to server/remote/bitbucket/bitbucket.go index ce5f54a9f..26361c9cb 100644 --- a/remote/bitbucket/bitbucket.go +++ b/server/remote/bitbucket/bitbucket.go @@ -20,9 +20,9 @@ import ( "net/url" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "golang.org/x/oauth2" ) diff --git a/remote/bitbucket/bitbucket_test.go b/server/remote/bitbucket/bitbucket_test.go similarity index 98% rename from remote/bitbucket/bitbucket_test.go rename to server/remote/bitbucket/bitbucket_test.go index 6d41a56c1..b0d8270a4 100644 --- a/remote/bitbucket/bitbucket_test.go +++ b/server/remote/bitbucket/bitbucket_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/fixtures" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "github.com/franela/goblin" "github.com/gin-gonic/gin" diff --git a/remote/bitbucket/convert.go b/server/remote/bitbucket/convert.go similarity index 98% rename from remote/bitbucket/convert.go rename to server/remote/bitbucket/convert.go index ac33147bb..f2346c610 100644 --- a/remote/bitbucket/convert.go +++ b/server/remote/bitbucket/convert.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "golang.org/x/oauth2" ) diff --git a/remote/bitbucket/convert_test.go b/server/remote/bitbucket/convert_test.go similarity index 98% rename from remote/bitbucket/convert_test.go rename to server/remote/bitbucket/convert_test.go index f1da400c3..08b52ea13 100644 --- a/remote/bitbucket/convert_test.go +++ b/server/remote/bitbucket/convert_test.go @@ -19,7 +19,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" "github.com/franela/goblin" "golang.org/x/oauth2" diff --git a/remote/bitbucket/fixtures/handler.go b/server/remote/bitbucket/fixtures/handler.go similarity index 100% rename from remote/bitbucket/fixtures/handler.go rename to server/remote/bitbucket/fixtures/handler.go diff --git a/remote/bitbucket/fixtures/hooks.go b/server/remote/bitbucket/fixtures/hooks.go similarity index 100% rename from remote/bitbucket/fixtures/hooks.go rename to server/remote/bitbucket/fixtures/hooks.go diff --git a/remote/bitbucket/internal/client.go b/server/remote/bitbucket/internal/client.go similarity index 100% rename from remote/bitbucket/internal/client.go rename to server/remote/bitbucket/internal/client.go diff --git a/remote/bitbucket/internal/types.go b/server/remote/bitbucket/internal/types.go similarity index 100% rename from remote/bitbucket/internal/types.go rename to server/remote/bitbucket/internal/types.go diff --git a/remote/bitbucket/parse.go b/server/remote/bitbucket/parse.go similarity index 97% rename from remote/bitbucket/parse.go rename to server/remote/bitbucket/parse.go index ca165e690..3107b98da 100644 --- a/remote/bitbucket/parse.go +++ b/server/remote/bitbucket/parse.go @@ -20,7 +20,7 @@ import ( "net/http" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal" ) const ( diff --git a/remote/bitbucket/parse_test.go b/server/remote/bitbucket/parse_test.go similarity index 97% rename from remote/bitbucket/parse_test.go rename to server/remote/bitbucket/parse_test.go index bb0cf7d25..7fd928d38 100644 --- a/remote/bitbucket/parse_test.go +++ b/server/remote/bitbucket/parse_test.go @@ -19,7 +19,7 @@ import ( "net/http" "testing" - "github.com/woodpecker-ci/woodpecker/remote/bitbucket/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/fixtures" "github.com/franela/goblin" ) diff --git a/remote/bitbucketserver/bitbucketserver.go b/server/remote/bitbucketserver/bitbucketserver.go similarity index 98% rename from remote/bitbucketserver/bitbucketserver.go rename to server/remote/bitbucketserver/bitbucketserver.go index ec24d94b0..a3146595e 100644 --- a/remote/bitbucketserver/bitbucketserver.go +++ b/server/remote/bitbucketserver/bitbucketserver.go @@ -30,8 +30,8 @@ import ( "github.com/mrjones/oauth" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal" + "github.com/woodpecker-ci/woodpecker/server/remote" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) const ( diff --git a/remote/bitbucketserver/convert.go b/server/remote/bitbucketserver/convert.go similarity index 98% rename from remote/bitbucketserver/convert.go rename to server/remote/bitbucketserver/convert.go index 1fb3b51ad..9e9a33c32 100644 --- a/remote/bitbucketserver/convert.go +++ b/server/remote/bitbucketserver/convert.go @@ -24,7 +24,7 @@ import ( "github.com/mrjones/oauth" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) const ( diff --git a/remote/bitbucketserver/convert_test.go b/server/remote/bitbucketserver/convert_test.go similarity index 98% rename from remote/bitbucketserver/convert_test.go rename to server/remote/bitbucketserver/convert_test.go index 0a4234803..a71b0cd18 100644 --- a/remote/bitbucketserver/convert_test.go +++ b/server/remote/bitbucketserver/convert_test.go @@ -20,7 +20,7 @@ import ( "github.com/franela/goblin" "github.com/mrjones/oauth" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" ) func Test_helper(t *testing.T) { diff --git a/remote/bitbucketserver/internal/client.go b/server/remote/bitbucketserver/internal/client.go similarity index 100% rename from remote/bitbucketserver/internal/client.go rename to server/remote/bitbucketserver/internal/client.go diff --git a/remote/bitbucketserver/internal/types.go b/server/remote/bitbucketserver/internal/types.go similarity index 100% rename from remote/bitbucketserver/internal/types.go rename to server/remote/bitbucketserver/internal/types.go diff --git a/remote/bitbucketserver/parse.go b/server/remote/bitbucketserver/parse.go similarity index 94% rename from remote/bitbucketserver/parse.go rename to server/remote/bitbucketserver/parse.go index 2f9c5dcbc..494b5f828 100644 --- a/remote/bitbucketserver/parse.go +++ b/server/remote/bitbucketserver/parse.go @@ -18,7 +18,7 @@ import ( "encoding/json" "fmt" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal" + "github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal" "net/http" ) diff --git a/remote/coding/coding.go b/server/remote/coding/coding.go similarity index 98% rename from remote/coding/coding.go rename to server/remote/coding/coding.go index f1715f56e..a1e08fae8 100644 --- a/remote/coding/coding.go +++ b/server/remote/coding/coding.go @@ -21,9 +21,9 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/remote/coding/internal" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" + "github.com/woodpecker-ci/woodpecker/server/remote/coding/internal" "golang.org/x/net/context" "golang.org/x/oauth2" diff --git a/remote/coding/coding_test.go b/server/remote/coding/coding_test.go similarity index 99% rename from remote/coding/coding_test.go rename to server/remote/coding/coding_test.go index 6599a25e6..df7840507 100644 --- a/remote/coding/coding_test.go +++ b/server/remote/coding/coding_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/coding/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures" "github.com/franela/goblin" "github.com/gin-gonic/gin" diff --git a/remote/coding/fixtures/handler.go b/server/remote/coding/fixtures/handler.go similarity index 100% rename from remote/coding/fixtures/handler.go rename to server/remote/coding/fixtures/handler.go diff --git a/remote/coding/fixtures/hooks.go b/server/remote/coding/fixtures/hooks.go similarity index 100% rename from remote/coding/fixtures/hooks.go rename to server/remote/coding/fixtures/hooks.go diff --git a/remote/coding/hook.go b/server/remote/coding/hook.go similarity index 100% rename from remote/coding/hook.go rename to server/remote/coding/hook.go diff --git a/remote/coding/hook_test.go b/server/remote/coding/hook_test.go similarity index 98% rename from remote/coding/hook_test.go rename to server/remote/coding/hook_test.go index 3744d9c6f..dd039d32a 100644 --- a/remote/coding/hook_test.go +++ b/server/remote/coding/hook_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/coding/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures" "github.com/franela/goblin" ) diff --git a/remote/coding/internal/coding.go b/server/remote/coding/internal/coding.go similarity index 100% rename from remote/coding/internal/coding.go rename to server/remote/coding/internal/coding.go diff --git a/remote/coding/internal/error.go b/server/remote/coding/internal/error.go similarity index 100% rename from remote/coding/internal/error.go rename to server/remote/coding/internal/error.go diff --git a/remote/coding/internal/file.go b/server/remote/coding/internal/file.go similarity index 100% rename from remote/coding/internal/file.go rename to server/remote/coding/internal/file.go diff --git a/remote/coding/internal/project.go b/server/remote/coding/internal/project.go similarity index 100% rename from remote/coding/internal/project.go rename to server/remote/coding/internal/project.go diff --git a/remote/coding/internal/user.go b/server/remote/coding/internal/user.go similarity index 100% rename from remote/coding/internal/user.go rename to server/remote/coding/internal/user.go diff --git a/remote/coding/internal/webhook.go b/server/remote/coding/internal/webhook.go similarity index 100% rename from remote/coding/internal/webhook.go rename to server/remote/coding/internal/webhook.go diff --git a/remote/coding/util.go b/server/remote/coding/util.go similarity index 100% rename from remote/coding/util.go rename to server/remote/coding/util.go diff --git a/remote/coding/util_test.go b/server/remote/coding/util_test.go similarity index 100% rename from remote/coding/util_test.go rename to server/remote/coding/util_test.go diff --git a/remote/context.go b/server/remote/context.go similarity index 100% rename from remote/context.go rename to server/remote/context.go diff --git a/remote/errors.go b/server/remote/errors.go similarity index 100% rename from remote/errors.go rename to server/remote/errors.go diff --git a/remote/gerrit/gerrit.go b/server/remote/gerrit/gerrit.go similarity index 98% rename from remote/gerrit/gerrit.go rename to server/remote/gerrit/gerrit.go index 208f79aad..1109d8e45 100644 --- a/remote/gerrit/gerrit.go +++ b/server/remote/gerrit/gerrit.go @@ -21,7 +21,7 @@ import ( "net/url" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) // IMPORTANT Gerrit support is not yet implemented. This file is a placeholder diff --git a/remote/gitea/fixtures/handler.go b/server/remote/gitea/fixtures/handler.go similarity index 100% rename from remote/gitea/fixtures/handler.go rename to server/remote/gitea/fixtures/handler.go diff --git a/remote/gitea/fixtures/hooks.go b/server/remote/gitea/fixtures/hooks.go similarity index 100% rename from remote/gitea/fixtures/hooks.go rename to server/remote/gitea/fixtures/hooks.go diff --git a/remote/gitea/gitea.go b/server/remote/gitea/gitea.go similarity index 99% rename from remote/gitea/gitea.go rename to server/remote/gitea/gitea.go index 33873e53c..6a6bb24f6 100644 --- a/remote/gitea/gitea.go +++ b/server/remote/gitea/gitea.go @@ -28,7 +28,7 @@ import ( "code.gitea.io/sdk/gitea" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) // Opts defines configuration options. diff --git a/remote/gitea/gitea_oauth.go b/server/remote/gitea/gitea_oauth.go similarity index 99% rename from remote/gitea/gitea_oauth.go rename to server/remote/gitea/gitea_oauth.go index 9595f5093..c0a887ad5 100644 --- a/remote/gitea/gitea_oauth.go +++ b/server/remote/gitea/gitea_oauth.go @@ -28,8 +28,8 @@ import ( "code.gitea.io/sdk/gitea" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "golang.org/x/oauth2" ) diff --git a/remote/gitea/gitea_test.go b/server/remote/gitea/gitea_test.go similarity index 98% rename from remote/gitea/gitea_test.go rename to server/remote/gitea/gitea_test.go index 8aa62ed7d..a5a453d66 100644 --- a/remote/gitea/gitea_test.go +++ b/server/remote/gitea/gitea_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/gin-gonic/gin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) func Test_gitea(t *testing.T) { diff --git a/remote/gitea/helper.go b/server/remote/gitea/helper.go similarity index 100% rename from remote/gitea/helper.go rename to server/remote/gitea/helper.go diff --git a/remote/gitea/helper_test.go b/server/remote/gitea/helper_test.go similarity index 99% rename from remote/gitea/helper_test.go rename to server/remote/gitea/helper_test.go index 1b9300fe1..96d05a127 100644 --- a/remote/gitea/helper_test.go +++ b/server/remote/gitea/helper_test.go @@ -21,7 +21,7 @@ import ( "code.gitea.io/sdk/gitea" "github.com/franela/goblin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) func Test_parse(t *testing.T) { diff --git a/remote/gitea/parse.go b/server/remote/gitea/parse.go similarity index 100% rename from remote/gitea/parse.go rename to server/remote/gitea/parse.go diff --git a/remote/gitea/parse_test.go b/server/remote/gitea/parse_test.go similarity index 96% rename from remote/gitea/parse_test.go rename to server/remote/gitea/parse_test.go index 44b32e189..d4a2e24ae 100644 --- a/remote/gitea/parse_test.go +++ b/server/remote/gitea/parse_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures" ) func Test_parser(t *testing.T) { diff --git a/remote/gitea/types.go b/server/remote/gitea/types.go similarity index 100% rename from remote/gitea/types.go rename to server/remote/gitea/types.go diff --git a/remote/github/convert.go b/server/remote/github/convert.go similarity index 100% rename from remote/github/convert.go rename to server/remote/github/convert.go diff --git a/remote/github/convert_test.go b/server/remote/github/convert_test.go similarity index 100% rename from remote/github/convert_test.go rename to server/remote/github/convert_test.go diff --git a/remote/github/fixtures/handler.go b/server/remote/github/fixtures/handler.go similarity index 100% rename from remote/github/fixtures/handler.go rename to server/remote/github/fixtures/handler.go diff --git a/remote/github/fixtures/hooks.go b/server/remote/github/fixtures/hooks.go similarity index 100% rename from remote/github/fixtures/hooks.go rename to server/remote/github/fixtures/hooks.go diff --git a/remote/github/github.go b/server/remote/github/github.go similarity index 99% rename from remote/github/github.go rename to server/remote/github/github.go index 65272aea5..9fed82c33 100644 --- a/remote/github/github.go +++ b/server/remote/github/github.go @@ -25,8 +25,8 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/google/go-github/github" "golang.org/x/net/context" diff --git a/remote/github/github_test.go b/server/remote/github/github_test.go similarity index 98% rename from remote/github/github_test.go rename to server/remote/github/github_test.go index d2a3e417f..3119d4f0b 100644 --- a/remote/github/github_test.go +++ b/server/remote/github/github_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/github/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures" "github.com/franela/goblin" "github.com/gin-gonic/gin" diff --git a/remote/github/parse.go b/server/remote/github/parse.go similarity index 100% rename from remote/github/parse.go rename to server/remote/github/parse.go diff --git a/remote/github/parse_test.go b/server/remote/github/parse_test.go similarity index 98% rename from remote/github/parse_test.go rename to server/remote/github/parse_test.go index 32a3b7622..db2d8edcb 100644 --- a/remote/github/parse_test.go +++ b/server/remote/github/parse_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/github/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures" ) func Test_parser(t *testing.T) { diff --git a/remote/github/types.go b/server/remote/github/types.go similarity index 100% rename from remote/github/types.go rename to server/remote/github/types.go diff --git a/remote/gitlab/client/drone.go b/server/remote/gitlab/client/drone.go similarity index 100% rename from remote/gitlab/client/drone.go rename to server/remote/gitlab/client/drone.go diff --git a/remote/gitlab/client/gitlab.go b/server/remote/gitlab/client/gitlab.go similarity index 100% rename from remote/gitlab/client/gitlab.go rename to server/remote/gitlab/client/gitlab.go diff --git a/remote/gitlab/client/groups.go b/server/remote/gitlab/client/groups.go similarity index 100% rename from remote/gitlab/client/groups.go rename to server/remote/gitlab/client/groups.go diff --git a/remote/gitlab/client/hook.go b/server/remote/gitlab/client/hook.go similarity index 100% rename from remote/gitlab/client/hook.go rename to server/remote/gitlab/client/hook.go diff --git a/remote/gitlab/client/project.go b/server/remote/gitlab/client/project.go similarity index 100% rename from remote/gitlab/client/project.go rename to server/remote/gitlab/client/project.go diff --git a/remote/gitlab/client/types.go b/server/remote/gitlab/client/types.go similarity index 100% rename from remote/gitlab/client/types.go rename to server/remote/gitlab/client/types.go diff --git a/remote/gitlab/client/user.go b/server/remote/gitlab/client/user.go similarity index 100% rename from remote/gitlab/client/user.go rename to server/remote/gitlab/client/user.go diff --git a/remote/gitlab/client/util.go b/server/remote/gitlab/client/util.go similarity index 100% rename from remote/gitlab/client/util.go rename to server/remote/gitlab/client/util.go diff --git a/remote/gitlab/gitlab.go b/server/remote/gitlab/gitlab.go similarity index 99% rename from remote/gitlab/gitlab.go rename to server/remote/gitlab/gitlab.go index 1e713c028..6d6c12592 100644 --- a/remote/gitlab/gitlab.go +++ b/server/remote/gitlab/gitlab.go @@ -25,11 +25,11 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/shared/oauth2" - "github.com/woodpecker-ci/woodpecker/remote/gitlab/client" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab/client" ) const DefaultScope = "api" diff --git a/remote/gitlab/gitlab_test.go b/server/remote/gitlab/gitlab_test.go similarity index 99% rename from remote/gitlab/gitlab_test.go rename to server/remote/gitlab/gitlab_test.go index d3c21cb19..effd49713 100644 --- a/remote/gitlab/gitlab_test.go +++ b/server/remote/gitlab/gitlab_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gitlab/testdata" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab/testdata" ) func Test_Gitlab(t *testing.T) { diff --git a/remote/gitlab/helper.go b/server/remote/gitlab/helper.go similarity index 98% rename from remote/gitlab/helper.go rename to server/remote/gitlab/helper.go index 0aa34d068..e14db7b13 100644 --- a/remote/gitlab/helper.go +++ b/server/remote/gitlab/helper.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/woodpecker-ci/woodpecker/remote/gitlab/client" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab/client" ) const ( diff --git a/remote/gitlab/testdata/hooks.go b/server/remote/gitlab/testdata/hooks.go similarity index 100% rename from remote/gitlab/testdata/hooks.go rename to server/remote/gitlab/testdata/hooks.go diff --git a/remote/gitlab/testdata/oauth.go b/server/remote/gitlab/testdata/oauth.go similarity index 100% rename from remote/gitlab/testdata/oauth.go rename to server/remote/gitlab/testdata/oauth.go diff --git a/remote/gitlab/testdata/projects.go b/server/remote/gitlab/testdata/projects.go similarity index 100% rename from remote/gitlab/testdata/projects.go rename to server/remote/gitlab/testdata/projects.go diff --git a/remote/gitlab/testdata/testdata.go b/server/remote/gitlab/testdata/testdata.go similarity index 100% rename from remote/gitlab/testdata/testdata.go rename to server/remote/gitlab/testdata/testdata.go diff --git a/remote/gitlab/testdata/users.go b/server/remote/gitlab/testdata/users.go similarity index 100% rename from remote/gitlab/testdata/users.go rename to server/remote/gitlab/testdata/users.go diff --git a/remote/gitlab3/client/drone.go b/server/remote/gitlab3/client/drone.go similarity index 100% rename from remote/gitlab3/client/drone.go rename to server/remote/gitlab3/client/drone.go diff --git a/remote/gitlab3/client/gitlab.go b/server/remote/gitlab3/client/gitlab.go similarity index 100% rename from remote/gitlab3/client/gitlab.go rename to server/remote/gitlab3/client/gitlab.go diff --git a/remote/gitlab3/client/groups.go b/server/remote/gitlab3/client/groups.go similarity index 100% rename from remote/gitlab3/client/groups.go rename to server/remote/gitlab3/client/groups.go diff --git a/remote/gitlab3/client/hook.go b/server/remote/gitlab3/client/hook.go similarity index 100% rename from remote/gitlab3/client/hook.go rename to server/remote/gitlab3/client/hook.go diff --git a/remote/gitlab3/client/project.go b/server/remote/gitlab3/client/project.go similarity index 100% rename from remote/gitlab3/client/project.go rename to server/remote/gitlab3/client/project.go diff --git a/remote/gitlab3/client/types.go b/server/remote/gitlab3/client/types.go similarity index 100% rename from remote/gitlab3/client/types.go rename to server/remote/gitlab3/client/types.go diff --git a/remote/gitlab3/client/user.go b/server/remote/gitlab3/client/user.go similarity index 100% rename from remote/gitlab3/client/user.go rename to server/remote/gitlab3/client/user.go diff --git a/remote/gitlab3/client/util.go b/server/remote/gitlab3/client/util.go similarity index 100% rename from remote/gitlab3/client/util.go rename to server/remote/gitlab3/client/util.go diff --git a/remote/gitlab3/gitlab.go b/server/remote/gitlab3/gitlab.go similarity index 99% rename from remote/gitlab3/gitlab.go rename to server/remote/gitlab3/gitlab.go index 127525e8b..c2ec7f049 100644 --- a/remote/gitlab3/gitlab.go +++ b/server/remote/gitlab3/gitlab.go @@ -25,11 +25,11 @@ import ( "strings" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/shared/oauth2" - "github.com/woodpecker-ci/woodpecker/remote/gitlab3/client" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/client" ) const DefaultScope = "api" diff --git a/remote/gitlab3/gitlab_test.go b/server/remote/gitlab3/gitlab_test.go similarity index 99% rename from remote/gitlab3/gitlab_test.go rename to server/remote/gitlab3/gitlab_test.go index a5bda77b1..a7a955b5e 100644 --- a/remote/gitlab3/gitlab_test.go +++ b/server/remote/gitlab3/gitlab_test.go @@ -21,7 +21,7 @@ import ( "github.com/franela/goblin" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gitlab3/testdata" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/testdata" ) func Test_Gitlab(t *testing.T) { diff --git a/remote/gitlab3/helper.go b/server/remote/gitlab3/helper.go similarity index 98% rename from remote/gitlab3/helper.go rename to server/remote/gitlab3/helper.go index 2cc7df181..dc86556a5 100644 --- a/remote/gitlab3/helper.go +++ b/server/remote/gitlab3/helper.go @@ -22,7 +22,7 @@ import ( "strconv" "strings" - "github.com/woodpecker-ci/woodpecker/remote/gitlab3/client" + "github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/client" ) const ( diff --git a/remote/gitlab3/testdata/hooks.go b/server/remote/gitlab3/testdata/hooks.go similarity index 100% rename from remote/gitlab3/testdata/hooks.go rename to server/remote/gitlab3/testdata/hooks.go diff --git a/remote/gitlab3/testdata/oauth.go b/server/remote/gitlab3/testdata/oauth.go similarity index 100% rename from remote/gitlab3/testdata/oauth.go rename to server/remote/gitlab3/testdata/oauth.go diff --git a/remote/gitlab3/testdata/projects.go b/server/remote/gitlab3/testdata/projects.go similarity index 100% rename from remote/gitlab3/testdata/projects.go rename to server/remote/gitlab3/testdata/projects.go diff --git a/remote/gitlab3/testdata/testdata.go b/server/remote/gitlab3/testdata/testdata.go similarity index 100% rename from remote/gitlab3/testdata/testdata.go rename to server/remote/gitlab3/testdata/testdata.go diff --git a/remote/gitlab3/testdata/users.go b/server/remote/gitlab3/testdata/users.go similarity index 100% rename from remote/gitlab3/testdata/users.go rename to server/remote/gitlab3/testdata/users.go diff --git a/remote/gogs/fixtures/handler.go b/server/remote/gogs/fixtures/handler.go similarity index 100% rename from remote/gogs/fixtures/handler.go rename to server/remote/gogs/fixtures/handler.go diff --git a/remote/gogs/fixtures/hooks.go b/server/remote/gogs/fixtures/hooks.go similarity index 100% rename from remote/gogs/fixtures/hooks.go rename to server/remote/gogs/fixtures/hooks.go diff --git a/remote/gogs/gogs.go b/server/remote/gogs/gogs.go similarity index 99% rename from remote/gogs/gogs.go rename to server/remote/gogs/gogs.go index f0bb1da68..17d2acf07 100644 --- a/remote/gogs/gogs.go +++ b/server/remote/gogs/gogs.go @@ -24,7 +24,7 @@ import ( "github.com/gogits/go-gogs-client" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) // Opts defines configuration options. diff --git a/remote/gogs/gogs_test.go b/server/remote/gogs/gogs_test.go similarity index 98% rename from remote/gogs/gogs_test.go rename to server/remote/gogs/gogs_test.go index 4ac4b2e26..a648b9fbb 100644 --- a/remote/gogs/gogs_test.go +++ b/server/remote/gogs/gogs_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gogs/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures" "github.com/franela/goblin" "github.com/gin-gonic/gin" diff --git a/remote/gogs/helper.go b/server/remote/gogs/helper.go similarity index 100% rename from remote/gogs/helper.go rename to server/remote/gogs/helper.go diff --git a/remote/gogs/helper_test.go b/server/remote/gogs/helper_test.go similarity index 99% rename from remote/gogs/helper_test.go rename to server/remote/gogs/helper_test.go index 2ffe2a916..644debf26 100644 --- a/remote/gogs/helper_test.go +++ b/server/remote/gogs/helper_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote/gogs/fixtures" + "github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures" "github.com/franela/goblin" "github.com/gogits/go-gogs-client" diff --git a/remote/gogs/parse.go b/server/remote/gogs/parse.go similarity index 100% rename from remote/gogs/parse.go rename to server/remote/gogs/parse.go diff --git a/remote/gogs/parse_test.go b/server/remote/gogs/parse_test.go similarity index 100% rename from remote/gogs/parse_test.go rename to server/remote/gogs/parse_test.go diff --git a/remote/gogs/types.go b/server/remote/gogs/types.go similarity index 100% rename from remote/gogs/types.go rename to server/remote/gogs/types.go diff --git a/remote/mocks/Remote.go b/server/remote/mocks/Remote.go similarity index 99% rename from remote/mocks/Remote.go rename to server/remote/mocks/Remote.go index 154a85f2d..1c532bb3e 100644 --- a/remote/mocks/Remote.go +++ b/server/remote/mocks/Remote.go @@ -8,7 +8,7 @@ import ( mock "github.com/stretchr/testify/mock" model "github.com/woodpecker-ci/woodpecker/model" - remote "github.com/woodpecker-ci/woodpecker/remote" + remote "github.com/woodpecker-ci/woodpecker/server/remote" ) // Remote is an autogenerated mock type for the Remote type diff --git a/remote/remote.go b/server/remote/remote.go similarity index 100% rename from remote/remote.go rename to server/remote/remote.go diff --git a/server/router/middleware/remote.go b/server/router/middleware/remote.go index 1798944d5..1c92ee19f 100644 --- a/server/router/middleware/remote.go +++ b/server/router/middleware/remote.go @@ -16,7 +16,7 @@ package middleware import ( "github.com/gin-gonic/gin" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) // Remote is a middleware function that initializes the Remote and attaches to diff --git a/server/router/middleware/session/repo.go b/server/router/middleware/session/repo.go index 8bf91456d..cd18668b5 100644 --- a/server/router/middleware/session/repo.go +++ b/server/router/middleware/session/repo.go @@ -19,7 +19,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" "github.com/gin-gonic/gin" diff --git a/server/router/middleware/token/token.go b/server/router/middleware/token/token.go index 42d735fe3..5961bbb2a 100644 --- a/server/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -17,7 +17,7 @@ package token import ( "time" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/store" diff --git a/server/shared/configFetcher.go b/server/shared/configFetcher.go index 466647418..aa363aac5 100644 --- a/server/shared/configFetcher.go +++ b/server/shared/configFetcher.go @@ -5,7 +5,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) type configFetcher struct { diff --git a/server/shared/configFetcher_test.go b/server/shared/configFetcher_test.go index 0f1fbae4e..b8b83b4f8 100644 --- a/server/shared/configFetcher_test.go +++ b/server/shared/configFetcher_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/mock" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/remote/mocks" + "github.com/woodpecker-ci/woodpecker/server/remote" + "github.com/woodpecker-ci/woodpecker/server/remote/mocks" "github.com/woodpecker-ci/woodpecker/server/shared" ) diff --git a/server/shared/procBuilder.go b/server/shared/procBuilder.go index 9917845c2..2d2127266 100644 --- a/server/shared/procBuilder.go +++ b/server/shared/procBuilder.go @@ -30,8 +30,8 @@ import ( "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter" "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/remote" ) // ProcBuilder Takes the hook data and the yaml and returns in internal data model diff --git a/server/shared/procBuilder_test.go b/server/shared/procBuilder_test.go index 30e19ed92..6eaca64ef 100644 --- a/server/shared/procBuilder_test.go +++ b/server/shared/procBuilder_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" ) func TestMultilineEnvsubst(t *testing.T) { diff --git a/server/shared/userSyncer.go b/server/shared/userSyncer.go index 753696ac4..cdd3e8e34 100644 --- a/server/shared/userSyncer.go +++ b/server/shared/userSyncer.go @@ -18,7 +18,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/remote" + "github.com/woodpecker-ci/woodpecker/server/remote" "github.com/woodpecker-ci/woodpecker/server/store" )