Bump go-amqp to v0.17.0 so this lib can be compatible with eventhub lib

Author: liranms

batch.go

@@ -118,7 +118,7 @@ func (mb *MessageBatch) Add(m *Message) (bool, error) {
 	}
 
 	if mb.SessionID != nil {
-		msg.Properties.GroupID = *mb.SessionID
+		msg.Properties.GroupID = mb.SessionID
 	}
 
 	bin, err := msg.MarshalBinary()

go.mod

@@ -4,9 +4,9 @@ module github.com/Azure/azure-service-bus-go
 go 1.12
 
 require (
-	github.com/Azure/azure-amqp-common-go/v3 v3.2.1
+	github.com/Azure/azure-amqp-common-go/v3 v3.2.3
 	github.com/Azure/azure-sdk-for-go v51.1.0+incompatible
-	github.com/Azure/go-amqp v0.16.4
+	github.com/Azure/go-amqp v0.17.0
 	github.com/Azure/go-autorest/autorest v0.11.18
 	github.com/Azure/go-autorest/autorest/adal v0.9.13
 	github.com/Azure/go-autorest/autorest/date v0.3.0

go.sum

@@ -1,10 +1,14 @@
 github.com/Azure/azure-amqp-common-go/v3 v3.2.1 h1:uQyDk81yn5hTP1pW4Za+zHzy97/f4vDz9o1d/exI4j4=
 github.com/Azure/azure-amqp-common-go/v3 v3.2.1/go.mod h1:O6X1iYHP7s2x7NjUKsXVhkwWrQhxrd+d8/3rRadj4CI=
+github.com/Azure/azure-amqp-common-go/v3 v3.2.3 h1:uDF62mbd9bypXWi19V1bN5NZEO84JqgmI5G73ibAmrk=
+github.com/Azure/azure-amqp-common-go/v3 v3.2.3/go.mod h1:7rPmbSfszeovxGfc5fSAXE4ehlXQZHpMja2OtxC2Tas=
 github.com/Azure/azure-sdk-for-go v51.1.0+incompatible h1:7uk6GWtUqKg6weLv2dbKnzwb0ml1Qn70AdtRccZ543w=
 github.com/Azure/azure-sdk-for-go v51.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-amqp v0.16.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
 github.com/Azure/go-amqp v0.16.4 h1:/1oIXrq5zwXLHaoYDliJyiFjJSpJZMWGgtMX9e0/Z30=
 github.com/Azure/go-amqp v0.16.4/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
+github.com/Azure/go-amqp v0.17.0 h1:HHXa3149nKrI0IZwyM7DRcRy5810t9ZICDutn4BYzj4=
+github.com/Azure/go-amqp v0.17.0/go.mod h1:9YJ3RhxRT1gquYnzpZO1vcYMMpAdJT+QEg6fwmw9Zlg=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest/autorest v0.11.18 h1:90Y4srNYrwOtAgVo3ndrQkTYn6kf1Eg/AjTFJ8Is2aM=

message.go

@@ -233,14 +233,14 @@ func (m *Message) Defer(ctx context.Context) error {
 }
 
 // Release will notify Azure Service Bus the message should be re-queued without failure.
-//func (m *Message) Release() DispositionAction {
+// func (m *Message) Release() DispositionAction {
 //	return func(ctx context.Context) {
 //		span, _ := m.startSpanFromContext(ctx, "sb.Message.Release")
 //		defer span.Finish()
 //
 //		m.message.Release()
 //	}
-//}
+// }
 
 // DeadLetter will notify Azure Service Bus the message failed and should not re-queued
 func (m *Message) DeadLetter(ctx context.Context, err error) error {
@@ -318,6 +318,20 @@ func (m *Message) GetKeyValues() map[string]interface{} {
 	return m.UserProperties
 }
 
+func strDeref(s *string) string {
+	if s != nil {
+		return *s
+	}
+	return ""
+}
+
+func strPtr(s string) *string {
+	if s == "" {
+		return nil
+	}
+	return &s
+}
+
 func sendMgmtDisposition(ctx context.Context, m *Message, state disposition) error {
 	ctx, span := startConsumerSpanFromContext(ctx, "sb.sendMgmtDisposition")
 	defer span.End()
@@ -349,19 +363,19 @@ func (m *Message) toMsg() (*amqp.Message, error) {
 	}
 
 	if m.SessionID != nil {
-		amqpMsg.Properties.GroupID = *m.SessionID
+		amqpMsg.Properties.GroupID = m.SessionID
 	}
 
 	if m.GroupSequence != nil {
-		amqpMsg.Properties.GroupSequence = *m.GroupSequence
+		amqpMsg.Properties.GroupSequence = m.GroupSequence
 	}
 
 	amqpMsg.Properties.CorrelationID = m.CorrelationID
-	amqpMsg.Properties.ContentType = m.ContentType
-	amqpMsg.Properties.Subject = m.Label
-	amqpMsg.Properties.To = m.To
-	amqpMsg.Properties.ReplyTo = m.ReplyTo
-	amqpMsg.Properties.ReplyToGroupID = m.ReplyToGroupID
+	amqpMsg.Properties.ContentType = strPtr(m.ContentType)
+	amqpMsg.Properties.Subject = strPtr(m.Label)
+	amqpMsg.Properties.To = strPtr(m.To)
+	amqpMsg.Properties.ReplyTo = strPtr(m.ReplyTo)
+	amqpMsg.Properties.ReplyToGroupID = strPtr(m.ReplyToGroupID)
 
 	if len(m.UserProperties) > 0 {
 		amqpMsg.ApplicationProperties = make(map[string]interface{})
@@ -422,16 +436,16 @@ func newMessage(data []byte, amqpMsg *amqp.Message, r *amqp.Receiver) (*Message,
 		if id, ok := amqpMsg.Properties.MessageID.(string); ok {
 			msg.ID = id
 		}
-		msg.SessionID = &amqpMsg.Properties.GroupID
-		msg.GroupSequence = &amqpMsg.Properties.GroupSequence
+		msg.SessionID = amqpMsg.Properties.GroupID
+		msg.GroupSequence = amqpMsg.Properties.GroupSequence
 		if id, ok := amqpMsg.Properties.CorrelationID.(string); ok {
 			msg.CorrelationID = id
 		}
-		msg.ContentType = amqpMsg.Properties.ContentType
-		msg.Label = amqpMsg.Properties.Subject
-		msg.To = amqpMsg.Properties.To
-		msg.ReplyTo = amqpMsg.Properties.ReplyTo
-		msg.ReplyToGroupID = amqpMsg.Properties.ReplyToGroupID
+		msg.ContentType = strDeref(amqpMsg.Properties.ContentType)
+		msg.Label = strDeref(amqpMsg.Properties.Subject)
+		msg.To = strDeref(amqpMsg.Properties.To)
+		msg.ReplyTo = strDeref(amqpMsg.Properties.ReplyTo)
+		msg.ReplyToGroupID = strDeref(amqpMsg.Properties.ReplyToGroupID)
 		if amqpMsg.Header != nil {
 			msg.DeliveryCount = amqpMsg.Header.DeliveryCount + 1
 			msg.TTL = &amqpMsg.Header.TTL

message_session.go

@@ -143,7 +143,7 @@ func (ms *MessageSession) SetState(ctx context.Context, state []byte) error {
 			"operation": "com.microsoft:set-session-state",
 		},
 		Properties: &amqp.MessageProperties{
-			GroupID: *ms.SessionID(),
+			GroupID: ms.SessionID(),
 		},
 		Value: map[string]interface{}{
 			"session-id":    ms.SessionID(),

message_test.go

@@ -135,22 +135,22 @@ func (suite *serviceBusSuite) TestAMQPMessageToMessage() {
 	d := 30 * time.Second
 	until := time.Now().Add(d)
 	pID := int16(12)
-
+	n := uint32(1)
 	aMsg := &amqp.Message{
 		DeliveryTag: dotNetEncodedLockTokenGUID,
 		Properties: &amqp.MessageProperties{
 			MessageID:          "messageID",
-			To:                 "to",
-			Subject:            "subject",
-			ReplyTo:            "replyTo",
-			ReplyToGroupID:     "replyToGroupID",
-			CorrelationID:      "correlationID",
-			ContentType:        "contentType",
-			ContentEncoding:    "contentEncoding",
-			AbsoluteExpiryTime: until,
-			CreationTime:       until,
-			GroupID:            "groupID",
-			GroupSequence:      uint32(1),
+			To:                 strPtr("to"),
+			Subject:            strPtr("subject"),
+			ReplyTo:            strPtr("replyTo"),
+			ReplyToGroupID:     strPtr("replyToGroupID"),
+			CorrelationID:      strPtr("correlationID"),
+			ContentType:        strPtr("contentType"),
+			ContentEncoding:    strPtr("contentEncoding"),
+			AbsoluteExpiryTime: &until,
+			CreationTime:       &until,
+			GroupID:            strPtr("groupID"),
+			GroupSequence:      &n,
 		},
 		Annotations: amqp.Annotations{
 			"x-opt-locked-until":            until,