feat(runtime): add logic from pkg-runtime

go-vela · Oct 27, 2021 · 441f70a · 441f70a
1 parent 5b1f57b
commit 441f70a
Show file tree

Hide file tree

Showing 80 changed files with 5,945 additions and 38 deletions.
diff --git a/cmd/vela-worker/exec.go b/cmd/vela-worker/exec.go
@@ -8,8 +8,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-vela/pkg-runtime/runtime"
 	"github.com/go-vela/worker/executor"
+	"github.com/go-vela/worker/runtime"
 	"github.com/go-vela/worker/version"
 
 	"github.com/sirupsen/logrus"
@@ -27,7 +27,7 @@ func (w *Worker) exec(index int) error {
 
 	// setup the runtime
 	//
-	// https://pkg.go.dev/github.com/go-vela/pkg-runtime/runtime?tab=doc#New
+	// https://pkg.go.dev/github.com/go-vela/worker/runtime?tab=doc#New
 	w.Runtime, err = runtime.New(w.Config.Runtime)
 	if err != nil {
 		return err

diff --git a/cmd/vela-worker/flags.go b/cmd/vela-worker/flags.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/go-vela/pkg-queue/queue"
-	"github.com/go-vela/pkg-runtime/runtime"
 	"github.com/go-vela/worker/executor"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/urfave/cli/v2"
 )

diff --git a/cmd/vela-worker/run.go b/cmd/vela-worker/run.go
@@ -11,8 +11,8 @@ import (
 	"github.com/gin-gonic/gin"
 
 	"github.com/go-vela/pkg-queue/queue"
-	"github.com/go-vela/pkg-runtime/runtime"
 	"github.com/go-vela/worker/executor"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/sirupsen/logrus"
 

diff --git a/cmd/vela-worker/validate.go b/cmd/vela-worker/validate.go
@@ -72,7 +72,7 @@ func (w *Worker) Validate() error {
 
 	// verify the runtime configuration
 	//
-	// https://godoc.org/github.com/go-vela/pkg-runtime/runtime#Setup.Validate
+	// https://godoc.org/github.com/go-vela/worker/runtime#Setup.Validate
 	err = w.Config.Runtime.Validate()
 	if err != nil {
 		return err

diff --git a/cmd/vela-worker/worker.go b/cmd/vela-worker/worker.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/go-vela/pkg-queue/queue"
-	"github.com/go-vela/pkg-runtime/runtime"
 	"github.com/go-vela/sdk-go/vela"
 	"github.com/go-vela/worker/executor"
+	"github.com/go-vela/worker/runtime"
 )
 
 type (

diff --git a/executor/context_test.go b/executor/context_test.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/go-vela/worker/executor/linux"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 )

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/go-vela/worker/executor/linux"
 	"github.com/go-vela/worker/executor/local"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/build_test.go b/executor/linux/build_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/go-vela/mock/server"
 	"github.com/urfave/cli/v2"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/driver_test.go b/executor/linux/driver_test.go
@@ -11,9 +11,9 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-vela/mock/server"
-	"github.com/go-vela/pkg-runtime/runtime/docker"
 	"github.com/go-vela/sdk-go/vela"
 	"github.com/go-vela/types/constants"
+	"github.com/go-vela/worker/runtime/docker"
 )
 
 func TestLinux_Driver(t *testing.T) {

diff --git a/executor/linux/linux.go b/executor/linux/linux.go
@@ -7,7 +7,7 @@ package linux
 import (
 	"sync"
 
-	"github.com/go-vela/pkg-runtime/runtime"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/linux_test.go b/executor/linux/linux_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/go-vela/mock/server"
 	"github.com/go-vela/types"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/opts.go b/executor/linux/opts.go
@@ -7,7 +7,7 @@ package linux
 import (
 	"fmt"
 
-	"github.com/go-vela/pkg-runtime/runtime"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/opts_test.go b/executor/linux/opts_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime"
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/secret_test.go b/executor/linux/secret_test.go
@@ -17,7 +17,7 @@ import (
 	"github.com/go-vela/compiler/compiler/native"
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/service_test.go b/executor/linux/service_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/stage_test.go b/executor/linux/stage_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/go-vela/compiler/compiler/native"
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/linux/step_test.go b/executor/linux/step_test.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/local/build_test.go b/executor/local/build_test.go
@@ -12,7 +12,7 @@ import (
 	"github.com/go-vela/compiler/compiler/native"
 	"github.com/urfave/cli/v2"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 )
 
 func TestLocal_CreateBuild(t *testing.T) {

diff --git a/executor/local/driver_test.go b/executor/local/driver_test.go
@@ -8,8 +8,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
 	"github.com/go-vela/types/constants"
+	"github.com/go-vela/worker/runtime/docker"
 )
 
 func TestLocal_Driver(t *testing.T) {

diff --git a/executor/local/local.go b/executor/local/local.go
@@ -7,10 +7,10 @@ package local
 import (
 	"sync"
 
-	"github.com/go-vela/pkg-runtime/runtime"
 	"github.com/go-vela/sdk-go/vela"
 	"github.com/go-vela/types/library"
 	"github.com/go-vela/types/pipeline"
+	"github.com/go-vela/worker/runtime"
 )
 
 type (

diff --git a/executor/local/local_test.go b/executor/local/local_test.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/local/opts.go b/executor/local/opts.go
@@ -7,7 +7,7 @@ package local
 import (
 	"fmt"
 
-	"github.com/go-vela/pkg-runtime/runtime"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/local/opts_test.go b/executor/local/opts_test.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/go-vela/mock/server"
 
-	"github.com/go-vela/pkg-runtime/runtime"
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/executor/local/service_test.go b/executor/local/service_test.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/types/library"
 	"github.com/go-vela/types/pipeline"

diff --git a/executor/local/stage_test.go b/executor/local/stage_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/go-vela/compiler/compiler/native"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/types/pipeline"
 )

diff --git a/executor/local/step_test.go b/executor/local/step_test.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/types/library"
 	"github.com/go-vela/types/pipeline"

diff --git a/executor/setup.go b/executor/setup.go
@@ -13,7 +13,7 @@ import (
 	"github.com/go-vela/worker/executor/linux"
 	"github.com/go-vela/worker/executor/local"
 
-	"github.com/go-vela/pkg-runtime/runtime"
+	"github.com/go-vela/worker/runtime"
 
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/library"

diff --git a/executor/setup_test.go b/executor/setup_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/go-vela/worker/executor/linux"
 	"github.com/go-vela/worker/executor/local"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
+	"github.com/go-vela/worker/runtime/docker"
 
 	"github.com/go-vela/sdk-go/vela"
 

diff --git a/go.mod b/go.mod
@@ -4,18 +4,28 @@ go 1.16
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
+	github.com/buildkite/yaml v0.0.0-20181016232759-0caa5f0796e3
 	github.com/docker/distribution v2.7.1+incompatible
+	github.com/docker/docker v20.10.9+incompatible
+	github.com/docker/go-units v0.4.0
+	github.com/fatih/color v1.10.0 // indirect
 	github.com/gin-gonic/gin v1.7.4
 	github.com/go-vela/compiler v0.10.0
 	github.com/go-vela/mock v0.10.0
 	github.com/go-vela/pkg-queue v0.10.0
-	github.com/go-vela/pkg-runtime v0.10.1-0.20211025172651-7d29320dd785
 	github.com/go-vela/sdk-go v0.10.0
 	github.com/go-vela/types v0.10.0
 	github.com/google/go-cmp v0.5.6
+	github.com/google/gofuzz v1.2.0 // indirect
+	github.com/google/uuid v1.2.0 // indirect
+	github.com/hashicorp/go-hclog v0.10.0 // indirect
 	github.com/joho/godotenv v1.4.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/urfave/cli/v2 v2.3.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+	gotest.tools/v3 v3.0.3
+	k8s.io/api v0.22.2
+	k8s.io/apimachinery v0.22.2
+	k8s.io/client-go v0.22.2
 )
diff --git a/go.sum b/go.sum
@@ -167,8 +167,6 @@ github.com/go-vela/mock v0.10.0 h1:ZJs40xElnB4DNiQc+nEEeZS4Z0K/uXl6kGRpPlccuMY=
 github.com/go-vela/mock v0.10.0/go.mod h1:TihYvb+NBiKXgcsBIpARU9H00rzrLAhFQvsRkzUqDxc=
 github.com/go-vela/pkg-queue v0.10.0 h1:cxpkyVuX+ZJuF9t7XEQuHOFBa776SNgraEsFpnWI03E=
 github.com/go-vela/pkg-queue v0.10.0/go.mod h1:ZtkPoazVfpKK/ePdea/2s2LpNWDrc19nqmn1hPI3jxY=
-github.com/go-vela/pkg-runtime v0.10.1-0.20211025172651-7d29320dd785 h1:VByvQACNppX/P74CfgSr+E0+HuOCMXnDHZYFiF9HdCs=
-github.com/go-vela/pkg-runtime v0.10.1-0.20211025172651-7d29320dd785/go.mod h1:7KV1aAufGNpGbbLLsD7W7z8gc50fXdIK03NPM+SClg8=
 github.com/go-vela/sdk-go v0.10.0 h1:monESdM738WeY2MKlj0COGK0W/f1PIGwp8K4tClfLlo=
 github.com/go-vela/sdk-go v0.10.0/go.mod h1:LGHpZezP0+KBb3OX9Mf5rGXK1dS7Ms8kWCHb8bWzOYc=
 github.com/go-vela/types v0.10.0-rc3/go.mod h1:6taTlivaC0wDwDJVlc8sBaVZToyzkyDMtGUYIAfgA9M=
@@ -351,13 +349,11 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
 github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.10.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ=
 github.com/onsi/gomega v1.16.0 h1:6gjqkI8iiRHMvdccRJM8rVKjCWk6ZIm6FTm3ddIe4/c=
 github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -522,7 +518,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20210520170846-37e1c6afe023/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=

diff --git a/router/middleware/executor/executor_test.go b/router/middleware/executor/executor_test.go
@@ -12,12 +12,12 @@ import (
 
 	"github.com/gin-gonic/gin"
 
-	"github.com/go-vela/pkg-runtime/runtime/docker"
 	"github.com/go-vela/sdk-go/vela"
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/library"
 	"github.com/go-vela/types/pipeline"
 	"github.com/go-vela/worker/executor"
+	"github.com/go-vela/worker/runtime/docker"
 )
 
 func TestExecutor_Retrieve(t *testing.T) {