Move package store/ to server/store/ (#341)

* Refactor: move store/ to server/store/

* fix pipeline for moved tests

Co-authored-by: 6543 <6543@obermui.de>

.woodpecker/main.yml

@@ -27,7 +27,7 @@ pipeline:
       - DATABASE_DRIVER=postgres
       - DATABASE_CONFIG=host=postgres user=postgres dbname=postgres sslmode=disable
     commands:
-      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/server/store/datastore
 
   test-mysql:
     image: golang:1.16
@@ -36,7 +36,7 @@ pipeline:
       - DATABASE_DRIVER=mysql
       - DATABASE_CONFIG=root@tcp(mysql:3306)/test?parseTime=true
     commands:
-      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/store/datastore
+      - go test -timeout 30s github.com/woodpecker-ci/woodpecker/server/store/datastore
 
   build-frontend:
     image: node:10.17.0-stretch

cmd/server/server.go

@@ -42,7 +42,7 @@ import (
 	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/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/contrib/ginrus"
 	"github.com/sirupsen/logrus"

cmd/server/setup.go

@@ -36,9 +36,9 @@ import (
 	"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/store"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore"
 	"github.com/woodpecker-ci/woodpecker/server/web"
-	"github.com/woodpecker-ci/woodpecker/store"
-	"github.com/woodpecker-ci/woodpecker/store/datastore"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/urfave/cli"

server/api/badge.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/server"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 var (

server/api/build.go

@@ -30,13 +30,12 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 	"github.com/woodpecker-ci/woodpecker/cncd/queue"
-	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
-
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 func GetBuilds(c *gin.Context) {

server/api/file.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 // FileList gets a list file by build.

server/api/hook.go

@@ -34,7 +34,6 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
@@ -42,6 +41,7 @@ import (
 	"github.com/woodpecker-ci/woodpecker/cncd/queue"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 var skipRe = regexp.MustCompile(`\[(?i:ci *skip|skip *ci)\]`)

server/api/login.go

@@ -23,9 +23,9 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/httputil"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"

server/api/repo.go

@@ -27,8 +27,8 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 )
 
 func PostRepo(c *gin.Context) {

server/api/stream.go

@@ -27,7 +27,7 @@ import (
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/server"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"

server/api/user.go

@@ -28,8 +28,8 @@ import (
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 )
 
 func GetSelf(c *gin.Context) {

server/api/users.go

@@ -22,7 +22,7 @@ import (
 	"github.com/gorilla/securecookie"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 func GetUsers(c *gin.Context) {

server/api/z.go

@@ -16,7 +16,7 @@ package api
 
 import (
 	"github.com/gin-gonic/gin"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/version"
 )
 

server/grpc/rpc.go

@@ -42,7 +42,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/woodpecker-ci/expr"
 )

server/router/middleware/session/repo.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"

server/router/middleware/session/user.go

@@ -18,8 +18,8 @@ import (
 	"net/http"
 
 	"github.com/woodpecker-ci/woodpecker/model"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
-	"github.com/woodpecker-ci/woodpecker/store"
 
 	"github.com/gin-gonic/gin"
 )

server/router/middleware/store.go

@@ -16,7 +16,7 @@ package middleware
 
 import (
 	"github.com/urfave/cli"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 )

server/router/middleware/token/token.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"

server/shared/userSyncer.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/woodpecker-ci/woodpecker/model"
 	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/store"
+	"github.com/woodpecker-ci/woodpecker/server/store"
 )
 
 // UserSyncer syncs the user repository and permissions.

server/store/datastore/builds.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) GetBuild(id int64) (*model.Build, error) {

server/store/datastore/config.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/russross/meddler"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/sql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/sql"
 )
 
 func (db *datastore) ConfigsForBuild(buildID int64) ([]*model.Config, error) {

server/store/datastore/ddl/migrate.go

@@ -18,9 +18,9 @@ import (
 	"database/sql"
 	"errors"
 
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/mysql"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/postgres"
-	"github.com/woodpecker-ci/woodpecker/store/datastore/ddl/sqlite"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/mysql"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/postgres"
+	"github.com/woodpecker-ci/woodpecker/server/store/datastore/ddl/sqlite"
 )
 
 // Supported database drivers