Update amqp and other dependencies (#153)

jhendrixMSFT · web-flow · commit e738348ca5b3 · 2019-12-16T09:58:02.000-08:00
* update dependencies

switched pack.ag/amqp to github.com/Azure/go-amqp
updated azure-amqp-common-go to v3
update Go SDK dependencies to latest versions

* fix test output, ignore .vscode directory

* update release notes and version info
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ terraform.tfvars
 .idea
 
 vendor/
+
+.vscode/
diff --git a/README.md b/README.md
@@ -32,6 +32,11 @@ If you need to install Go, follow [the official instructions](https://golang.org
 
 Find up-to-date examples and documentation on [godoc.org](https://godoc.org/github.com/Azure/azure-service-bus-go#pkg-examples).
 
+### Running tests
+
+Most tests require a properly configured service bus in Azure.  The easiest way to set this up is to use the [Terraform](https://www.terraform.io/) deployment script.
+Running the integration tests will take longer than the default 10 mintues, please use a larger timeout `go test -timeout 30m`.
+
 ### Have questions?
 
 The developers of this library are all active on the [Gopher Slack](https://gophers.slack.com), it is likely easiest to 
diff --git a/batch.go b/batch.go
@@ -1,8 +1,8 @@
 package servicebus
 
 import (
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
-	"pack.ag/amqp"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/batch_disposition.go b/batch_disposition.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 )
 
 type (
diff --git a/batch_disposition_test.go b/batch_disposition_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/changelog.md b/changelog.md
@@ -1,7 +1,11 @@
 # Change Log
 
-## `head`
+## `v0.10.0`
 - add retry when Sender fails to recover
+- update settlement mode on sender
+- added support for creating a namespace via MSI
+- replace pack.am/amqp with github.com/Azure/go-amqp
+- bump common to version v3.0.0
 
 ## `v0.9.1`
 - bump common version to v2.1.0
diff --git a/duplicate_detection_example_test.go b/duplicate_detection_example_test.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 
 	"github.com/Azure/azure-service-bus-go"
 )
diff --git a/errors.go b/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/Azure/azure-amqp-common-go/v2/rpc"
+	"github.com/Azure/azure-amqp-common-go/v3/rpc"
 )
 
 type (
diff --git a/go.mod b/go.mod
@@ -3,22 +3,18 @@ module github.com/Azure/azure-service-bus-go
 go 1.12
 
 require (
-	github.com/Azure/azure-amqp-common-go/v2 v2.1.0
-	github.com/Azure/azure-sdk-for-go v30.1.0+incompatible
-	github.com/Azure/go-autorest v12.0.0+incompatible
+	github.com/Azure/azure-amqp-common-go/v3 v3.0.0
+	github.com/Azure/azure-sdk-for-go v37.1.0+incompatible
+	github.com/Azure/go-amqp v0.12.6
+	github.com/Azure/go-autorest/autorest v0.9.3
+	github.com/Azure/go-autorest/autorest/adal v0.8.1
+	github.com/Azure/go-autorest/autorest/date v0.2.0
+	github.com/Azure/go-autorest/autorest/to v0.3.0
+	github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
 	github.com/devigned/tab v0.1.1
-	github.com/fortytw2/leaktest v1.3.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway v1.9.2 // indirect
 	github.com/joho/godotenv v1.3.0
 	github.com/mitchellh/mapstructure v1.1.2
-	github.com/pkg/errors v0.8.1 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.3.0
-	go.opencensus.io v0.22.0 // indirect
 	golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b
-	golang.org/x/sys v0.0.0-20190620070143-6f217b454f45 // indirect
-	google.golang.org/api v0.6.0 // indirect
-	google.golang.org/genproto v0.0.0-20190620144150-6af8c5fc6601 // indirect
-	google.golang.org/grpc v1.21.1 // indirect
-	pack.ag/amqp v0.12.1
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/test/test.go b/internal/test/test.go
@@ -29,7 +29,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/conn"
+	"github.com/Azure/azure-amqp-common-go/v3/conn"
 	rm "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2017-05-10/resources"
 	sbmgmt "github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
 	"github.com/Azure/go-autorest/autorest"
@@ -75,7 +75,7 @@ func (suite *BaseSuite) SetupSuite() {
 	setFromEnv := func(key string, target *string) {
 		v := os.Getenv(key)
 		if v == "" {
-			suite.FailNowf("Environment variable %q required for integration tests.", key)
+			suite.FailNowf("missing environment variable", "%q required for integration tests.", key)
 		}
 
 		*target = v
diff --git a/message.go b/message.go
@@ -29,10 +29,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/devigned/tab"
 	"github.com/mitchellh/mapstructure"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/message_session.go b/message_session.go
@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/rpc"
+	"github.com/Azure/azure-amqp-common-go/v3/rpc"
 	"github.com/devigned/tab"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 // MessageSession represents and allows for interaction with a Service Bus Session.
diff --git a/message_session_test.go b/message_session_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/message_test.go b/message_test.go
@@ -3,10 +3,10 @@ package servicebus
 import (
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/Azure/go-autorest/autorest/to"
 	"github.com/mitchellh/mapstructure"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 func (suite *serviceBusSuite) TestMapStructureEncode() {
diff --git a/mgmt.go b/mgmt.go
@@ -34,7 +34,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/auth"
+	"github.com/Azure/azure-amqp-common-go/v3/auth"
 	"github.com/devigned/tab"
 )
 
diff --git a/namespace.go b/namespace.go
@@ -29,14 +29,14 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/Azure/azure-amqp-common-go/v2/aad"
-	"github.com/Azure/azure-amqp-common-go/v2/auth"
-	"github.com/Azure/azure-amqp-common-go/v2/cbs"
-	"github.com/Azure/azure-amqp-common-go/v2/conn"
-	"github.com/Azure/azure-amqp-common-go/v2/sas"
+	"github.com/Azure/azure-amqp-common-go/v3/aad"
+	"github.com/Azure/azure-amqp-common-go/v3/auth"
+	"github.com/Azure/azure-amqp-common-go/v3/cbs"
+	"github.com/Azure/azure-amqp-common-go/v3/conn"
+	"github.com/Azure/azure-amqp-common-go/v3/sas"
+	"github.com/Azure/go-amqp"
 	"github.com/Azure/go-autorest/autorest/azure"
 	"golang.org/x/net/websocket"
-	"pack.ag/amqp"
 )
 
 const (
@@ -49,7 +49,7 @@ const (
 	//`
 
 	// Version is the semantic version number
-	Version = "0.9.1"
+	Version = "0.10.0"
 
 	rootUserAgent = "/golang-service-bus"
 )
diff --git a/queue.go b/queue.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/Azure/go-autorest/autorest/date"
 	"github.com/devigned/tab"
 )
diff --git a/queue_examples_test.go b/queue_examples_test.go
@@ -8,7 +8,7 @@ import (
 	"os"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/Azure/azure-service-bus-go"
 	"github.com/joho/godotenv"
 )
diff --git a/receiver.go b/receiver.go
@@ -27,9 +27,9 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2"
+	"github.com/Azure/azure-amqp-common-go/v3"
 	"github.com/devigned/tab"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/rpc.go b/rpc.go
@@ -30,10 +30,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/rpc"
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/rpc"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/devigned/tab"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/scheduled_message_examples_test.go b/scheduled_message_examples_test.go
@@ -3,9 +3,10 @@ package servicebus_test
 import (
 	"context"
 	"fmt"
-	"github.com/Azure/azure-service-bus-go"
 	"os"
 	"time"
+
+	"github.com/Azure/azure-service-bus-go"
 )
 
 func Example_scheduledMessage() {
diff --git a/sender.go b/sender.go
@@ -24,13 +24,13 @@ package servicebus
 
 import (
 	"context"
-	common "github.com/Azure/azure-amqp-common-go/v2"
+	common "github.com/Azure/azure-amqp-common-go/v3"
 	"sync"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/devigned/tab"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/session.go b/session.go
@@ -27,9 +27,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/devigned/tab"
-	"pack.ag/amqp"
+	"github.com/Azure/go-amqp"
 )
 
 type (
diff --git a/subscription_test.go b/subscription_test.go
@@ -31,7 +31,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2015-08-01/servicebus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/topic.go b/topic.go
@@ -29,7 +29,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/Azure/azure-amqp-common-go/v2/uuid"
+	"github.com/Azure/azure-amqp-common-go/v3/uuid"
 	"github.com/Azure/go-autorest/autorest/date"
 	"github.com/devigned/tab"
 )

-Original file line number
+Diff line change
 .idea
 vendor/
++
 +.vscode/
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package servicebus`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
`5`		`- "pack.ag/amqp"`
	`4`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
	`5`	`+ "github.com/Azure/go-amqp"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`	`"fmt"`
`6`	`6`
`7`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
	`7`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"fmt"`
`6`	`6`	`"testing"`
`7`	`7`
`8`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
	`8`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
`9`	`9`	`"github.com/stretchr/testify/assert"`
`10`	`10`	`)`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"os"`
`7`	`7`	`"time"`
`8`	`8`
`9`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
	`9`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
`10`	`10`
`11`	`11`	`"github.com/Azure/azure-service-bus-go"`
`12`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"reflect"`
`6`	`6`
`7`		`- "github.com/Azure/azure-amqp-common-go/v2/rpc"`
	`7`	`+ "github.com/Azure/azure-amqp-common-go/v3/rpc"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`type (`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ import (`
`34`	`34`	`"strings"`
`35`	`35`	`"time"`
`36`	`36`
`37`		`- "github.com/Azure/azure-amqp-common-go/v2/auth"`
	`37`	`+ "github.com/Azure/azure-amqp-common-go/v3/auth"`
`38`	`38`	`"github.com/devigned/tab"`
`39`	`39`	`)`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`"strings"`
`30`	`30`	`"sync"`
`31`	`31`
`32`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
	`32`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
`33`	`33`	`"github.com/Azure/go-autorest/autorest/date"`
`34`	`34`	`"github.com/devigned/tab"`
`35`	`35`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"os"`
`9`	`9`	`"time"`
`10`	`10`
`11`		`- "github.com/Azure/azure-amqp-common-go/v2/uuid"`
	`11`	`+ "github.com/Azure/azure-amqp-common-go/v3/uuid"`
`12`	`12`	`"github.com/Azure/azure-service-bus-go"`
`13`	`13`	`"github.com/joho/godotenv"`
`14`	`14`	`)`