[azservicebus,azeventhubs] Cleanup, change interface{} to any (Azure#20481)

Fixes Azure#18406

Author: richardpark-msft

sdk/messaging/azeventhubs/event_data_batch_unit_test.go

@@ -102,7 +102,7 @@ func TestUnitEventDataBatchUnitTests(t *testing.T) {
 
 		err = mb.AddEventData(&EventData{
 			Body: []byte("small body"),
-			Properties: map[string]interface{}{
+			Properties: map[string]any{
 				"small": "value",
 			},
 		}, nil)
@@ -123,7 +123,7 @@ func TestUnitEventDataBatchUnitTests(t *testing.T) {
 
 		err = mb.AddEventData(&EventData{
 			Body: []byte("small body"),
-			Properties: map[string]interface{}{
+			Properties: map[string]any{
 				"hello":      "world",
 				"anInt":      100,
 				"aFLoat":     100.1,

sdk/messaging/azeventhubs/internal/amqpwrap/amqpwrap.go

@@ -24,7 +24,7 @@ type AMQPReceiver interface {
 	ModifyMessage(ctx context.Context, msg *amqp.Message, options *amqp.ModifyMessageOptions) error
 
 	LinkName() string
-	LinkSourceFilterValue(name string) interface{}
+	LinkSourceFilterValue(name string) any
 
 	// wrapper only functions,
 
@@ -193,7 +193,7 @@ func (rw *AMQPReceiverWrapper) LinkName() string {
 	return rw.inner.LinkName()
 }
 
-func (rw *AMQPReceiverWrapper) LinkSourceFilterValue(name string) interface{} {
+func (rw *AMQPReceiverWrapper) LinkSourceFilterValue(name string) any {
 	return rw.inner.LinkSourceFilterValue(name)
 }
 

sdk/messaging/azeventhubs/internal/cbs.go

@@ -74,7 +74,7 @@ func NegotiateClaim(ctx context.Context, audience string, conn amqpwrap.AMQPClie
 
 	msg := &amqp.Message{
 		Value: token.Token,
-		ApplicationProperties: map[string]interface{}{
+		ApplicationProperties: map[string]any{
 			cbsOperationKey:  cbsOperationPutToken,
 			cbsTokenTypeKey:  string(token.TokenType),
 			cbsAudienceKey:   audience,

sdk/messaging/azeventhubs/internal/cbs_test.go

@@ -32,7 +32,7 @@ func TestNegotiateClaimWithCloseTimeout(t *testing.T) {
 			tp.EXPECT().GetToken(gomock.Any()).Return(&auth.Token{}, nil)
 
 			mock.SetupRPC(sender, receiver, 1, func(sent, response *amqp.Message) {
-				response.ApplicationProperties = map[string]interface{}{
+				response.ApplicationProperties = map[string]any{
 					"status-code": int32(200),
 				}
 			})
@@ -85,7 +85,7 @@ func TestNegotiateClaimWithAuthFailure(t *testing.T) {
 	mock.SetupRPC(sender, receiver, 1, func(sent, response *amqp.Message) {
 		// this is the kind of error you get if your connection string is inconsistent
 		// (ie, you tamper with the shared key, etc..)
-		response.ApplicationProperties = map[string]interface{}{
+		response.ApplicationProperties = map[string]any{
 			"status-code":        int32(401),
 			"status-description": "InvalidSignature: The token has an invalid signature.",
 			"error-condition":    "com.microsoft:auth-failed",
@@ -117,7 +117,7 @@ func TestNegotiateClaimSuccess(t *testing.T) {
 	receiver.EXPECT().Close(mock.NotCancelledAndHasTimeout)
 
 	mock.SetupRPC(sender, receiver, 1, func(sent, response *amqp.Message) {
-		response.ApplicationProperties = map[string]interface{}{
+		response.ApplicationProperties = map[string]any{
 			"status-code": int32(200),
 		}
 	})

sdk/messaging/azeventhubs/internal/errors.go

@@ -266,7 +266,7 @@ type (
 	ErrIncorrectType struct {
 		Key          string
 		ExpectedType reflect.Type
-		ActualValue  interface{}
+		ActualValue  any
 	}
 
 	// ErrAMQP indicates that the server communicated an AMQP error with a particular
@@ -295,7 +295,7 @@ func (e ErrMalformedMessage) Error() string {
 
 // NewErrIncorrectType lets you skip using the `reflect` package. Just provide a variable of the desired type as
 // 'expected'.
-func NewErrIncorrectType(key string, expected, actual interface{}) ErrIncorrectType {
+func NewErrIncorrectType(key string, expected, actual any) ErrIncorrectType {
 	return ErrIncorrectType{
 		Key:          key,
 		ExpectedType: reflect.TypeOf(expected),

sdk/messaging/azeventhubs/internal/mock/mock_amqp.go

@@ -71,7 +71,7 @@ type ContextCancelledMatcher struct {
 }
 
 // Matches returns whether x is a match.
-func (m ContextCancelledMatcher) Matches(x interface{}) bool {
+func (m ContextCancelledMatcher) Matches(x any) bool {
 	ctx := x.(context.Context)
 
 	if m.WantCancelled {
@@ -88,7 +88,7 @@ func (m ContextCancelledMatcher) String() string {
 
 type ContextHasTestValueMatcher struct{}
 
-func (m ContextHasTestValueMatcher) Matches(x interface{}) bool {
+func (m ContextHasTestValueMatcher) Matches(x any) bool {
 	ctx := x.(context.Context)
 	return ctx.Value(testContextKey(0)) == "correctContextWasUsed"
 }

sdk/messaging/azeventhubs/internal/mock/mock_helpers.go

@@ -157,7 +157,7 @@ func (ns *Namespace) newClientImpl(ctx context.Context) (amqpwrap.AMQPClient, er
 	connOptions := amqp.ConnOptions{
 		SASLType:    amqp.SASLTypeAnonymous(),
 		MaxSessions: 65535,
-		Properties: map[string]interface{}{
+		Properties: map[string]any{
 			"product":    "MSGolangClient",
 			"version":    Version,
 			"platform":   runtime.GOOS,

sdk/messaging/azeventhubs/internal/namespace.go

@@ -228,7 +228,7 @@ func (l *rpcLink) RPC(ctx context.Context, msg *amqp.Message) (*amqpwrap.RPCResp
 	msg.Properties.ReplyTo = &l.clientAddress
 
 	if msg.ApplicationProperties == nil {
-		msg.ApplicationProperties = make(map[string]interface{})
+		msg.ApplicationProperties = make(map[string]any)
 	}
 
 	if _, ok := msg.ApplicationProperties["server-timeout"]; !ok {

sdk/messaging/azeventhubs/internal/rpc.go

@@ -120,14 +120,14 @@ func (ac *Client) GetNamespaceProperties(ctx context.Context, options *GetNamesp
 	return props, nil
 }
 
-type pagerFunc func(ctx context.Context, pv interface{}) (*http.Response, error)
+type pagerFunc func(ctx context.Context, pv any) (*http.Response, error)
 
 // newPagerFunc gets a function that can be used to page sequentially through an ATOM resource
-func (ac *Client) newPagerFunc(baseFragment string, maxPageSize int32, lenV func(pv interface{}) int) pagerFunc {
+func (ac *Client) newPagerFunc(baseFragment string, maxPageSize int32, lenV func(pv any) int) pagerFunc {
 	eof := false
 	skip := int32(0)
 
-	return func(ctx context.Context, pv interface{}) (*http.Response, error) {
+	return func(ctx context.Context, pv any) (*http.Response, error) {
 		if eof {
 			return nil, nil
 		}