Move cncd/pipeline/pipeline/ to pipeline/ (#347)

* Refactor: move cncd/pipeline/ to pipeline/

* Refactor: move pipeline/pipeline/ to pipeline/

agent/runner.go

@@ -25,10 +25,10 @@ import (
 
 	"google.golang.org/grpc/metadata"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/pipeline"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
+	"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
 
 	"github.com/rs/zerolog/log"
 	"github.com/tevino/abool"

cli/exec/exec.go

@@ -13,16 +13,16 @@ import (
 	"time"
 
 	"github.com/drone/envsubst"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline"
+	"github.com/woodpecker-ci/woodpecker/pipeline"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend/docker"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/compiler"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/compiler"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/linter"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/linter"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/matrix"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/matrix"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/interrupt"
+	"github.com/woodpecker-ci/woodpecker/pipeline/interrupt"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
 
 	"github.com/urfave/cli"
 )

cmd/agent/agent.go

@@ -28,8 +28,8 @@ import (
 	"google.golang.org/grpc/metadata"
 
 	"github.com/woodpecker-ci/woodpecker/agent"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend/docker"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend/docker"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc"
+	"github.com/woodpecker-ci/woodpecker/pipeline/rpc"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"

cmd/server/server.go

@@ -33,7 +33,7 @@ import (
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	"github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto"
 	"github.com/woodpecker-ci/woodpecker/server"
 	woodpeckerGrpcServer "github.com/woodpecker-ci/woodpecker/server/grpc"
 	"github.com/woodpecker-ci/woodpecker/server/logging"

cncd/pipeline/.drone.yml

@@ -1,15 +0,0 @@
-workspace:
-  base: /go
-  path: src/github.com/woodpecker-ci/woodpecker/cncd/pipeline
-
-pipeline:
-  install:
-    image: golang:1.8
-    commands:
-      - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipec
-      - go install github.com/woodpecker-ci/woodpecker/cncd/pipeline/piped
-
-  test:
-    image: golang:1.8
-    commands:
-      - go test -cover -timeout 30s github.com/woodpecker-ci/woodpecker/cncd/pipeline/...

cncd/pipeline/.gitignore

@@ -1,2 +0,0 @@
-*.txt
-*.out

pipeline/backend/docker/convert.go

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 )
 
 // returns a container configuration.

pipeline/backend/docker/docker.go

@@ -8,7 +8,7 @@ import (
 	"io"
 	"os"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 
 	"docker.io/go-docker"
 	"docker.io/go-docker/api/types"

pipeline/backend/docker/pool.go

@@ -3,7 +3,7 @@ package docker
 // import (
 // 	"context"
 //
-// 	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+// 	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 // )
 //
 // // Pool manages a pool of Docker clients.

pipeline/backend/kubernetes/kubernetes.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"io"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 )
 
 type engine struct {

pipeline/frontend/yaml/compiler/cacher.go

@@ -4,7 +4,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
 
 	libcompose "github.com/docker/libcompose/yaml"
 )

pipeline/frontend/yaml/compiler/compiler.go

@@ -3,9 +3,9 @@ package compiler
 import (
 	"fmt"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
 )
 
 // TODO(bradrydzewski) compiler should handle user-defined volumes from YAML

pipeline/frontend/yaml/compiler/convert.go

@@ -5,8 +5,8 @@ import (
 	"path"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
 )
 
 func (c *Compiler) createProcess(name string, container *yaml.Container, section string) *backend.Step {

pipeline/frontend/yaml/compiler/option.go

@@ -6,7 +6,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
 )
 
 // Option configures a compiler option.

pipeline/frontend/yaml/compiler/option_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
 )
 
 func TestWithWorkspace(t *testing.T) {

pipeline/frontend/yaml/constraint.go

@@ -7,8 +7,8 @@ import (
 
 	doublestar "github.com/bmatcuk/doublestar/v4"
 	libcompose "github.com/docker/libcompose/yaml"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml/types"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml/types"
 	"gopkg.in/yaml.v3"
 )
 

pipeline/frontend/yaml/constraint_test.go

@@ -3,7 +3,7 @@ package yaml
 import (
 	"testing"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
 
 	"gopkg.in/yaml.v3"
 )

pipeline/frontend/yaml/linter/linter.go

@@ -3,7 +3,7 @@ package linter
 import (
 	"fmt"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
 )
 
 const (

pipeline/frontend/yaml/linter/linter_test.go

@@ -3,7 +3,7 @@ package linter
 import (
 	"testing"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/frontend/yaml"
+	"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
 )
 
 func TestLint(t *testing.T) {

pipeline/logger.go

@@ -1,8 +1,8 @@
 package pipeline
 
 import (
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
 )
 
 // Logger handles the process logging.

pipeline/option.go

@@ -3,7 +3,7 @@ package pipeline
 import (
 	"context"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 )
 
 // Option configures a runtime option.

pipeline/parse.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 )
 
 // Parse parses the pipeline config from an io.Reader.

pipeline/pipeline.go

@@ -6,8 +6,8 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/multipart"
+	"github.com/woodpecker-ci/woodpecker/pipeline/multipart"
 )
 
 type (

pipeline/rpc/client_grpc.go

@@ -6,8 +6,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	"github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

pipeline/rpc/client_grpc_health.go

@@ -5,8 +5,8 @@ import (
 	// "encoding/json"
 	"time"
 
-	// "github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	// "github.com/woodpecker-ci/woodpecker/pipeline/backend"
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/rpc/proto"
+	"github.com/woodpecker-ci/woodpecker/pipeline/rpc/proto"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"

pipeline/rpc/peer.go

@@ -3,7 +3,7 @@ package rpc
 import (
 	"context"
 
-	"github.com/woodpecker-ci/woodpecker/cncd/pipeline/pipeline/backend"
+	"github.com/woodpecker-ci/woodpecker/pipeline/backend"
 )
 
 // ErrCancelled signals the pipeine is cancelled.