Refactor: move remote/ to server/remote/ (#344)

cmd/server/server.go

@@ -36,10 +36,10 @@ import (
 	"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/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
 	woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc"
 	"github.com/woodpecker-ci/woodpecker/server/plugins/sender"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware"
 	"github.com/woodpecker-ci/woodpecker/server/store"

cmd/server/setup.go

@@ -23,19 +23,19 @@ import (
 	"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/remote"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver"
-	"github.com/woodpecker-ci/woodpecker/remote/coding"
-	"github.com/woodpecker-ci/woodpecker/remote/gitea"
-	"github.com/woodpecker-ci/woodpecker/remote/github"
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab"
-	"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/plugins/environments"
 	"github.com/woodpecker-ci/woodpecker/server/plugins/registry"
 	"github.com/woodpecker-ci/woodpecker/server/plugins/secrets"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver"
+	"github.com/woodpecker-ci/woodpecker/server/remote/coding"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitea"
+	"github.com/woodpecker-ci/woodpecker/server/remote/github"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab3"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gogs"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/server/store/datastore"
 	"github.com/woodpecker-ci/woodpecker/server/web"

server/api/build.go

@@ -31,8 +31,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/woodpecker-ci/woodpecker/cncd/queue"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
 	"github.com/woodpecker-ci/woodpecker/server/store"

server/api/hook.go

@@ -32,7 +32,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/shared/token"
 
 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
@@ -40,6 +39,7 @@ import (
 	"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/remote"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 )

server/api/login.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/gorilla/securecookie"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/httputil"
 	"github.com/woodpecker-ci/woodpecker/shared/token"

server/api/repo.go

@@ -24,8 +24,8 @@ import (
 	"github.com/gorilla/securecookie"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/store"
 	"github.com/woodpecker-ci/woodpecker/shared/token"

server/api/user.go

@@ -25,7 +25,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/server/router/middleware/session"
 	"github.com/woodpecker-ci/woodpecker/server/shared"
 	"github.com/woodpecker-ci/woodpecker/server/store"

server/grpc/rpc.go

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

server/remote/bitbucket/bitbucket.go

@@ -20,9 +20,9 @@ import (
 	"net/url"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal"
 
 	"golang.org/x/oauth2"
 )

server/remote/bitbucket/bitbucket_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/fixtures"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal"
 
 	"github.com/franela/goblin"
 	"github.com/gin-gonic/gin"

server/remote/bitbucket/convert.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal"
 
 	"golang.org/x/oauth2"
 )

server/remote/bitbucket/convert_test.go

@@ -19,7 +19,7 @@ import (
 	"time"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal"
 
 	"github.com/franela/goblin"
 	"golang.org/x/oauth2"

server/remote/bitbucket/parse.go

@@ -20,7 +20,7 @@ import (
 	"net/http"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/internal"
 )
 
 const (

server/remote/bitbucket/parse_test.go

@@ -19,7 +19,7 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucket/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucket/fixtures"
 
 	"github.com/franela/goblin"
 )

server/remote/bitbucketserver/bitbucketserver.go

@@ -30,8 +30,8 @@ import (
 
 	"github.com/mrjones/oauth"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal"
 )
 
 const (

server/remote/bitbucketserver/convert.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/mrjones/oauth"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal"
 )
 
 const (

server/remote/bitbucketserver/convert_test.go

@@ -20,7 +20,7 @@ import (
 	"github.com/franela/goblin"
 	"github.com/mrjones/oauth"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal"
 )
 
 func Test_helper(t *testing.T) {

server/remote/bitbucketserver/parse.go

@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/bitbucketserver/internal"
+	"github.com/woodpecker-ci/woodpecker/server/remote/bitbucketserver/internal"
 	"net/http"
 )
 

server/remote/coding/coding.go

@@ -21,9 +21,9 @@ import (
 	"strings"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
-	"github.com/woodpecker-ci/woodpecker/remote/coding/internal"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote/coding/internal"
 
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"

server/remote/coding/coding_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/coding/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures"
 
 	"github.com/franela/goblin"
 	"github.com/gin-gonic/gin"

server/remote/coding/hook_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/coding/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/coding/fixtures"
 
 	"github.com/franela/goblin"
 )

server/remote/gerrit/gerrit.go

@@ -21,7 +21,7 @@ import (
 	"net/url"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 )
 
 // IMPORTANT Gerrit support is not yet implemented. This file is a placeholder

server/remote/gitea/gitea.go

@@ -28,7 +28,7 @@ import (
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 )
 
 // Opts defines configuration options.

server/remote/gitea/gitea_oauth.go

@@ -28,8 +28,8 @@ import (
 
 	"code.gitea.io/sdk/gitea"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 
 	"golang.org/x/oauth2"
 )

server/remote/gitea/gitea_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/franela/goblin"
 	"github.com/gin-gonic/gin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures"
 )
 
 func Test_gitea(t *testing.T) {

server/remote/gitea/helper_test.go

@@ -21,7 +21,7 @@ import (
 	"code.gitea.io/sdk/gitea"
 	"github.com/franela/goblin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures"
 )
 
 func Test_parse(t *testing.T) {

server/remote/gitea/parse_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gitea/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitea/fixtures"
 )
 
 func Test_parser(t *testing.T) {

server/remote/github/github.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 
 	"github.com/google/go-github/github"
 	"golang.org/x/net/context"

server/remote/github/github_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/github/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures"
 
 	"github.com/franela/goblin"
 	"github.com/gin-gonic/gin"

server/remote/github/parse_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/github/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/github/fixtures"
 )
 
 func Test_parser(t *testing.T) {

server/remote/gitlab/gitlab.go

@@ -25,11 +25,11 @@ import (
 	"strings"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/shared/oauth2"
 
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab/client"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab/client"
 )
 
 const DefaultScope = "api"

server/remote/gitlab/gitlab_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab/testdata"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab/testdata"
 )
 
 func Test_Gitlab(t *testing.T) {

server/remote/gitlab/helper.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab/client"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab/client"
 )
 
 const (

server/remote/gitlab3/gitlab.go

@@ -25,11 +25,11 @@ import (
 	"strings"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
 	"github.com/woodpecker-ci/woodpecker/server"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 	"github.com/woodpecker-ci/woodpecker/shared/oauth2"
 
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab3/client"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/client"
 )
 
 const DefaultScope = "api"

server/remote/gitlab3/gitlab_test.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/franela/goblin"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab3/testdata"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/testdata"
 )
 
 func Test_Gitlab(t *testing.T) {

server/remote/gitlab3/helper.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/remote/gitlab3/client"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gitlab3/client"
 )
 
 const (

server/remote/gogs/gogs.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/gogits/go-gogs-client"
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote"
+	"github.com/woodpecker-ci/woodpecker/server/remote"
 )
 
 // Opts defines configuration options.

server/remote/gogs/gogs_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gogs/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures"
 
 	"github.com/franela/goblin"
 	"github.com/gin-gonic/gin"

server/remote/gogs/helper_test.go

@@ -19,7 +19,7 @@ import (
 	"testing"
 
 	"github.com/woodpecker-ci/woodpecker/model"
-	"github.com/woodpecker-ci/woodpecker/remote/gogs/fixtures"
+	"github.com/woodpecker-ci/woodpecker/server/remote/gogs/fixtures"
 
 	"github.com/franela/goblin"
 	"github.com/gogits/go-gogs-client"