Move router package to server/router/ (#339)

2025-09-17 12:25:59 +00:00 · 2021-09-22 15:41:32 -05:00
parent 35a45b7961
commit b8f55f31e2
19 changed files with 13 additions and 13 deletions
--- 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"
--- 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"
 )

--- 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"
 )

--- 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"
 )
--- 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"
 )
--- 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"
 )
--- 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"
--- 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"
--- a/server/router/middleware/config.go
+++ b/server/router/middleware/config.go
--- a/server/router/middleware/header/header.go
+++ b/server/router/middleware/header/header.go
--- a/server/router/middleware/remote.go
+++ b/server/router/middleware/remote.go
--- a/server/router/middleware/session/agent.go
+++ b/server/router/middleware/session/agent.go
--- a/server/router/middleware/session/repo.go
+++ b/server/router/middleware/session/repo.go
--- a/server/router/middleware/session/repo_test.go
+++ b/server/router/middleware/session/repo_test.go
--- a/server/router/middleware/session/user.go
+++ b/server/router/middleware/session/user.go
--- a/server/router/middleware/store.go
+++ b/server/router/middleware/store.go
--- a/server/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"
--- a/server/router/middleware/version.go
+++ b/server/router/middleware/version.go
--- a/server/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"
 )