From 97574c84316af35828fa89175b86ef38d074c53c Mon Sep 17 00:00:00 2001 From: ojizero Date: Mon, 13 Jun 2022 14:24:21 +0300 Subject: [PATCH 1/3] corrected import paths for v2 --- go.mod | 3 ++- go.sum | 2 ++ queues/nats/nats.go | 2 +- queues/nats/nats_test.go | 2 +- queues/nsq/nsq.go | 2 +- queues/nsq/nsq_test.go | 2 +- queues/rabbitmq/rabbitmq.go | 2 +- queues/rabbitmq/rabbitmq_test.go | 2 +- queues/redis/redis.go | 2 +- queues/redis/redis_test.go | 2 +- queues/sqs/multi_writer.go | 2 +- queues/sqs/multi_writer_test.go | 2 +- queues/sqs/sqs.go | 2 +- queues/sqs/sqs_test.go | 2 +- vicetest/test.go | 2 +- 15 files changed, 17 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 7566634..09af8b2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/matryer/vice +module github.com/matryer/vice/v2 go 1.17 @@ -7,6 +7,7 @@ require ( github.com/go-redis/redis v6.15.9+incompatible github.com/gofrs/uuid v4.2.0+incompatible github.com/matryer/is v1.4.0 + github.com/matryer/vice v1.0.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0 github.com/nats-io/nats.go v1.15.0 github.com/nats-io/stan.go v0.10.2 diff --git a/go.sum b/go.sum index f54e85c..f499d38 100644 --- a/go.sum +++ b/go.sum @@ -82,6 +82,8 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lib/pq v1.10.4/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= +github.com/matryer/vice v1.0.0 h1:s8ZwFErl4GSZYhYhuTtHLr3XHMO8jG+XtujnD7JolXM= +github.com/matryer/vice v1.0.0/go.mod h1:FtjaKxEaDRSDTV0FvFL2TvL0E56LdI/Q2uE/v4yyLSI= github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= diff --git a/queues/nats/nats.go b/queues/nats/nats.go index 3274e9b..f85054b 100644 --- a/queues/nats/nats.go +++ b/queues/nats/nats.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/nats-io/nats.go" "github.com/nats-io/stan.go" ) diff --git a/queues/nats/nats_test.go b/queues/nats/nats_test.go index 00a5c97..12b6c91 100644 --- a/queues/nats/nats_test.go +++ b/queues/nats/nats_test.go @@ -7,7 +7,7 @@ import ( uuid "github.com/gofrs/uuid" "github.com/matryer/is" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" "github.com/nats-io/nats.go" "github.com/nats-io/stan.go" diff --git a/queues/nsq/nsq.go b/queues/nsq/nsq.go index 7d2f7f1..ab690ce 100644 --- a/queues/nsq/nsq.go +++ b/queues/nsq/nsq.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/matryer/vice" "github.com/matryer/vice/backoff" + "github.com/matryer/vice/v2" "github.com/nsqio/go-nsq" ) diff --git a/queues/nsq/nsq_test.go b/queues/nsq/nsq_test.go index 7984265..43749f9 100644 --- a/queues/nsq/nsq_test.go +++ b/queues/nsq/nsq_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/matryer/is" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" "github.com/nsqio/go-nsq" ) diff --git a/queues/rabbitmq/rabbitmq.go b/queues/rabbitmq/rabbitmq.go index ae1b6a9..a50cf90 100644 --- a/queues/rabbitmq/rabbitmq.go +++ b/queues/rabbitmq/rabbitmq.go @@ -4,7 +4,7 @@ package rabbitmq import ( "sync" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/streadway/amqp" ) diff --git a/queues/rabbitmq/rabbitmq_test.go b/queues/rabbitmq/rabbitmq_test.go index ba39966..04f9318 100644 --- a/queues/rabbitmq/rabbitmq_test.go +++ b/queues/rabbitmq/rabbitmq_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/matryer/is" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" "github.com/streadway/amqp" ) diff --git a/queues/redis/redis.go b/queues/redis/redis.go index 422bca8..0071ed5 100644 --- a/queues/redis/redis.go +++ b/queues/redis/redis.go @@ -6,7 +6,7 @@ import ( "time" "github.com/go-redis/redis" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" ) // Transport is a vice.Transport for redis. diff --git a/queues/redis/redis_test.go b/queues/redis/redis_test.go index 6ff12ca..3b45f52 100644 --- a/queues/redis/redis_test.go +++ b/queues/redis/redis_test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/matryer/is" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" ) diff --git a/queues/sqs/multi_writer.go b/queues/sqs/multi_writer.go index 82aae0f..73aad49 100644 --- a/queues/sqs/multi_writer.go +++ b/queues/sqs/multi_writer.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" diff --git a/queues/sqs/multi_writer_test.go b/queues/sqs/multi_writer_test.go index 212ad38..363f5dc 100644 --- a/queues/sqs/multi_writer_test.go +++ b/queues/sqs/multi_writer_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/matryer/vice" "github.com/matryer/vice/queues/sqs/sqsfakes" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" "github.com/aws/aws-sdk-go/service/sqs" diff --git a/queues/sqs/sqs.go b/queues/sqs/sqs.go index 9f5ddfd..c9e6231 100644 --- a/queues/sqs/sqs.go +++ b/queues/sqs/sqs.go @@ -11,7 +11,7 @@ import ( "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sqs/sqsiface" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" ) // Transport is a vice.Transport for Amazon's SQS diff --git a/queues/sqs/sqs_test.go b/queues/sqs/sqs_test.go index 9ed837c..99e01d2 100644 --- a/queues/sqs/sqs_test.go +++ b/queues/sqs/sqs_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/matryer/vice" "github.com/matryer/vice/queues/sqs/sqsfakes" + "github.com/matryer/vice/v2" "github.com/matryer/vice/vicetest" "github.com/aws/aws-sdk-go/service/sqs" diff --git a/vicetest/test.go b/vicetest/test.go index d15f2d9..5f2fd7e 100644 --- a/vicetest/test.go +++ b/vicetest/test.go @@ -7,7 +7,7 @@ import ( "time" "github.com/matryer/is" - "github.com/matryer/vice" + "github.com/matryer/vice/v2" ) // Transport runs standard transport tests. All Transport types pass From 21c2c0daf99b37c5a6ec09b4a584bd57ab5ac349 Mon Sep 17 00:00:00 2001 From: ojizero Date: Mon, 13 Jun 2022 14:55:53 +0300 Subject: [PATCH 2/3] corrected imports of vicetest --- queues/nats/nats_test.go | 2 +- queues/nsq/nsq_test.go | 2 +- queues/rabbitmq/rabbitmq_test.go | 2 +- queues/redis/redis_test.go | 2 +- queues/sqs/multi_writer_test.go | 2 +- queues/sqs/sqs_test.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/queues/nats/nats_test.go b/queues/nats/nats_test.go index 12b6c91..2188835 100644 --- a/queues/nats/nats_test.go +++ b/queues/nats/nats_test.go @@ -8,7 +8,7 @@ import ( uuid "github.com/gofrs/uuid" "github.com/matryer/is" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" "github.com/nats-io/nats.go" "github.com/nats-io/stan.go" ) diff --git a/queues/nsq/nsq_test.go b/queues/nsq/nsq_test.go index 43749f9..29cdb96 100644 --- a/queues/nsq/nsq_test.go +++ b/queues/nsq/nsq_test.go @@ -9,7 +9,7 @@ import ( "github.com/matryer/is" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" "github.com/nsqio/go-nsq" ) diff --git a/queues/rabbitmq/rabbitmq_test.go b/queues/rabbitmq/rabbitmq_test.go index 04f9318..ab27468 100644 --- a/queues/rabbitmq/rabbitmq_test.go +++ b/queues/rabbitmq/rabbitmq_test.go @@ -8,7 +8,7 @@ import ( "github.com/matryer/is" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" "github.com/streadway/amqp" ) diff --git a/queues/redis/redis_test.go b/queues/redis/redis_test.go index 3b45f52..6c9159b 100644 --- a/queues/redis/redis_test.go +++ b/queues/redis/redis_test.go @@ -8,7 +8,7 @@ import ( "github.com/matryer/is" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" ) func TestTransport(t *testing.T) { diff --git a/queues/sqs/multi_writer_test.go b/queues/sqs/multi_writer_test.go index 363f5dc..d471b15 100644 --- a/queues/sqs/multi_writer_test.go +++ b/queues/sqs/multi_writer_test.go @@ -7,7 +7,7 @@ import ( "github.com/matryer/vice/queues/sqs/sqsfakes" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" "github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sqs/sqsiface" diff --git a/queues/sqs/sqs_test.go b/queues/sqs/sqs_test.go index 99e01d2..a81e553 100644 --- a/queues/sqs/sqs_test.go +++ b/queues/sqs/sqs_test.go @@ -8,7 +8,7 @@ import ( "github.com/matryer/vice/queues/sqs/sqsfakes" "github.com/matryer/vice/v2" - "github.com/matryer/vice/vicetest" + "github.com/matryer/vice/v2/vicetest" "github.com/aws/aws-sdk-go/service/sqs" "github.com/aws/aws-sdk-go/service/sqs/sqsiface" From ea2e4ca5489f7f0793867fbd6542eb0e06a41cb9 Mon Sep 17 00:00:00 2001 From: ojizero Date: Mon, 13 Jun 2022 14:59:24 +0300 Subject: [PATCH 3/3] fixed import paths in sqs --- queues/sqs/multi_writer_test.go | 2 +- queues/sqs/sqs_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/queues/sqs/multi_writer_test.go b/queues/sqs/multi_writer_test.go index d471b15..695bc98 100644 --- a/queues/sqs/multi_writer_test.go +++ b/queues/sqs/multi_writer_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/matryer/vice/queues/sqs/sqsfakes" "github.com/matryer/vice/v2" + "github.com/matryer/vice/v2/queues/sqs/sqsfakes" "github.com/matryer/vice/v2/vicetest" "github.com/aws/aws-sdk-go/service/sqs" diff --git a/queues/sqs/sqs_test.go b/queues/sqs/sqs_test.go index a81e553..73a7c00 100644 --- a/queues/sqs/sqs_test.go +++ b/queues/sqs/sqs_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/matryer/vice/queues/sqs/sqsfakes" "github.com/matryer/vice/v2" + "github.com/matryer/vice/v2/queues/sqs/sqsfakes" "github.com/matryer/vice/v2/vicetest" "github.com/aws/aws-sdk-go/service/sqs"