From 07303642ce9e8456f1a8fd175dd38338f4a75dfa Mon Sep 17 00:00:00 2001 From: ecrupper Date: Tue, 15 Oct 2024 11:48:47 -0500 Subject: [PATCH] init commit --- cmd/vela-worker/exec.go | 2 +- cmd/vela-worker/run.go | 2 +- executor/engine.go | 2 +- executor/executor_test.go | 2 +- executor/linux/api.go | 2 +- executor/linux/build.go | 4 ++-- executor/linux/build_test.go | 2 +- executor/linux/linux.go | 2 +- executor/linux/linux_test.go | 2 +- executor/linux/opts.go | 2 +- executor/linux/opts_test.go | 2 +- executor/linux/outputs.go | 2 +- executor/linux/outputs_test.go | 2 +- executor/linux/secret.go | 2 +- executor/linux/secret_test.go | 2 +- executor/linux/service.go | 4 ++-- executor/linux/service_test.go | 2 +- executor/linux/stage.go | 2 +- executor/linux/stage_test.go | 2 +- executor/linux/step.go | 4 ++-- executor/linux/step_test.go | 2 +- executor/local/api.go | 2 +- executor/local/build_test.go | 2 +- executor/local/local.go | 2 +- executor/local/local_test.go | 2 +- executor/local/opts.go | 2 +- executor/local/opts_test.go | 2 +- executor/local/service.go | 4 ++-- executor/local/service_test.go | 2 +- executor/local/stage.go | 2 +- executor/local/stage_test.go | 2 +- executor/local/step.go | 4 ++-- executor/local/step_test.go | 2 +- executor/setup.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- internal/message/stream.go | 2 +- internal/service/environment.go | 8 ++++---- internal/service/environment_test.go | 2 +- internal/service/load.go | 2 +- internal/service/load_test.go | 2 +- internal/service/snapshot.go | 2 +- internal/service/snapshot_test.go | 2 +- internal/service/upload.go | 2 +- internal/service/upload_test.go | 2 +- internal/step/environment.go | 8 ++++---- internal/step/environment_test.go | 2 +- internal/step/load.go | 2 +- internal/step/load_test.go | 2 +- internal/step/skip.go | 6 +++--- internal/step/skip_test.go | 2 +- internal/step/snapshot.go | 2 +- internal/step/snapshot_test.go | 2 +- internal/step/upload.go | 2 +- internal/step/upload_test.go | 2 +- mock/worker/pipeline.go | 4 ++-- router/middleware/executor/executor_test.go | 2 +- runtime/docker/build.go | 2 +- runtime/docker/build_test.go | 2 +- runtime/docker/container.go | 2 +- runtime/docker/container_test.go | 2 +- runtime/docker/docker_test.go | 2 +- runtime/docker/image.go | 2 +- runtime/docker/image_test.go | 2 +- runtime/docker/network.go | 2 +- runtime/docker/network_test.go | 2 +- runtime/docker/volume.go | 2 +- runtime/docker/volume_test.go | 2 +- runtime/engine.go | 2 +- runtime/kubernetes/build.go | 3 ++- runtime/kubernetes/build_test.go | 2 +- runtime/kubernetes/container.go | 2 +- runtime/kubernetes/container_test.go | 2 +- runtime/kubernetes/image.go | 2 +- runtime/kubernetes/image_test.go | 2 +- runtime/kubernetes/kubernetes_test.go | 2 +- runtime/kubernetes/network.go | 2 +- runtime/kubernetes/network_test.go | 2 +- runtime/kubernetes/volume.go | 2 +- runtime/kubernetes/volume_test.go | 2 +- 80 files changed, 99 insertions(+), 98 deletions(-) diff --git a/cmd/vela-worker/exec.go b/cmd/vela-worker/exec.go index 99a319ea..25b9e3e3 100644 --- a/cmd/vela-worker/exec.go +++ b/cmd/vela-worker/exec.go @@ -14,11 +14,11 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/queue/models" "github.com/go-vela/types" "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" "github.com/go-vela/worker/version" diff --git a/cmd/vela-worker/run.go b/cmd/vela-worker/run.go index a0ff3cef..d317fb56 100644 --- a/cmd/vela-worker/run.go +++ b/cmd/vela-worker/run.go @@ -13,9 +13,9 @@ import ( _ "github.com/joho/godotenv/autoload" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/queue" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/executor" "github.com/go-vela/worker/runtime" ) diff --git a/executor/engine.go b/executor/engine.go index d9cdcb50..9cac8586 100644 --- a/executor/engine.go +++ b/executor/engine.go @@ -7,7 +7,7 @@ import ( "sync" api "github.com/go-vela/server/api/types" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // Engine represents the interface for Vela integrating diff --git a/executor/executor_test.go b/executor/executor_test.go index 48d8d778..7ac70f2b 100644 --- a/executor/executor_test.go +++ b/executor/executor_test.go @@ -13,9 +13,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" "github.com/go-vela/server/api/types/actions" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/executor/linux" "github.com/go-vela/worker/executor/local" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/api.go b/executor/linux/api.go index 0654000c..d4aeb532 100644 --- a/executor/linux/api.go +++ b/executor/linux/api.go @@ -8,9 +8,9 @@ import ( "time" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/service" "github.com/go-vela/worker/internal/step" ) diff --git a/executor/linux/build.go b/executor/linux/build.go index cc9f54f8..65fef30d 100644 --- a/executor/linux/build.go +++ b/executor/linux/build.go @@ -12,9 +12,9 @@ import ( "golang.org/x/sync/errgroup" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/build" context2 "github.com/go-vela/worker/internal/context" "github.com/go-vela/worker/internal/image" @@ -836,7 +836,7 @@ func loadLazySecrets(c *client, _step *pipeline.Container) error { c.Logger.Debug("substituting container configuration after lazy loaded secret injection") // substitute container configuration // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Substitute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Substitute err = tmpStep.Substitute() if err != nil { return err diff --git a/executor/linux/build_test.go b/executor/linux/build_test.go index 12fac9bf..4ee5696b 100644 --- a/executor/linux/build_test.go +++ b/executor/linux/build_test.go @@ -19,9 +19,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" "github.com/go-vela/server/compiler/native" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/linux.go b/executor/linux/linux.go index d2c1bfd2..c7fde60a 100644 --- a/executor/linux/linux.go +++ b/executor/linux/linux.go @@ -12,8 +12,8 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" ) diff --git a/executor/linux/linux_test.go b/executor/linux/linux_test.go index 4f7f7cfa..45fcc05f 100644 --- a/executor/linux/linux_test.go +++ b/executor/linux/linux_test.go @@ -13,9 +13,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/linux/opts.go b/executor/linux/opts.go index 686485ba..5c394bae 100644 --- a/executor/linux/opts.go +++ b/executor/linux/opts.go @@ -10,7 +10,7 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" ) diff --git a/executor/linux/opts_test.go b/executor/linux/opts_test.go index ade2dd21..707e0e21 100644 --- a/executor/linux/opts_test.go +++ b/executor/linux/opts_test.go @@ -13,9 +13,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" "github.com/go-vela/worker/runtime/kubernetes" diff --git a/executor/linux/outputs.go b/executor/linux/outputs.go index 8a6e7cea..79764b93 100644 --- a/executor/linux/outputs.go +++ b/executor/linux/outputs.go @@ -11,7 +11,7 @@ import ( envparse "github.com/hashicorp/go-envparse" "github.com/sirupsen/logrus" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // outputSvc handles communication with the outputs container during the build. diff --git a/executor/linux/outputs_test.go b/executor/linux/outputs_test.go index e75477c6..08eb319b 100644 --- a/executor/linux/outputs_test.go +++ b/executor/linux/outputs_test.go @@ -14,10 +14,10 @@ import ( "github.com/go-vela/sdk-go/vela" "github.com/go-vela/server/compiler/native" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/secret.go b/executor/linux/secret.go index ed343298..c664f80d 100644 --- a/executor/linux/secret.go +++ b/executor/linux/secret.go @@ -13,9 +13,9 @@ import ( "github.com/sirupsen/logrus" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/internal/step" ) diff --git a/executor/linux/secret_test.go b/executor/linux/secret_test.go index 870815d8..23b147a3 100644 --- a/executor/linux/secret_test.go +++ b/executor/linux/secret_test.go @@ -15,11 +15,11 @@ import ( "github.com/go-vela/sdk-go/vela" "github.com/go-vela/server/compiler/native" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" "github.com/go-vela/types/library/actions" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/service.go b/executor/linux/service.go index 96704c62..d6ab302a 100644 --- a/executor/linux/service.go +++ b/executor/linux/service.go @@ -10,9 +10,9 @@ import ( "io" "time" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/image" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/internal/service" @@ -50,7 +50,7 @@ func (c *client) CreateService(ctx context.Context, ctn *pipeline.Container) err logger.Debug("substituting container configuration") // substitute container configuration // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Substitute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Substitute err = ctn.Substitute() if err != nil { return fmt.Errorf("unable to substitute container configuration") diff --git a/executor/linux/service_test.go b/executor/linux/service_test.go index 9ed98a0e..3ffbfaea 100644 --- a/executor/linux/service_test.go +++ b/executor/linux/service_test.go @@ -10,9 +10,9 @@ import ( "github.com/gin-gonic/gin" "github.com/go-vela/sdk-go/vela" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/stage.go b/executor/linux/stage.go index 5ccf3ce2..823cfe4a 100644 --- a/executor/linux/stage.go +++ b/executor/linux/stage.go @@ -7,8 +7,8 @@ import ( "fmt" "sync" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/step" ) diff --git a/executor/linux/stage_test.go b/executor/linux/stage_test.go index 1a14d3db..e6a09134 100644 --- a/executor/linux/stage_test.go +++ b/executor/linux/stage_test.go @@ -15,8 +15,8 @@ import ( "github.com/go-vela/sdk-go/vela" "github.com/go-vela/server/compiler/native" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/linux/step.go b/executor/linux/step.go index 88186dbc..cf6c6f6b 100644 --- a/executor/linux/step.go +++ b/executor/linux/step.go @@ -12,9 +12,9 @@ import ( "time" "github.com/go-vela/sdk-go/vela" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/image" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/internal/step" @@ -63,7 +63,7 @@ func (c *client) CreateStep(ctx context.Context, ctn *pipeline.Container) error logger.Debug("substituting container configuration") // substitute container configuration // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Substitute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Substitute err = ctn.Substitute() if err != nil { return fmt.Errorf("unable to substitute container configuration") diff --git a/executor/linux/step_test.go b/executor/linux/step_test.go index 2435afb9..88efa6c2 100644 --- a/executor/linux/step_test.go +++ b/executor/linux/step_test.go @@ -12,9 +12,9 @@ import ( "github.com/gin-gonic/gin" "github.com/go-vela/sdk-go/vela" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" diff --git a/executor/local/api.go b/executor/local/api.go index b95743ee..0e7cbb55 100644 --- a/executor/local/api.go +++ b/executor/local/api.go @@ -8,9 +8,9 @@ import ( "time" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/service" "github.com/go-vela/worker/internal/step" ) diff --git a/executor/local/build_test.go b/executor/local/build_test.go index 6c9bc909..7d87325e 100644 --- a/executor/local/build_test.go +++ b/executor/local/build_test.go @@ -11,7 +11,7 @@ import ( "github.com/urfave/cli/v2" "github.com/go-vela/server/compiler/native" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/local/local.go b/executor/local/local.go index 64bab8c5..e5a6eb03 100644 --- a/executor/local/local.go +++ b/executor/local/local.go @@ -9,7 +9,7 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" ) diff --git a/executor/local/local_test.go b/executor/local/local_test.go index 25c50c4c..26c7c9cc 100644 --- a/executor/local/local_test.go +++ b/executor/local/local_test.go @@ -10,8 +10,8 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/local/opts.go b/executor/local/opts.go index 60d40096..245cd8c7 100644 --- a/executor/local/opts.go +++ b/executor/local/opts.go @@ -8,7 +8,7 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime" ) diff --git a/executor/local/opts_test.go b/executor/local/opts_test.go index c063c4fb..89b70d07 100644 --- a/executor/local/opts_test.go +++ b/executor/local/opts_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/runtime" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/local/service.go b/executor/local/service.go index a222f7e0..d9e8b122 100644 --- a/executor/local/service.go +++ b/executor/local/service.go @@ -8,9 +8,9 @@ import ( "fmt" "time" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/internal/service" ) @@ -36,7 +36,7 @@ func (c *client) CreateService(ctx context.Context, ctn *pipeline.Container) err // substitute container configuration // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Substitute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Substitute err = ctn.Substitute() if err != nil { return err diff --git a/executor/local/service_test.go b/executor/local/service_test.go index 40e8e319..ebf68c94 100644 --- a/executor/local/service_test.go +++ b/executor/local/service_test.go @@ -6,8 +6,8 @@ import ( "context" "testing" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/local/stage.go b/executor/local/stage.go index 7a4edab1..611c385d 100644 --- a/executor/local/stage.go +++ b/executor/local/stage.go @@ -9,7 +9,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/step" ) diff --git a/executor/local/stage_test.go b/executor/local/stage_test.go index e2d4f6eb..09d4f5df 100644 --- a/executor/local/stage_test.go +++ b/executor/local/stage_test.go @@ -12,7 +12,7 @@ import ( "github.com/urfave/cli/v2" "github.com/go-vela/server/compiler/native" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/local/step.go b/executor/local/step.go index 23ffb2ef..fea8e10e 100644 --- a/executor/local/step.go +++ b/executor/local/step.go @@ -8,9 +8,9 @@ import ( "fmt" "time" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/internal/step" ) @@ -33,7 +33,7 @@ func (c *client) CreateStep(ctx context.Context, ctn *pipeline.Container) error // substitute container configuration // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Substitute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Substitute err = ctn.Substitute() if err != nil { return err diff --git a/executor/local/step_test.go b/executor/local/step_test.go index 6c215df5..72d8f931 100644 --- a/executor/local/step_test.go +++ b/executor/local/step_test.go @@ -6,8 +6,8 @@ import ( "context" "testing" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/message" "github.com/go-vela/worker/runtime/docker" ) diff --git a/executor/setup.go b/executor/setup.go index 745097e7..2edbb2a0 100644 --- a/executor/setup.go +++ b/executor/setup.go @@ -11,8 +11,8 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/executor/linux" "github.com/go-vela/worker/executor/local" "github.com/go-vela/worker/runtime" diff --git a/go.mod b/go.mod index 0eb84b53..d75f1a1c 100644 --- a/go.mod +++ b/go.mod @@ -8,8 +8,8 @@ require ( github.com/docker/docker v27.3.1+incompatible github.com/docker/go-units v0.5.0 github.com/gin-gonic/gin v1.10.0 - github.com/go-vela/sdk-go v0.25.1 - github.com/go-vela/server v0.25.1 + github.com/go-vela/sdk-go v0.25.2-0.20241011190403-7665967590a9 + github.com/go-vela/server v0.25.1-0.20241011184259-67a8e47f475e github.com/go-vela/types v0.25.1 github.com/golang-jwt/jwt/v5 v5.2.1 github.com/google/go-cmp v0.6.0 diff --git a/go.sum b/go.sum index 72b7eb81..4185e12b 100644 --- a/go.sum +++ b/go.sum @@ -109,10 +109,10 @@ github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27 github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= -github.com/go-vela/sdk-go v0.25.1 h1:aEWH88BjLmV5s3mWPbi7OeGY5u8IQ9xQNF8CWH3e5HU= -github.com/go-vela/sdk-go v0.25.1/go.mod h1:98yxwcqGQidNke/QsbG8WeYJG56AImc9o9dcKiXBQ5k= -github.com/go-vela/server v0.25.1 h1:KM3g5ZD3N6SnttnkfOyJjS2utbL6baKx0mGSJLCEf0c= -github.com/go-vela/server v0.25.1/go.mod h1:QZ9troVMUpDCAdUxxAquHqahkeSwp9Lmx6a47ao0gGs= +github.com/go-vela/sdk-go v0.25.2-0.20241011190403-7665967590a9 h1:yfXWEcO+iZg2CQBFyCf0w8Fn9P6aW4Ygq2zx4lWdCeM= +github.com/go-vela/sdk-go v0.25.2-0.20241011190403-7665967590a9/go.mod h1:lhosdhnq64mNnZBG5oZ/CrVDIwZD4IamlD5Rclj4s8s= +github.com/go-vela/server v0.25.1-0.20241011184259-67a8e47f475e h1:3wUbrVnaMvZSbl8zrU5iHzkYh1xU5fo/QQD/ILcOe5g= +github.com/go-vela/server v0.25.1-0.20241011184259-67a8e47f475e/go.mod h1:/DmGHNzsjsBOStLzlGDIDGCmNztUgCdvHiuWmyafFs8= github.com/go-vela/types v0.25.1 h1:DCPHv1+ouqldjfsjfcVTcm/Yyd0OwazIfxYyR+GwpMo= github.com/go-vela/types v0.25.1/go.mod h1:5+MHUI9ZSY2Uz1cTJa64FWUv8jKzzUUq96UQTokGJzs= github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA= diff --git a/internal/message/stream.go b/internal/message/stream.go index 1683e4bf..a03e2516 100644 --- a/internal/message/stream.go +++ b/internal/message/stream.go @@ -5,7 +5,7 @@ package message import ( "context" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // StreamFunc is either StreamService or StreamStep in executor.Engine. diff --git a/internal/service/environment.go b/internal/service/environment.go index 4b7d92a5..747bbac9 100644 --- a/internal/service/environment.go +++ b/internal/service/environment.go @@ -6,9 +6,9 @@ import ( "fmt" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Environment attempts to update the environment variables @@ -43,7 +43,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Service, versio // populate environment variables from build library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv // -> // https://pkg.go.dev/github.com/go-vela/types/library#Build.Environment err := c.MergeEnv(b.Environment(workspace, channel)) @@ -54,7 +54,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Service, versio // populate environment variables from repo library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv err := c.MergeEnv(b.GetRepo().Environment()) if err != nil { return err @@ -64,7 +64,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Service, versio if s != nil { // populate environment variables from service library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv // -> // https://pkg.go.dev/github.com/go-vela/types/library#Service.Environment err := c.MergeEnv(s.Environment()) diff --git a/internal/service/environment_test.go b/internal/service/environment_test.go index d5581ae3..a1710eca 100644 --- a/internal/service/environment_test.go +++ b/internal/service/environment_test.go @@ -6,8 +6,8 @@ import ( "testing" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/types/raw" ) diff --git a/internal/service/load.go b/internal/service/load.go index 7de02caa..33451c85 100644 --- a/internal/service/load.go +++ b/internal/service/load.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Load attempts to capture the library service diff --git a/internal/service/load_test.go b/internal/service/load_test.go index 2a1fb2d1..3d78b1a9 100644 --- a/internal/service/load_test.go +++ b/internal/service/load_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestService_Load(t *testing.T) { diff --git a/internal/service/snapshot.go b/internal/service/snapshot.go index f1e04232..96517899 100644 --- a/internal/service/snapshot.go +++ b/internal/service/snapshot.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Snapshot creates a moment in time record of the diff --git a/internal/service/snapshot_test.go b/internal/service/snapshot_test.go index f3f03eca..f2bfcb2f 100644 --- a/internal/service/snapshot_test.go +++ b/internal/service/snapshot_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestService_Snapshot(t *testing.T) { diff --git a/internal/service/upload.go b/internal/service/upload.go index 45fe5b22..e80abece 100644 --- a/internal/service/upload.go +++ b/internal/service/upload.go @@ -9,9 +9,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Upload tracks the final state of the service diff --git a/internal/service/upload_test.go b/internal/service/upload_test.go index 313c9f8d..a682724f 100644 --- a/internal/service/upload_test.go +++ b/internal/service/upload_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestService_Upload(t *testing.T) { diff --git a/internal/step/environment.go b/internal/step/environment.go index 7c996276..9fc964e5 100644 --- a/internal/step/environment.go +++ b/internal/step/environment.go @@ -6,9 +6,9 @@ import ( "fmt" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Environment attempts to update the environment variables @@ -46,7 +46,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Step, version, // populate environment variables from build library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv // -> // https://pkg.go.dev/github.com/go-vela/types/library#Build.Environment err := c.MergeEnv(b.Environment(workspace, channel)) @@ -57,7 +57,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Step, version, // populate environment variables from build library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv err := c.MergeEnv(b.GetRepo().Environment()) if err != nil { return err @@ -67,7 +67,7 @@ func Environment(c *pipeline.Container, b *api.Build, s *library.Step, version, if s != nil { // populate environment variables from step library // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.MergeEnv + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.MergeEnv // -> // https://pkg.go.dev/github.com/go-vela/types/library#Service.Environment err := c.MergeEnv(s.Environment()) diff --git a/internal/step/environment_test.go b/internal/step/environment_test.go index 993c4bb8..0217a50d 100644 --- a/internal/step/environment_test.go +++ b/internal/step/environment_test.go @@ -6,8 +6,8 @@ import ( "testing" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" "github.com/go-vela/types/raw" ) diff --git a/internal/step/load.go b/internal/step/load.go index 46b02904..a373e332 100644 --- a/internal/step/load.go +++ b/internal/step/load.go @@ -6,8 +6,8 @@ import ( "fmt" "sync" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Load attempts to capture the library step diff --git a/internal/step/load_test.go b/internal/step/load_test.go index 2358a934..4e3da9b4 100644 --- a/internal/step/load_test.go +++ b/internal/step/load_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestStep_Load(t *testing.T) { diff --git a/internal/step/skip.go b/internal/step/skip.go index 3d122e70..5ea19f38 100644 --- a/internal/step/skip.go +++ b/internal/step/skip.go @@ -6,8 +6,8 @@ import ( "strings" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" ) // Skip creates the ruledata from the build and repository @@ -29,7 +29,7 @@ func Skip(c *pipeline.Container, b *api.Build) (bool, error) { // create ruledata from build and repository information // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#RuleData + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#RuleData ruledata := &pipeline.RuleData{ Branch: b.GetBranch(), Event: event, @@ -63,7 +63,7 @@ func Skip(c *pipeline.Container, b *api.Build) (bool, error) { // return the inverse of container execute // - // https://pkg.go.dev/github.com/go-vela/types/pipeline#Container.Execute + // https://pkg.go.dev/github.com/go-vela/server/compiler/types/pipeline#Container.Execute exec, err := c.Execute(ruledata) return !exec, err diff --git a/internal/step/skip_test.go b/internal/step/skip_test.go index e4677d7d..f422c057 100644 --- a/internal/step/skip_test.go +++ b/internal/step/skip_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestStep_Skip(t *testing.T) { diff --git a/internal/step/snapshot.go b/internal/step/snapshot.go index b47bf0ce..74c5061b 100644 --- a/internal/step/snapshot.go +++ b/internal/step/snapshot.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Snapshot creates a moment in time record of the diff --git a/internal/step/snapshot_test.go b/internal/step/snapshot_test.go index da112d16..8f89f01b 100644 --- a/internal/step/snapshot_test.go +++ b/internal/step/snapshot_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestStep_Snapshot(t *testing.T) { diff --git a/internal/step/upload.go b/internal/step/upload.go index 836f2bbf..89bd0235 100644 --- a/internal/step/upload.go +++ b/internal/step/upload.go @@ -9,9 +9,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) // Upload tracks the final state of the step diff --git a/internal/step/upload_test.go b/internal/step/upload_test.go index 85977b8d..d3b0fba7 100644 --- a/internal/step/upload_test.go +++ b/internal/step/upload_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/server/mock/server" "github.com/go-vela/types/library" - "github.com/go-vela/types/pipeline" ) func TestStep_Upload(t *testing.T) { diff --git a/mock/worker/pipeline.go b/mock/worker/pipeline.go index d87b49b9..5f13c9e2 100644 --- a/mock/worker/pipeline.go +++ b/mock/worker/pipeline.go @@ -10,8 +10,8 @@ import ( "github.com/gin-gonic/gin" + api "github.com/go-vela/server/api/types" "github.com/go-vela/types" - "github.com/go-vela/types/library" ) const ( @@ -51,7 +51,7 @@ func getPipeline(c *gin.Context) { data := []byte(PipelineResp) - var body library.Pipeline + var body api.Pipeline _ = json.Unmarshal(data, &body) c.JSON(http.StatusOK, body) diff --git a/router/middleware/executor/executor_test.go b/router/middleware/executor/executor_test.go index 612a54b5..78913ee6 100644 --- a/router/middleware/executor/executor_test.go +++ b/router/middleware/executor/executor_test.go @@ -12,8 +12,8 @@ import ( "github.com/go-vela/sdk-go/vela" api "github.com/go-vela/server/api/types" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/executor" "github.com/go-vela/worker/runtime/docker" ) diff --git a/runtime/docker/build.go b/runtime/docker/build.go index e49e4217..dfe3571d 100644 --- a/runtime/docker/build.go +++ b/runtime/docker/build.go @@ -5,7 +5,7 @@ package docker import ( "context" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // InspectBuild displays details about the pod for the init step. diff --git a/runtime/docker/build_test.go b/runtime/docker/build_test.go index cc556cec..4efd0c4f 100644 --- a/runtime/docker/build_test.go +++ b/runtime/docker/build_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_InspectBuild(t *testing.T) { diff --git a/runtime/docker/container.go b/runtime/docker/container.go index 0beec9e0..07a6c1f9 100644 --- a/runtime/docker/container.go +++ b/runtime/docker/container.go @@ -14,8 +14,8 @@ import ( docker "github.com/docker/docker/client" "github.com/docker/docker/pkg/stdcopy" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/image" ) diff --git a/runtime/docker/container_test.go b/runtime/docker/container_test.go index 82e35cda..bd840c0e 100644 --- a/runtime/docker/container_test.go +++ b/runtime/docker/container_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_InspectContainer(t *testing.T) { diff --git a/runtime/docker/docker_test.go b/runtime/docker/docker_test.go index c91b9d54..ad603199 100644 --- a/runtime/docker/docker_test.go +++ b/runtime/docker/docker_test.go @@ -7,7 +7,7 @@ import ( "gotest.tools/v3/env" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_New(t *testing.T) { diff --git a/runtime/docker/image.go b/runtime/docker/image.go index 4d4f3ede..c3b62ef8 100644 --- a/runtime/docker/image.go +++ b/runtime/docker/image.go @@ -12,8 +12,8 @@ import ( dockerImageTypes "github.com/docker/docker/api/types/image" "github.com/sirupsen/logrus" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/image" ) diff --git a/runtime/docker/image_test.go b/runtime/docker/image_test.go index 5cd2a0ce..5f48a6f1 100644 --- a/runtime/docker/image_test.go +++ b/runtime/docker/image_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_InspectImage(t *testing.T) { diff --git a/runtime/docker/network.go b/runtime/docker/network.go index 1d45bc63..a5061244 100644 --- a/runtime/docker/network.go +++ b/runtime/docker/network.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/network" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // CreateNetwork creates the pipeline network. diff --git a/runtime/docker/network_test.go b/runtime/docker/network_test.go index 152dbcd3..cd869884 100644 --- a/runtime/docker/network_test.go +++ b/runtime/docker/network_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_CreateNetwork(t *testing.T) { diff --git a/runtime/docker/volume.go b/runtime/docker/volume.go index dee10f5c..5c846a2c 100644 --- a/runtime/docker/volume.go +++ b/runtime/docker/volume.go @@ -13,8 +13,8 @@ import ( "github.com/docker/go-units" "github.com/sirupsen/logrus" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" vol "github.com/go-vela/worker/internal/volume" ) diff --git a/runtime/docker/volume_test.go b/runtime/docker/volume_test.go index 6cb802c9..b341d6e2 100644 --- a/runtime/docker/volume_test.go +++ b/runtime/docker/volume_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestDocker_CreateVolume(t *testing.T) { diff --git a/runtime/engine.go b/runtime/engine.go index 97ed9c49..e842a9c0 100644 --- a/runtime/engine.go +++ b/runtime/engine.go @@ -6,7 +6,7 @@ import ( "context" "io" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // Engine represents the interface for Vela integrating diff --git a/runtime/kubernetes/build.go b/runtime/kubernetes/build.go index eb145f7f..9a65e728 100644 --- a/runtime/kubernetes/build.go +++ b/runtime/kubernetes/build.go @@ -10,11 +10,12 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" + // The k8s libraries have some quirks around yaml marshaling (see opts.go). // So, just use the same library for all kubernetes-related YAML. "sigs.k8s.io/yaml" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/runtime/kubernetes/apis/vela/v1alpha1" ) diff --git a/runtime/kubernetes/build_test.go b/runtime/kubernetes/build_test.go index 851bbe27..70cd3cb0 100644 --- a/runtime/kubernetes/build_test.go +++ b/runtime/kubernetes/build_test.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" velav1alpha1 "github.com/go-vela/worker/runtime/kubernetes/apis/vela/v1alpha1" ) diff --git a/runtime/kubernetes/container.go b/runtime/kubernetes/container.go index 36e9ff9d..076d2641 100644 --- a/runtime/kubernetes/container.go +++ b/runtime/kubernetes/container.go @@ -15,8 +15,8 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/wait" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" "github.com/go-vela/worker/internal/image" ) diff --git a/runtime/kubernetes/container_test.go b/runtime/kubernetes/container_test.go index d7dc2116..f2de3b16 100644 --- a/runtime/kubernetes/container_test.go +++ b/runtime/kubernetes/container_test.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" v1 "k8s.io/api/core/v1" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/worker/internal/image" velav1alpha1 "github.com/go-vela/worker/runtime/kubernetes/apis/vela/v1alpha1" ) diff --git a/runtime/kubernetes/image.go b/runtime/kubernetes/image.go index 68ceb0e1..9824bc10 100644 --- a/runtime/kubernetes/image.go +++ b/runtime/kubernetes/image.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" ) const ( diff --git a/runtime/kubernetes/image_test.go b/runtime/kubernetes/image_test.go index 6841dea9..3f2faeb3 100644 --- a/runtime/kubernetes/image_test.go +++ b/runtime/kubernetes/image_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestKubernetes_InspectImage(t *testing.T) { diff --git a/runtime/kubernetes/kubernetes_test.go b/runtime/kubernetes/kubernetes_test.go index 2804b615..b2c53705 100644 --- a/runtime/kubernetes/kubernetes_test.go +++ b/runtime/kubernetes/kubernetes_test.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestKubernetes_New(t *testing.T) { diff --git a/runtime/kubernetes/network.go b/runtime/kubernetes/network.go index 83f1395b..d06c273a 100644 --- a/runtime/kubernetes/network.go +++ b/runtime/kubernetes/network.go @@ -9,7 +9,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) // CreateNetwork creates the pipeline network. diff --git a/runtime/kubernetes/network_test.go b/runtime/kubernetes/network_test.go index dc6199d2..61a3e05e 100644 --- a/runtime/kubernetes/network_test.go +++ b/runtime/kubernetes/network_test.go @@ -6,7 +6,7 @@ import ( "context" "testing" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestKubernetes_CreateNetwork(t *testing.T) { diff --git a/runtime/kubernetes/volume.go b/runtime/kubernetes/volume.go index 1f91731b..c3a0581d 100644 --- a/runtime/kubernetes/volume.go +++ b/runtime/kubernetes/volume.go @@ -10,8 +10,8 @@ import ( v1 "k8s.io/api/core/v1" + "github.com/go-vela/server/compiler/types/pipeline" "github.com/go-vela/types/constants" - "github.com/go-vela/types/pipeline" vol "github.com/go-vela/worker/internal/volume" ) diff --git a/runtime/kubernetes/volume_test.go b/runtime/kubernetes/volume_test.go index ae5ca329..f72135c0 100644 --- a/runtime/kubernetes/volume_test.go +++ b/runtime/kubernetes/volume_test.go @@ -8,7 +8,7 @@ import ( v1 "k8s.io/api/core/v1" - "github.com/go-vela/types/pipeline" + "github.com/go-vela/server/compiler/types/pipeline" ) func TestKubernetes_CreateVolume(t *testing.T) {