From 8b60e6a2687633cb995338cd1af760cb5bce3ae8 Mon Sep 17 00:00:00 2001 From: Ken Hibino Date: Thu, 2 Jul 2020 06:21:20 -0700 Subject: [PATCH] Replace github.com/rs/xid with github.com/google/uuid --- client.go | 4 ++-- context_test.go | 10 ++++---- go.mod | 2 +- go.sum | 22 ++++++----------- heartbeat.go | 4 ++-- internal/asynqtest/asynqtest.go | 6 ++--- internal/base/base.go | 4 ++-- internal/base/base_test.go | 4 ++-- internal/rdb/inspect.go | 28 +++++++++++----------- internal/rdb/inspect_test.go | 26 ++++++++++---------- internal/rdb/rdb_test.go | 36 ++++++++++++++-------------- tools/asynq/cmd/ls.go | 16 ++++++------- tools/asynq/cmd/migrate.go | 6 ++--- tools/go.mod | 2 +- tools/go.sum | 42 ++++++++++++++++++--------------- 15 files changed, 104 insertions(+), 108 deletions(-) diff --git a/client.go b/client.go index 2492633..bfb79af 100644 --- a/client.go +++ b/client.go @@ -12,9 +12,9 @@ import ( "sync" "time" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/rdb" - "github.com/rs/xid" ) // A Client is responsible for scheduling tasks. @@ -258,7 +258,7 @@ func (c *Client) enqueueAt(t time.Time, task *Task, opts ...Option) error { timeout = defaultTimeout } msg := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: task.Type, Payload: task.Payload.data, Queue: opt.queue, diff --git a/context_test.go b/context_test.go index 261def5..af11d1d 100644 --- a/context_test.go +++ b/context_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/google/go-cmp/cmp" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" ) func TestCreateContextWithFutureDeadline(t *testing.T) { @@ -24,7 +24,7 @@ func TestCreateContextWithFutureDeadline(t *testing.T) { for _, tc := range tests { msg := &base.TaskMessage{ Type: "something", - ID: xid.New(), + ID: uuid.New(), Payload: nil, } @@ -64,7 +64,7 @@ func TestCreateContextWithPastDeadline(t *testing.T) { for _, tc := range tests { msg := &base.TaskMessage{ Type: "something", - ID: xid.New(), + ID: uuid.New(), Payload: nil, } @@ -92,8 +92,8 @@ func TestGetTaskMetadataFromContext(t *testing.T) { desc string msg *base.TaskMessage }{ - {"with zero retried message", &base.TaskMessage{Type: "something", ID: xid.New(), Retry: 25, Retried: 0, Timeout: 1800}}, - {"with non-zero retried message", &base.TaskMessage{Type: "something", ID: xid.New(), Retry: 10, Retried: 5, Timeout: 1800}}, + {"with zero retried message", &base.TaskMessage{Type: "something", ID: uuid.New(), Retry: 25, Retried: 0, Timeout: 1800}}, + {"with non-zero retried message", &base.TaskMessage{Type: "something", ID: uuid.New(), Retry: 10, Retried: 5, Timeout: 1800}}, } for _, tc := range tests { diff --git a/go.mod b/go.mod index 02cba88..2857432 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 require ( github.com/go-redis/redis/v7 v7.2.0 github.com/google/go-cmp v0.4.0 - github.com/rs/xid v1.2.1 + github.com/google/uuid v1.1.1 github.com/spf13/cast v1.3.1 go.uber.org/goleak v0.10.0 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e diff --git a/go.sum b/go.sum index 913a295..28cc09f 100644 --- a/go.sum +++ b/go.sum @@ -2,16 +2,15 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/go-redis/redis/v7 v7.0.0-beta.4 h1:p6z7Pde69EGRWvlC++y8aFcaWegyrKHzOBGo0zUACTQ= -github.com/go-redis/redis/v7 v7.0.0-beta.4/go.mod h1:xhhSbUMTsleRPur+Vgx9sUHtyN33bdjxY+9/0n9Ig8s= github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs= github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= @@ -20,16 +19,12 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= @@ -39,10 +34,8 @@ go.uber.org/goleak v0.10.0/go.mod h1:VCZuO8V8mFPlL0F5J5GK1rtHV3DrFcQ1R8ryq7FK0aI golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd h1:nTDtHvHSdCn1m6ITfMRqtOd/9+7a3s8RBNOZ3eYZzJA= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2 h1:CCH4IOTTfewWjGOlSp+zGcjutRKlBEZQ6wTn8ozI/nI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e h1:o3PsSEY8E4eXWkXrIP9YJALUkVZqzHJT5DOasTyn8Vs= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -60,8 +53,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/heartbeat.go b/heartbeat.go index 26907f3..d504541 100644 --- a/heartbeat.go +++ b/heartbeat.go @@ -9,9 +9,9 @@ import ( "sync" "time" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" "github.com/hibiken/asynq/internal/log" - "github.com/rs/xid" ) // heartbeater is responsible for writing process info to redis periodically to @@ -74,7 +74,7 @@ func newHeartbeater(params heartbeaterParams) *heartbeater { host: host, pid: os.Getpid(), - serverID: xid.New().String(), + serverID: uuid.New().String(), concurrency: params.concurrency, queues: params.queues, strictPriority: params.strictPriority, diff --git a/internal/asynqtest/asynqtest.go b/internal/asynqtest/asynqtest.go index 4df8d2b..d811a46 100644 --- a/internal/asynqtest/asynqtest.go +++ b/internal/asynqtest/asynqtest.go @@ -13,8 +13,8 @@ import ( "github.com/go-redis/redis/v7" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" ) // ZSetEntry is an entry in redis sorted set. @@ -75,7 +75,7 @@ var IgnoreIDOpt = cmpopts.IgnoreFields(base.TaskMessage{}, "ID") // NewTaskMessage returns a new instance of TaskMessage given a task type and payload. func NewTaskMessage(taskType string, payload map[string]interface{}) *base.TaskMessage { return &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: taskType, Queue: base.DefaultQueueName, Retry: 25, @@ -89,7 +89,7 @@ func NewTaskMessage(taskType string, payload map[string]interface{}) *base.TaskM // task type, payload and queue name. func NewTaskMessageWithQueue(taskType string, payload map[string]interface{}, qname string) *base.TaskMessage { return &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: taskType, Queue: qname, Retry: 25, diff --git a/internal/base/base.go b/internal/base/base.go index 2159e22..85c28d0 100644 --- a/internal/base/base.go +++ b/internal/base/base.go @@ -14,7 +14,7 @@ import ( "time" "github.com/go-redis/redis/v7" - "github.com/rs/xid" + "github.com/google/uuid" ) // Version of asynq library and CLI. @@ -78,7 +78,7 @@ type TaskMessage struct { Payload map[string]interface{} // ID is a unique identifier for each task. - ID xid.ID + ID uuid.UUID // Queue is a name this message should be enqueued to. Queue string diff --git a/internal/base/base_test.go b/internal/base/base_test.go index f63688a..40f5c7a 100644 --- a/internal/base/base_test.go +++ b/internal/base/base_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/google/go-cmp/cmp" - "github.com/rs/xid" + "github.com/google/uuid" ) func TestQueueKey(t *testing.T) { @@ -108,7 +108,7 @@ func TestWorkersKey(t *testing.T) { } func TestMessageEncoding(t *testing.T) { - id := xid.New() + id := uuid.New() tests := []struct { in *TaskMessage out *TaskMessage diff --git a/internal/rdb/inspect.go b/internal/rdb/inspect.go index 0ba139a..158d22a 100644 --- a/internal/rdb/inspect.go +++ b/internal/rdb/inspect.go @@ -12,8 +12,8 @@ import ( "time" "github.com/go-redis/redis/v7" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" "github.com/spf13/cast" ) @@ -53,7 +53,7 @@ type DailyStats struct { // EnqueuedTask is a task in a queue and is ready to be processed. type EnqueuedTask struct { - ID xid.ID + ID uuid.UUID Type string Payload map[string]interface{} Queue string @@ -61,14 +61,14 @@ type EnqueuedTask struct { // InProgressTask is a task that's currently being processed. type InProgressTask struct { - ID xid.ID + ID uuid.UUID Type string Payload map[string]interface{} } // ScheduledTask is a task that's scheduled to be processed in the future. type ScheduledTask struct { - ID xid.ID + ID uuid.UUID Type string Payload map[string]interface{} ProcessAt time.Time @@ -78,7 +78,7 @@ type ScheduledTask struct { // RetryTask is a task that's in retry queue because worker failed to process the task. type RetryTask struct { - ID xid.ID + ID uuid.UUID Type string Payload map[string]interface{} // TODO(hibiken): add LastFailedAt time.Time @@ -92,7 +92,7 @@ type RetryTask struct { // DeadTask is a task in that has exhausted all retries. type DeadTask struct { - ID xid.ID + ID uuid.UUID Type string Payload map[string]interface{} LastFailedAt time.Time @@ -446,7 +446,7 @@ func (r *RDB) ListDead(pgn Pagination) ([]*DeadTask, error) { // EnqueueDeadTask finds a task that matches the given id and score from dead queue // and enqueues it for processing. If a task that matches the id and score // does not exist, it returns ErrTaskNotFound. -func (r *RDB) EnqueueDeadTask(id xid.ID, score int64) error { +func (r *RDB) EnqueueDeadTask(id uuid.UUID, score int64) error { n, err := r.removeAndEnqueue(base.DeadQueue, id.String(), float64(score)) if err != nil { return err @@ -460,7 +460,7 @@ func (r *RDB) EnqueueDeadTask(id xid.ID, score int64) error { // EnqueueRetryTask finds a task that matches the given id and score from retry queue // and enqueues it for processing. If a task that matches the id and score // does not exist, it returns ErrTaskNotFound. -func (r *RDB) EnqueueRetryTask(id xid.ID, score int64) error { +func (r *RDB) EnqueueRetryTask(id uuid.UUID, score int64) error { n, err := r.removeAndEnqueue(base.RetryQueue, id.String(), float64(score)) if err != nil { return err @@ -474,7 +474,7 @@ func (r *RDB) EnqueueRetryTask(id xid.ID, score int64) error { // EnqueueScheduledTask finds a task that matches the given id and score from scheduled queue // and enqueues it for processing. If a task that matches the id and score does not // exist, it returns ErrTaskNotFound. -func (r *RDB) EnqueueScheduledTask(id xid.ID, score int64) error { +func (r *RDB) EnqueueScheduledTask(id uuid.UUID, score int64) error { n, err := r.removeAndEnqueue(base.ScheduledQueue, id.String(), float64(score)) if err != nil { return err @@ -553,7 +553,7 @@ func (r *RDB) removeAndEnqueueAll(zset string) (int64, error) { // KillRetryTask finds a task that matches the given id and score from retry queue // and moves it to dead queue. If a task that maches the id and score does not exist, // it returns ErrTaskNotFound. -func (r *RDB) KillRetryTask(id xid.ID, score int64) error { +func (r *RDB) KillRetryTask(id uuid.UUID, score int64) error { n, err := r.removeAndKill(base.RetryQueue, id.String(), float64(score)) if err != nil { return err @@ -567,7 +567,7 @@ func (r *RDB) KillRetryTask(id xid.ID, score int64) error { // KillScheduledTask finds a task that matches the given id and score from scheduled queue // and moves it to dead queue. If a task that maches the id and score does not exist, // it returns ErrTaskNotFound. -func (r *RDB) KillScheduledTask(id xid.ID, score int64) error { +func (r *RDB) KillScheduledTask(id uuid.UUID, score int64) error { n, err := r.removeAndKill(base.ScheduledQueue, id.String(), float64(score)) if err != nil { return err @@ -660,21 +660,21 @@ func (r *RDB) removeAndKillAll(zset string) (int64, error) { // DeleteDeadTask finds a task that matches the given id and score from dead queue // and deletes it. If a task that matches the id and score does not exist, // it returns ErrTaskNotFound. -func (r *RDB) DeleteDeadTask(id xid.ID, score int64) error { +func (r *RDB) DeleteDeadTask(id uuid.UUID, score int64) error { return r.deleteTask(base.DeadQueue, id.String(), float64(score)) } // DeleteRetryTask finds a task that matches the given id and score from retry queue // and deletes it. If a task that matches the id and score does not exist, // it returns ErrTaskNotFound. -func (r *RDB) DeleteRetryTask(id xid.ID, score int64) error { +func (r *RDB) DeleteRetryTask(id uuid.UUID, score int64) error { return r.deleteTask(base.RetryQueue, id.String(), float64(score)) } // DeleteScheduledTask finds a task that matches the given id and score from // scheduled queue and deletes it. If a task that matches the id and score //does not exist, it returns ErrTaskNotFound. -func (r *RDB) DeleteScheduledTask(id xid.ID, score int64) error { +func (r *RDB) DeleteScheduledTask(id uuid.UUID, score int64) error { return r.deleteTask(base.ScheduledQueue, id.String(), float64(score)) } diff --git a/internal/rdb/inspect_test.go b/internal/rdb/inspect_test.go index 530df64..1b451b1 100644 --- a/internal/rdb/inspect_test.go +++ b/internal/rdb/inspect_test.go @@ -12,9 +12,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" h "github.com/hibiken/asynq/internal/asynqtest" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" ) func TestCurrentStats(t *testing.T) { @@ -618,7 +618,7 @@ func TestListScheduledPagination(t *testing.T) { func TestListRetry(t *testing.T) { r := setup(t) m1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Queue: "default", Payload: map[string]interface{}{"subject": "hello"}, @@ -627,7 +627,7 @@ func TestListRetry(t *testing.T) { Retried: 10, } m2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Queue: "default", Payload: nil, @@ -763,14 +763,14 @@ func TestListRetryPagination(t *testing.T) { func TestListDead(t *testing.T) { r := setup(t) m1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Queue: "default", Payload: map[string]interface{}{"subject": "hello"}, ErrorMsg: "email server not responding", } m2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Queue: "default", Payload: nil, @@ -907,7 +907,7 @@ func TestEnqueueDeadTask(t *testing.T) { tests := []struct { dead []h.ZSetEntry score int64 - id xid.ID + id uuid.UUID want error // expected return value from calling EnqueueDeadTask wantDead []*base.TaskMessage wantEnqueued map[string][]*base.TaskMessage @@ -991,7 +991,7 @@ func TestEnqueueRetryTask(t *testing.T) { tests := []struct { retry []h.ZSetEntry score int64 - id xid.ID + id uuid.UUID want error // expected return value from calling EnqueueRetryTask wantRetry []*base.TaskMessage wantEnqueued map[string][]*base.TaskMessage @@ -1075,7 +1075,7 @@ func TestEnqueueScheduledTask(t *testing.T) { tests := []struct { scheduled []h.ZSetEntry score int64 - id xid.ID + id uuid.UUID want error // expected return value from calling EnqueueScheduledTask wantScheduled []*base.TaskMessage wantEnqueued map[string][]*base.TaskMessage @@ -1394,7 +1394,7 @@ func TestKillRetryTask(t *testing.T) { tests := []struct { retry []h.ZSetEntry dead []h.ZSetEntry - id xid.ID + id uuid.UUID score int64 want error wantRetry []h.ZSetEntry @@ -1471,7 +1471,7 @@ func TestKillScheduledTask(t *testing.T) { tests := []struct { scheduled []h.ZSetEntry dead []h.ZSetEntry - id xid.ID + id uuid.UUID score int64 want error wantScheduled []h.ZSetEntry @@ -1711,7 +1711,7 @@ func TestDeleteDeadTask(t *testing.T) { tests := []struct { dead []h.ZSetEntry - id xid.ID + id uuid.UUID score int64 want error wantDead []*base.TaskMessage @@ -1771,7 +1771,7 @@ func TestDeleteRetryTask(t *testing.T) { tests := []struct { retry []h.ZSetEntry - id xid.ID + id uuid.UUID score int64 want error wantRetry []*base.TaskMessage @@ -1823,7 +1823,7 @@ func TestDeleteScheduledTask(t *testing.T) { tests := []struct { scheduled []h.ZSetEntry - id xid.ID + id uuid.UUID score int64 want error wantScheduled []*base.TaskMessage diff --git a/internal/rdb/rdb_test.go b/internal/rdb/rdb_test.go index e7a95e8..805748f 100644 --- a/internal/rdb/rdb_test.go +++ b/internal/rdb/rdb_test.go @@ -14,9 +14,9 @@ import ( "github.com/go-redis/redis/v7" "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" + "github.com/google/uuid" h "github.com/hibiken/asynq/internal/asynqtest" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" ) // TODO(hibiken): Get Redis address and db number from ENV variables. @@ -73,7 +73,7 @@ func TestEnqueue(t *testing.T) { func TestEnqueueUnique(t *testing.T) { r := setup(t) m1 := base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "email", Payload: map[string]interface{}{"user_id": 123}, Queue: base.DefaultQueueName, @@ -116,7 +116,7 @@ func TestDequeue(t *testing.T) { r := setup(t) now := time.Now() t1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: map[string]interface{}{"subject": "hello!"}, Timeout: 1800, @@ -124,7 +124,7 @@ func TestDequeue(t *testing.T) { } t1Deadline := now.Unix() + t1.Timeout t2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "export_csv", Payload: nil, Timeout: 0, @@ -132,7 +132,7 @@ func TestDequeue(t *testing.T) { } t2Deadline := t2.Deadline t3 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Payload: nil, Timeout: int64((5 * time.Minute).Seconds()), @@ -384,7 +384,7 @@ func TestDone(t *testing.T) { r := setup(t) now := time.Now() t1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: nil, Timeout: 1800, @@ -392,7 +392,7 @@ func TestDone(t *testing.T) { } t1Deadline := now.Unix() + t1.Timeout t2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "export_csv", Payload: nil, Timeout: 0, @@ -400,7 +400,7 @@ func TestDone(t *testing.T) { } t2Deadline := t2.Deadline t3 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Payload: nil, Timeout: 1800, @@ -533,21 +533,21 @@ func TestRequeue(t *testing.T) { r := setup(t) now := time.Now() t1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: nil, Queue: "default", Timeout: 1800, } t2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "export_csv", Payload: nil, Queue: "default", Timeout: 3000, } t3 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: nil, Queue: "critical", @@ -688,7 +688,7 @@ func TestSchedule(t *testing.T) { func TestScheduleUnique(t *testing.T) { r := setup(t) m1 := base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "email", Payload: map[string]interface{}{"user_id": 123}, Queue: base.DefaultQueueName, @@ -741,7 +741,7 @@ func TestRetry(t *testing.T) { r := setup(t) now := time.Now() t1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: map[string]interface{}{"subject": "Hola!"}, Retried: 10, @@ -749,14 +749,14 @@ func TestRetry(t *testing.T) { } t1Deadline := now.Unix() + t1.Timeout t2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "gen_thumbnail", Payload: map[string]interface{}{"path": "some/path/to/image.jpg"}, Timeout: 3000, } t2Deadline := now.Unix() + t2.Timeout t3 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Payload: nil, Timeout: 60, @@ -857,7 +857,7 @@ func TestKill(t *testing.T) { r := setup(t) now := time.Now() t1 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "send_email", Payload: nil, Queue: "default", @@ -867,7 +867,7 @@ func TestKill(t *testing.T) { } t1Deadline := now.Unix() + t1.Timeout t2 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "reindex", Payload: nil, Queue: "default", @@ -877,7 +877,7 @@ func TestKill(t *testing.T) { } t2Deadline := now.Unix() + t2.Timeout t3 := &base.TaskMessage{ - ID: xid.New(), + ID: uuid.New(), Type: "generate_csv", Payload: nil, Queue: "default", diff --git a/tools/asynq/cmd/ls.go b/tools/asynq/cmd/ls.go index 8c82231..ad0cfd2 100644 --- a/tools/asynq/cmd/ls.go +++ b/tools/asynq/cmd/ls.go @@ -13,8 +13,8 @@ import ( "time" "github.com/go-redis/redis/v7" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/rdb" - "github.com/rs/xid" "github.com/spf13/cobra" "github.com/spf13/viper" ) @@ -93,7 +93,7 @@ func ls(cmd *cobra.Command, args []string) { // queryID returns an identifier used for "enq" command. // score is the zset score and queryType should be one // of "s", "r" or "d" (scheduled, retry, dead respectively). -func queryID(id xid.ID, score int64, qtype string) string { +func queryID(id uuid.UUID, score int64, qtype string) string { const format = "%v:%v:%v" return fmt.Sprintf(format, qtype, score, id) } @@ -101,22 +101,22 @@ func queryID(id xid.ID, score int64, qtype string) string { // parseQueryID is a reverse operation of queryID function. // It takes a queryID and return each part of id with proper // type if valid, otherwise it reports an error. -func parseQueryID(queryID string) (id xid.ID, score int64, qtype string, err error) { +func parseQueryID(queryID string) (id uuid.UUID, score int64, qtype string, err error) { parts := strings.Split(queryID, ":") if len(parts) != 3 { - return xid.NilID(), 0, "", fmt.Errorf("invalid id") + return uuid.Nil, 0, "", fmt.Errorf("invalid id") } - id, err = xid.FromString(parts[2]) + id, err = uuid.Parse(parts[2]) if err != nil { - return xid.NilID(), 0, "", fmt.Errorf("invalid id") + return uuid.Nil, 0, "", fmt.Errorf("invalid id") } score, err = strconv.ParseInt(parts[1], 10, 64) if err != nil { - return xid.NilID(), 0, "", fmt.Errorf("invalid id") + return uuid.Nil, 0, "", fmt.Errorf("invalid id") } qtype = parts[0] if len(qtype) != 1 || !strings.Contains("srd", qtype) { - return xid.NilID(), 0, "", fmt.Errorf("invalid id") + return uuid.Nil, 0, "", fmt.Errorf("invalid id") } return id, score, qtype, nil } diff --git a/tools/asynq/cmd/migrate.go b/tools/asynq/cmd/migrate.go index a0fe238..7ed04c0 100644 --- a/tools/asynq/cmd/migrate.go +++ b/tools/asynq/cmd/migrate.go @@ -12,8 +12,8 @@ import ( "time" "github.com/go-redis/redis/v7" + "github.com/google/uuid" "github.com/hibiken/asynq/internal/base" - "github.com/rs/xid" "github.com/spf13/cast" "github.com/spf13/cobra" "github.com/spf13/viper" @@ -65,7 +65,7 @@ type oldTaskMessage struct { // Unchanged Type string Payload map[string]interface{} - ID xid.ID + ID uuid.UUID Queue string Retry int Retried int @@ -112,7 +112,7 @@ func convertMessage(old *oldTaskMessage) (*base.TaskMessage, error) { return &base.TaskMessage{ Type: old.Type, Payload: old.Payload, - ID: old.ID, + ID: uuid.New(), Queue: old.Queue, Retry: old.Retry, Retried: old.Retried, diff --git a/tools/go.mod b/tools/go.mod index 97bfab6..fb60511 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -4,9 +4,9 @@ go 1.13 require ( github.com/go-redis/redis/v7 v7.2.0 + github.com/google/uuid v1.1.1 github.com/hibiken/asynq v0.4.0 github.com/mitchellh/go-homedir v1.1.0 - github.com/rs/xid v1.2.1 github.com/spf13/cast v1.3.1 github.com/spf13/cobra v0.0.5 github.com/spf13/viper v1.6.2 diff --git a/tools/go.sum b/tools/go.sum index 40205a1..537848c 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -1,4 +1,5 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -15,6 +16,7 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= @@ -24,10 +26,6 @@ github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeME github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-redis/redis v6.15.7+incompatible h1:3skhDh95XQMpnqeqNftPkQD9jL9e5e36z/1SUm6dy1U= -github.com/go-redis/redis/v7 v7.0.0-beta.4/go.mod h1:xhhSbUMTsleRPur+Vgx9sUHtyN33bdjxY+9/0n9Ig8s= -github.com/go-redis/redis/v7 v7.1.0 h1:I4C4a8UGbFejiVjtYVTRVOiMIJ5pm5Yru6ibvDX/OS0= -github.com/go-redis/redis/v7 v7.1.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-redis/redis/v7 v7.2.0 h1:CrCexy/jYWZjW0AyVoHlcJUeZN19VWlbepTh1Vq6dJs= github.com/go-redis/redis/v7 v7.2.0/go.mod h1:JDNMw23GTyLNC4GZu9njt15ctBQVn7xjRfnwdHj/Dcg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -38,10 +36,15 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= @@ -49,19 +52,22 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hibiken/asynq v0.4.0 h1:NvAfYX0DRe04WgGMKRg5oX7bs6ktv2fu9YwB6O356FI= -github.com/hibiken/asynq v0.4.0/go.mod h1:dtrVkxCsGPVhVNHMDXAH7lFq64kbj43+G6lt4FQZfW4= +github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4= @@ -74,15 +80,14 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.6.0 h1:aetoXYr0Tv7xRU/V4B4IZJ2QcbtMUFoNb3ORp7TzIK4= -github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -94,18 +99,16 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rs/xid v1.2.1 h1:mhH9Nq+C1fY2l1XIpgxIiUOfNpRBYH1kKcr+qfKgjRc= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= @@ -113,17 +116,13 @@ github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.6.0/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -148,6 +147,7 @@ golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -172,6 +172,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -180,11 +181,14 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=