Skip to content

Commit

Permalink
refactor: update queue packge to get from server (#225)
Browse files Browse the repository at this point in the history
Co-authored-by: Neal Coleman <[email protected]>
  • Loading branch information
Neal and kneal authored Oct 27, 2021
1 parent bbecba7 commit cc30a3b
Show file tree
Hide file tree
Showing 7 changed files with 258 additions and 28 deletions.
2 changes: 1 addition & 1 deletion cmd/vela-worker/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package main
import (
"time"

"github.com/go-vela/pkg-queue/queue"
"github.com/go-vela/server/queue"
"github.com/go-vela/worker/executor"
"github.com/go-vela/worker/runtime"

Expand Down
4 changes: 2 additions & 2 deletions cmd/vela-worker/operate.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"context"
"time"

"github.com/go-vela/pkg-queue/queue"
"github.com/go-vela/server/queue"
"github.com/go-vela/types/library"

"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -75,7 +75,7 @@ func (w *Worker) operate(ctx context.Context) error {

// setup the queue
//
// https://pkg.go.dev/github.com/go-vela/pkg-queue/queue?tab=doc#New
// https://pkg.go.dev/github.com/go-vela/server/queue?tab=doc#New
w.Queue, err = queue.New(w.Config.Queue)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/vela-worker/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"github.com/gin-gonic/gin"

"github.com/go-vela/pkg-queue/queue"
"github.com/go-vela/server/queue"
"github.com/go-vela/worker/executor"
"github.com/go-vela/worker/runtime"

Expand Down
2 changes: 1 addition & 1 deletion cmd/vela-worker/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func (w *Worker) Validate() error {

// verify the queue configuration
//
// https://godoc.org/github.com/go-vela/pkg-queue/queue#Setup.Validate
// https://godoc.org/github.com/go-vela/server/queue#Setup.Validate
err := w.Config.Queue.Validate()
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion cmd/vela-worker/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"net/url"
"time"

"github.com/go-vela/pkg-queue/queue"
"github.com/go-vela/sdk-go/vela"
"github.com/go-vela/server/queue"
"github.com/go-vela/worker/executor"
"github.com/go-vela/worker/runtime"
)
Expand Down
8 changes: 2 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,13 @@ require (
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.10+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/compiler v0.10.1-0.20211025223007-bdcd7b7f8de0
github.com/go-vela/mock v0.10.0
github.com/go-vela/pkg-queue v0.10.0
github.com/go-vela/sdk-go v0.10.0
github.com/go-vela/server v0.10.2-0.20211027160636-eb9f75c560bc
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
Expand Down
266 changes: 250 additions & 16 deletions go.sum

Large diffs are not rendered by default.

0 comments on commit cc30a3b

Please sign in to comment.