From b8f55f31e247b322ecf66607bda04555a0c6524a Mon Sep 17 00:00:00 2001 From: Jacob Floyd Date: Wed, 22 Sep 2021 15:41:32 -0500 Subject: [PATCH] Move router package to server/router/ (#339) --- cmd/server/server.go | 4 ++-- server/api/build.go | 2 +- server/api/file.go | 2 +- server/api/registry.go | 2 +- server/api/repo.go | 2 +- server/api/secret.go | 2 +- server/api/stream.go | 2 +- server/api/user.go | 2 +- {router => server/router}/middleware/config.go | 0 {router => server/router}/middleware/header/header.go | 0 {router => server/router}/middleware/remote.go | 0 {router => server/router}/middleware/session/agent.go | 0 {router => server/router}/middleware/session/repo.go | 0 {router => server/router}/middleware/session/repo_test.go | 0 {router => server/router}/middleware/session/user.go | 0 {router => server/router}/middleware/store.go | 0 {router => server/router}/middleware/token/token.go | 2 +- {router => server/router}/middleware/version.go | 0 {router => server/router}/router.go | 6 +++--- 19 files changed, 13 insertions(+), 13 deletions(-) rename {router => server/router}/middleware/config.go (100%) rename {router => server/router}/middleware/header/header.go (100%) rename {router => server/router}/middleware/remote.go (100%) rename {router => server/router}/middleware/session/agent.go (100%) rename {router => server/router}/middleware/session/repo.go (100%) rename {router => server/router}/middleware/session/repo_test.go (100%) rename {router => server/router}/middleware/session/user.go (100%) rename {router => server/router}/middleware/store.go (100%) rename {router => server/router}/middleware/token/token.go (96%) rename {router => server/router}/middleware/version.go (100%) rename {router => server/router}/router.go (96%) diff --git a/cmd/server/server.go b/cmd/server/server.go index d07c0ed1c..a0ae92ea9 100644 --- a/cmd/server/server.go +++ b/cmd/server/server.go @@ -38,10 +38,10 @@ import ( "github.com/woodpecker-ci/woodpecker/cncd/pubsub" "github.com/woodpecker-ci/woodpecker/plugins/sender" "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/router" - "github.com/woodpecker-ci/woodpecker/router/middleware" "github.com/woodpecker-ci/woodpecker/server" woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc" + "github.com/woodpecker-ci/woodpecker/server/router" + "github.com/woodpecker-ci/woodpecker/server/router/middleware" "github.com/woodpecker-ci/woodpecker/store" "github.com/gin-gonic/contrib/ginrus" diff --git a/server/api/build.go b/server/api/build.go index 2439ce5a4..a87c4c724 100644 --- a/server/api/build.go +++ b/server/api/build.go @@ -34,8 +34,8 @@ import ( "github.com/woodpecker-ci/woodpecker/store" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/shared" ) diff --git a/server/api/file.go b/server/api/file.go index b0cc91360..4f0e2856c 100644 --- a/server/api/file.go +++ b/server/api/file.go @@ -21,7 +21,7 @@ import ( "strings" "github.com/gin-gonic/gin" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/store" ) diff --git a/server/api/registry.go b/server/api/registry.go index d449a19fc..90a1f2028 100644 --- a/server/api/registry.go +++ b/server/api/registry.go @@ -18,8 +18,8 @@ import ( "net/http" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/gin-gonic/gin" ) diff --git a/server/api/repo.go b/server/api/repo.go index ce5f823bd..460169c51 100644 --- a/server/api/repo.go +++ b/server/api/repo.go @@ -25,8 +25,8 @@ import ( "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/shared/token" "github.com/woodpecker-ci/woodpecker/store" ) diff --git a/server/api/secret.go b/server/api/secret.go index 4ed8af443..c55532384 100644 --- a/server/api/secret.go +++ b/server/api/secret.go @@ -18,8 +18,8 @@ import ( "net/http" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/gin-gonic/gin" ) diff --git a/server/api/stream.go b/server/api/stream.go index e6cb765c7..69d18456a 100644 --- a/server/api/stream.go +++ b/server/api/stream.go @@ -25,8 +25,8 @@ import ( "github.com/woodpecker-ci/woodpecker/cncd/logging" "github.com/woodpecker-ci/woodpecker/cncd/pubsub" "github.com/woodpecker-ci/woodpecker/model" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/store" "github.com/gin-gonic/gin" diff --git a/server/api/user.go b/server/api/user.go index 438bbb45d..7966ce997 100644 --- a/server/api/user.go +++ b/server/api/user.go @@ -26,7 +26,7 @@ import ( "github.com/woodpecker-ci/woodpecker/model" "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/server/shared" "github.com/woodpecker-ci/woodpecker/shared/token" "github.com/woodpecker-ci/woodpecker/store" diff --git a/router/middleware/config.go b/server/router/middleware/config.go similarity index 100% rename from router/middleware/config.go rename to server/router/middleware/config.go diff --git a/router/middleware/header/header.go b/server/router/middleware/header/header.go similarity index 100% rename from router/middleware/header/header.go rename to server/router/middleware/header/header.go diff --git a/router/middleware/remote.go b/server/router/middleware/remote.go similarity index 100% rename from router/middleware/remote.go rename to server/router/middleware/remote.go diff --git a/router/middleware/session/agent.go b/server/router/middleware/session/agent.go similarity index 100% rename from router/middleware/session/agent.go rename to server/router/middleware/session/agent.go diff --git a/router/middleware/session/repo.go b/server/router/middleware/session/repo.go similarity index 100% rename from router/middleware/session/repo.go rename to server/router/middleware/session/repo.go diff --git a/router/middleware/session/repo_test.go b/server/router/middleware/session/repo_test.go similarity index 100% rename from router/middleware/session/repo_test.go rename to server/router/middleware/session/repo_test.go diff --git a/router/middleware/session/user.go b/server/router/middleware/session/user.go similarity index 100% rename from router/middleware/session/user.go rename to server/router/middleware/session/user.go diff --git a/router/middleware/store.go b/server/router/middleware/store.go similarity index 100% rename from router/middleware/store.go rename to server/router/middleware/store.go diff --git a/router/middleware/token/token.go b/server/router/middleware/token/token.go similarity index 96% rename from router/middleware/token/token.go rename to server/router/middleware/token/token.go index 0ed8d241f..c601ab7a8 100644 --- a/router/middleware/token/token.go +++ b/server/router/middleware/token/token.go @@ -18,7 +18,7 @@ import ( "time" "github.com/woodpecker-ci/woodpecker/remote" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" "github.com/woodpecker-ci/woodpecker/store" "github.com/gin-gonic/gin" diff --git a/router/middleware/version.go b/server/router/middleware/version.go similarity index 100% rename from router/middleware/version.go rename to server/router/middleware/version.go diff --git a/router/router.go b/server/router/router.go similarity index 96% rename from router/router.go rename to server/router/router.go index 2a4b10b0d..d2da90bcb 100644 --- a/router/router.go +++ b/server/router/router.go @@ -20,12 +20,12 @@ import ( "github.com/dimfeld/httptreemux" "github.com/gin-gonic/gin" - "github.com/woodpecker-ci/woodpecker/router/middleware/header" - "github.com/woodpecker-ci/woodpecker/router/middleware/session" - "github.com/woodpecker-ci/woodpecker/router/middleware/token" "github.com/woodpecker-ci/woodpecker/server/api" "github.com/woodpecker-ci/woodpecker/server/api/debug" "github.com/woodpecker-ci/woodpecker/server/api/metrics" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/header" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/session" + "github.com/woodpecker-ci/woodpecker/server/router/middleware/token" "github.com/woodpecker-ci/woodpecker/server/web" )