Refactor: Reorganize into server/{api,grpc,shared} packages

cmd/server/main.go

@@ -31,7 +31,7 @@ func main() {
 	app.Name = "woodpecker-server"
 	app.Version = version.String()
 	app.Usage = "woodpecker server"
-	app.Action = server
+	app.Action = loop
 	app.Flags = flags
 	app.Before = before
 

cmd/server/server.go

@@ -40,7 +40,8 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/router"
 	"github.com/woodpecker-ci/woodpecker/router/middleware"
-	droneserver "github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server"
+	woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc"
 	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/gin-gonic/contrib/ginrus"
@@ -49,7 +50,7 @@ import (
 	oldcontext "golang.org/x/net/context"
 )
 
-func server(c *cli.Context) error {
+func loop(c *cli.Context) error {
 
 	// debug level if requested by user
 	if c.Bool("debug") {
@@ -123,7 +124,14 @@ func server(c *cli.Context) error {
 				MinTime: c.Duration("keepalive-min-time"),
 			}),
 		)
-		droneServer := droneserver.NewDroneServer(remote_, droneserver.Config.Services.Queue, droneserver.Config.Services.Logs, droneserver.Config.Services.Pubsub, store_, droneserver.Config.Server.Host)
+		droneServer := woodpeckerGrpcServer.NewDroneServer(
+			remote_,
+			server.Config.Services.Queue,
+			server.Config.Services.Logs,
+			server.Config.Services.Pubsub,
+			store_,
+			server.Config.Server.Host,
+		)
 		proto.RegisterDroneServer(grpcServer, droneServer)
 
 		err = grpcServer.Serve(lis)
@@ -201,45 +209,45 @@ func server(c *cli.Context) error {
 func setupEvilGlobals(c *cli.Context, v store.Store, r remote.Remote) {
 
 	// storage
-	droneserver.Config.Storage.Files = v
-	droneserver.Config.Storage.Config = v
+	server.Config.Storage.Files = v
+	server.Config.Storage.Config = v
 
 	// services
-	droneserver.Config.Services.Queue = setupQueue(c, v)
-	droneserver.Config.Services.Logs = logging.New()
-	droneserver.Config.Services.Pubsub = pubsub.New()
-	droneserver.Config.Services.Pubsub.Create(context.Background(), "topic/events")
-	droneserver.Config.Services.Registries = setupRegistryService(c, v)
-	droneserver.Config.Services.Secrets = setupSecretService(c, v)
-	droneserver.Config.Services.Senders = sender.New(v, v)
-	droneserver.Config.Services.Environ = setupEnvironService(c, v)
+	server.Config.Services.Queue = setupQueue(c, v)
+	server.Config.Services.Logs = logging.New()
+	server.Config.Services.Pubsub = pubsub.New()
+	server.Config.Services.Pubsub.Create(context.Background(), "topic/events")
+	server.Config.Services.Registries = setupRegistryService(c, v)
+	server.Config.Services.Secrets = setupSecretService(c, v)
+	server.Config.Services.Senders = sender.New(v, v)
+	server.Config.Services.Environ = setupEnvironService(c, v)
 
 	if endpoint := c.String("gating-service"); endpoint != "" {
-		droneserver.Config.Services.Senders = sender.NewRemote(endpoint)
+		server.Config.Services.Senders = sender.NewRemote(endpoint)
 	}
 
 	// limits
-	droneserver.Config.Pipeline.Limits.MemSwapLimit = c.Int64("limit-mem-swap")
-	droneserver.Config.Pipeline.Limits.MemLimit = c.Int64("limit-mem")
-	droneserver.Config.Pipeline.Limits.ShmSize = c.Int64("limit-shm-size")
-	droneserver.Config.Pipeline.Limits.CPUQuota = c.Int64("limit-cpu-quota")
-	droneserver.Config.Pipeline.Limits.CPUShares = c.Int64("limit-cpu-shares")
-	droneserver.Config.Pipeline.Limits.CPUSet = c.String("limit-cpu-set")
+	server.Config.Pipeline.Limits.MemSwapLimit = c.Int64("limit-mem-swap")
+	server.Config.Pipeline.Limits.MemLimit = c.Int64("limit-mem")
+	server.Config.Pipeline.Limits.ShmSize = c.Int64("limit-shm-size")
+	server.Config.Pipeline.Limits.CPUQuota = c.Int64("limit-cpu-quota")
+	server.Config.Pipeline.Limits.CPUShares = c.Int64("limit-cpu-shares")
+	server.Config.Pipeline.Limits.CPUSet = c.String("limit-cpu-set")
 
 	// server configuration
-	droneserver.Config.Server.Cert = c.String("server-cert")
-	droneserver.Config.Server.Key = c.String("server-key")
-	droneserver.Config.Server.Pass = c.String("agent-secret")
-	droneserver.Config.Server.Host = c.String("server-host")
-	droneserver.Config.Server.Port = c.String("server-addr")
-	droneserver.Config.Server.RepoConfig = c.String("repo-config")
-	droneserver.Config.Server.SessionExpires = c.Duration("session-expires")
-	droneserver.Config.Pipeline.Networks = c.StringSlice("network")
-	droneserver.Config.Pipeline.Volumes = c.StringSlice("volume")
-	droneserver.Config.Pipeline.Privileged = c.StringSlice("escalate")
+	server.Config.Server.Cert = c.String("server-cert")
+	server.Config.Server.Key = c.String("server-key")
+	server.Config.Server.Pass = c.String("agent-secret")
+	server.Config.Server.Host = c.String("server-host")
+	server.Config.Server.Port = c.String("server-addr")
+	server.Config.Server.RepoConfig = c.String("repo-config")
+	server.Config.Server.SessionExpires = c.Duration("session-expires")
+	server.Config.Pipeline.Networks = c.StringSlice("network")
+	server.Config.Pipeline.Volumes = c.StringSlice("volume")
+	server.Config.Pipeline.Privileged = c.StringSlice("escalate")
 
 	// prometheus
-	droneserver.Config.Prometheus.AuthToken = c.String("prometheus-auth-token")
+	server.Config.Prometheus.AuthToken = c.String("prometheus-auth-token")
 }
 
 type authorizer struct {
@@ -271,7 +279,7 @@ func (a *authorizer) authorize(ctx context.Context) error {
 }
 
 func redirect(w http.ResponseWriter, req *http.Request) {
-	var serverHost string = droneserver.Config.Server.Host
+	var serverHost string = server.Config.Server.Host
 	serverHost = strings.TrimPrefix(serverHost, "http://")
 	serverHost = strings.TrimPrefix(serverHost, "https://")
 	req.URL.Scheme = "https"

cmd/server/setup.go

@@ -35,7 +35,7 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote/gitlab"
 	"github.com/woodpecker-ci/woodpecker/remote/gitlab3"
 	"github.com/woodpecker-ci/woodpecker/remote/gogs"
-	droneserver "github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/web"
 	"github.com/woodpecker-ci/woodpecker/store"
 	"github.com/woodpecker-ci/woodpecker/store/datastore"
@@ -257,7 +257,7 @@ func setupMetrics(g *errgroup.Group, store_ store.Store) {
 
 	g.Go(func() error {
 		for {
-			stats := droneserver.Config.Services.Queue.Info(nil)
+			stats := server.Config.Services.Queue.Info(nil)
 			pendingJobs.Set(float64(stats.Stats.Pending))
 			waitingJobs.Set(float64(stats.Stats.WaitingOnDeps))
 			runningJobs.Set(float64(stats.Stats.Running))

router/router.go

@@ -23,9 +23,9 @@ import (
 	"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"
-	"github.com/woodpecker-ci/woodpecker/server/debug"
-	"github.com/woodpecker-ci/woodpecker/server/metrics"
+	"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/web"
 )
 
@@ -52,27 +52,27 @@ func Load(mux *httptreemux.ContextMux, middleware ...gin.HandlerFunc) http.Handl
 		mux.ServeHTTP(c.Writer, req)
 	})
 
-	e.GET("/logout", server.GetLogout)
-	e.GET("/login", server.HandleLogin)
+	e.GET("/logout", api.GetLogout)
+	e.GET("/login", api.HandleLogin)
 
 	user := e.Group("/api/user")
 	{
 		user.Use(session.MustUser())
-		user.GET("", server.GetSelf)
-		user.GET("/feed", server.GetFeed)
-		user.GET("/repos", server.GetRepos)
-		user.POST("/token", server.PostToken)
-		user.DELETE("/token", server.DeleteToken)
+		user.GET("", api.GetSelf)
+		user.GET("/feed", api.GetFeed)
+		user.GET("/repos", api.GetRepos)
+		user.POST("/token", api.PostToken)
+		user.DELETE("/token", api.DeleteToken)
 	}
 
 	users := e.Group("/api/users")
 	{
 		users.Use(session.MustAdmin())
-		users.GET("", server.GetUsers)
-		users.POST("", server.PostUser)
-		users.GET("/:login", server.GetUser)
-		users.PATCH("/:login", server.PatchUser)
-		users.DELETE("/:login", server.DeleteUser)
+		users.GET("", api.GetUsers)
+		users.POST("", api.PostUser)
+		users.GET("/:login", api.GetUser)
+		users.PATCH("/:login", api.PatchUser)
+		users.DELETE("/:login", api.DeleteUser)
 	}
 
 	repo := e.Group("/api/repos/:owner/:name")
@@ -81,96 +81,96 @@ func Load(mux *httptreemux.ContextMux, middleware ...gin.HandlerFunc) http.Handl
 		repo.Use(session.SetPerm())
 		repo.Use(session.MustPull)
 
-		repo.POST("", session.MustRepoAdmin(), server.PostRepo)
-		repo.GET("", server.GetRepo)
-		repo.GET("/builds", server.GetBuilds)
-		repo.GET("/builds/:number", server.GetBuild)
-		repo.GET("/logs/:number/:pid", server.GetProcLogs)
-		repo.GET("/logs/:number/:pid/:proc", server.GetBuildLogs)
+		repo.POST("", session.MustRepoAdmin(), api.PostRepo)
+		repo.GET("", api.GetRepo)
+		repo.GET("/builds", api.GetBuilds)
+		repo.GET("/builds/:number", api.GetBuild)
+		repo.GET("/logs/:number/:pid", api.GetProcLogs)
+		repo.GET("/logs/:number/:pid/:proc", api.GetBuildLogs)
 
-		repo.GET("/files/:number", server.FileList)
-		repo.GET("/files/:number/:proc/*file", server.FileGet)
+		repo.GET("/files/:number", api.FileList)
+		repo.GET("/files/:number/:proc/*file", api.FileGet)
 
 		// requires push permissions
-		repo.GET("/secrets", session.MustPush, server.GetSecretList)
-		repo.POST("/secrets", session.MustPush, server.PostSecret)
-		repo.GET("/secrets/:secret", session.MustPush, server.GetSecret)
-		repo.PATCH("/secrets/:secret", session.MustPush, server.PatchSecret)
-		repo.DELETE("/secrets/:secret", session.MustPush, server.DeleteSecret)
+		repo.GET("/secrets", session.MustPush, api.GetSecretList)
+		repo.POST("/secrets", session.MustPush, api.PostSecret)
+		repo.GET("/secrets/:secret", session.MustPush, api.GetSecret)
+		repo.PATCH("/secrets/:secret", session.MustPush, api.PatchSecret)
+		repo.DELETE("/secrets/:secret", session.MustPush, api.DeleteSecret)
 
 		// requires push permissions
-		repo.GET("/registry", session.MustPush, server.GetRegistryList)
-		repo.POST("/registry", session.MustPush, server.PostRegistry)
-		repo.GET("/registry/:registry", session.MustPush, server.GetRegistry)
-		repo.PATCH("/registry/:registry", session.MustPush, server.PatchRegistry)
-		repo.DELETE("/registry/:registry", session.MustPush, server.DeleteRegistry)
+		repo.GET("/registry", session.MustPush, api.GetRegistryList)
+		repo.POST("/registry", session.MustPush, api.PostRegistry)
+		repo.GET("/registry/:registry", session.MustPush, api.GetRegistry)
+		repo.PATCH("/registry/:registry", session.MustPush, api.PatchRegistry)
+		repo.DELETE("/registry/:registry", session.MustPush, api.DeleteRegistry)
 
 		// requires admin permissions
-		repo.PATCH("", session.MustRepoAdmin(), server.PatchRepo)
-		repo.DELETE("", session.MustRepoAdmin(), server.DeleteRepo)
-		repo.POST("/chown", session.MustRepoAdmin(), server.ChownRepo)
-		repo.POST("/repair", session.MustRepoAdmin(), server.RepairRepo)
-		repo.POST("/move", session.MustRepoAdmin(), server.MoveRepo)
-
-		repo.POST("/builds/:number", session.MustPush, server.PostBuild)
-		repo.DELETE("/builds/:number", session.MustPush, server.DeleteBuild)
-		repo.POST("/builds/:number/approve", session.MustPush, server.PostApproval)
-		repo.POST("/builds/:number/decline", session.MustPush, server.PostDecline)
-		repo.DELETE("/builds/:number/:job", session.MustPush, server.DeleteBuild)
-		repo.DELETE("/logs/:number", session.MustPush, server.DeleteBuildLogs)
+		repo.PATCH("", session.MustRepoAdmin(), api.PatchRepo)
+		repo.DELETE("", session.MustRepoAdmin(), api.DeleteRepo)
+		repo.POST("/chown", session.MustRepoAdmin(), api.ChownRepo)
+		repo.POST("/repair", session.MustRepoAdmin(), api.RepairRepo)
+		repo.POST("/move", session.MustRepoAdmin(), api.MoveRepo)
+
+		repo.POST("/builds/:number", session.MustPush, api.PostBuild)
+		repo.DELETE("/builds/:number", session.MustPush, api.DeleteBuild)
+		repo.POST("/builds/:number/approve", session.MustPush, api.PostApproval)
+		repo.POST("/builds/:number/decline", session.MustPush, api.PostDecline)
+		repo.DELETE("/builds/:number/:job", session.MustPush, api.DeleteBuild)
+		repo.DELETE("/logs/:number", session.MustPush, api.DeleteBuildLogs)
 	}
 
 	badges := e.Group("/api/badges/:owner/:name")
 	{
-		badges.GET("/status.svg", server.GetBadge)
-		badges.GET("/cc.xml", server.GetCC)
+		badges.GET("/status.svg", api.GetBadge)
+		badges.GET("/cc.xml", api.GetCC)
 	}
 
-	e.POST("/hook", server.PostHook)
-	e.POST("/api/hook", server.PostHook)
+	e.POST("/hook", api.PostHook)
+	e.POST("/api/hook", api.PostHook)
 
 	sse := e.Group("/stream")
 	{
-		sse.GET("/events", server.EventStreamSSE)
+		sse.GET("/events", api.EventStreamSSE)
 		sse.GET("/logs/:owner/:name/:build/:number",
 			session.SetRepo(),
 			session.SetPerm(),
 			session.MustPull,
-			server.LogStreamSSE,
+			api.LogStreamSSE,
 		)
 	}
 
 	queue := e.Group("/api/queue")
 	{
 		queue.GET("/info",
 			session.MustAdmin(),
-			server.GetQueueInfo,
+			api.GetQueueInfo,
 		)
 		queue.GET("/pause",
 			session.MustAdmin(),
-			server.PauseQueue,
+			api.PauseQueue,
 		)
 		queue.GET("/resume",
 			session.MustAdmin(),
-			server.ResumeQueue,
+			api.ResumeQueue,
 		)
 		queue.GET("/norunningbuilds",
 			session.MustAdmin(),
-			server.BlockTilQueueHasRunningItem,
+			api.BlockTilQueueHasRunningItem,
 		)
 	}
 
 	auth := e.Group("/authorize")
 	{
-		auth.GET("", server.HandleAuth)
-		auth.POST("", server.HandleAuth)
-		auth.POST("/token", server.GetLoginToken)
+		auth.GET("", api.HandleAuth)
+		auth.POST("", api.HandleAuth)
+		auth.POST("/token", api.GetLoginToken)
 	}
 
 	builds := e.Group("/api/builds")
 	{
 		builds.Use(session.MustAdmin())
-		builds.GET("", server.GetBuildQueue)
+		builds.GET("", api.GetBuildQueue)
 	}
 
 	debugger := e.Group("/api/debug")
@@ -193,8 +193,8 @@ func Load(mux *httptreemux.ContextMux, middleware ...gin.HandlerFunc) http.Handl
 		monitor.GET("", metrics.PromHandler())
 	}
 
-	e.GET("/version", server.Version)
-	e.GET("/healthz", server.Health)
+	e.GET("/version", api.Version)
+	e.GET("/healthz", api.Health)
 
 	return e
 }

server/badge.go → server/api/badge.go

@@ -15,7 +15,7 @@
 //
 // This file has been modified by Informatyka Boguslawski sp. z o.o. sp.k.
 
-package server
+package api
 
 import (
 	"fmt"
@@ -24,6 +24,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/store"
 )
 
@@ -94,7 +95,7 @@ func GetCC(c *gin.Context) {
 		return
 	}
 
-	url := fmt.Sprintf("%s/%s/%d", Config.Server.Host, repo.FullName, builds[0].Number)
+	url := fmt.Sprintf("%s/%s/%d", server.Config.Server.Host, repo.FullName, builds[0].Number)
 	cc := model.NewCC(repo, builds[0], url)
 	c.XML(200, cc)
 }