Move cncd/{logging,pubsub,queue}/ to server/{logging,pubsub,queue}/ (#346)

* Move cncd/{logging,pubsub,queue}/ to server/{logging,pubsub,queue}/

* Update REAMDEs and include history

Co-authored-by: Anbraten <anton@ju60.de>

Co-authored-by: Anbraten <anton@ju60.de>

cmd/server/server.go

@@ -33,12 +33,12 @@ import (
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/sync/errgroup"
 
-	"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/server"
 	woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc"
+	"github.com/woodpecker-ci/woodpecker/server/logging"
 	"github.com/woodpecker-ci/woodpecker/server/plugins/sender"
+	"github.com/woodpecker-ci/woodpecker/server/pubsub"
 	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware"

cmd/server/setup.go

@@ -21,12 +21,12 @@ import (
 	"github.com/dimfeld/httptreemux"
 	"github.com/prometheus/client_golang/prometheus"
 	"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/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/queue"
 	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket"
 	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver"

cncd/logging/README

@@ -1,6 +0,0 @@
-Go package provides a common interface for storing and streaming logs.
-
-Documentation:
-
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/logging
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/logging/gcp

cncd/pubsub/README

@@ -1,6 +0,0 @@
-Go package provides a common interface for publish-subscriber messaging.
-
-Documentation:
-
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/pubsub
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/pubsub/gcp

cncd/queue/README

@@ -1,6 +0,0 @@
-Go package provides a common interface for working with task queues.
-
-Documentation:
-
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/queue
-    http://godoc.org/github.com/woodpecker-ci/woodpecker/cncd/queue/gcp

model/queue.go

@@ -18,7 +18,7 @@ import (
 	"context"
 
 	"github.com/sirupsen/logrus"
-	"github.com/woodpecker-ci/woodpecker/cncd/queue"
+	"github.com/woodpecker-ci/woodpecker/server/queue"
 )
 
 // Task defines scheduled pipeline Task.

server/api/build.go

@@ -29,9 +29,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"github.com/woodpecker-ci/woodpecker/cncd/queue"
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/queue"
 	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"

server/api/hook.go

@@ -36,9 +36,9 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
-	"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/pubsub"
+	"github.com/woodpecker-ci/woodpecker/server/queue"
 	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
 	"github.com/woodpecker-ci/woodpecker/server/store"

server/api/stream.go

@@ -22,10 +22,10 @@ import (
 	"strconv"
 	"time"
 
-	"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/server"
+	"github.com/woodpecker-ci/woodpecker/server/logging"
+	"github.com/woodpecker-ci/woodpecker/server/pubsub"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 

server/config.go

@@ -20,10 +20,10 @@ package server
 import (
 	"time"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/logging"
-	"github.com/woodpecker-ci/woodpecker/cncd/pubsub"
-	"github.com/woodpecker-ci/woodpecker/cncd/queue"
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/server/logging"
+	"github.com/woodpecker-ci/woodpecker/server/pubsub"
+	"github.com/woodpecker-ci/woodpecker/server/queue"
 )
 
 var Config = struct {

server/grpc/rpc.go

@@ -32,12 +32,12 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/sirupsen/logrus"
-	"github.com/woodpecker-ci/woodpecker/cncd/logging"
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"
-	"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/logging"
+	"github.com/woodpecker-ci/woodpecker/server/pubsub"
+	"github.com/woodpecker-ci/woodpecker/server/queue"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
 
 	"github.com/woodpecker-ci/woodpecker/model"

server/logging/README.md

@@ -0,0 +1,12 @@
+# logging package
+
+Go package provides a common interface for storing and streaming logs.
+
+## History
+
+This was originally published in: https://github.com/cncd/logging
+Then it was included in: https://github.com/drone-ci/drone/cncd/logging
+
+## Documentation:
+
+https://godoc.org/github.com/woodpecker-ci/woodpecker/server/logging

server/pubsub/README.md

@@ -0,0 +1,12 @@
+# pubusb package
+
+Go package provides a common interface for publish-subscriber messaging.
+
+## History
+
+This was originally published in: https://github.com/cncd/pubsub
+Then it was included in: https://github.com/drone-ci/drone/cncd/pubsub
+
+## Documentation:
+
+https://godoc.org/github.com/woodpecker-ci/woodpecker/server/pubsub

server/queue/README.md

@@ -0,0 +1,12 @@
+# queue package
+
+Go package provides a common interface for working with task queues.
+
+## History
+
+This was originally published in: https://github.com/cncd/queue
+Then it was included in: https://github.com/drone-ci/drone/cncd/queue
+
+## Documentation:
+
+https://godoc.org/github.com/woodpecker-ci/woodpecker/server/queue