Merge pull request #61 from ojizero/correct-v2

Corrected import paths for V2
matryer · Jun 13, 2022 · 6da6d0c · 6da6d0c
2 parents 19c177c + ea2e4ca
commit 6da6d0c
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -7,8 +7,8 @@ import (
 
 	uuid "github.com/gofrs/uuid"
 	"github.com/matryer/is"
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/vicetest"
+	"github.com/matryer/vice/v2"
+	"github.com/matryer/vice/v2/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
@@ -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
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/vicetest"
+	"github.com/matryer/vice/v2"
+	"github.com/matryer/vice/v2/vicetest"
 	"github.com/nsqio/go-nsq"
 )
 

diff --git 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
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/vicetest"
+	"github.com/matryer/vice/v2"
+	"github.com/matryer/vice/v2/vicetest"
 	"github.com/streadway/amqp"
 )
 

diff --git 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
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/matryer/is"
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/vicetest"
+	"github.com/matryer/vice/v2"
+	"github.com/matryer/vice/v2/vicetest"
 )
 
 func TestTransport(t *testing.T) {

diff --git 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
@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/queues/sqs/sqsfakes"
-	"github.com/matryer/vice/vicetest"
+	"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"
 	"github.com/aws/aws-sdk-go/service/sqs/sqsiface"

diff --git 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
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/matryer/vice"
-	"github.com/matryer/vice/queues/sqs/sqsfakes"
-	"github.com/matryer/vice/vicetest"
+	"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"
 	"github.com/aws/aws-sdk-go/service/sqs/sqsiface"

diff --git 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