fix: use any instead of using interface{} for RecieverSelectors

goto · Oct 15, 2024 · 9774d00 · 9774d00
1 parent f7aa6c0
commit 9774d00
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/core/notification/notification.go b/core/notification/notification.go
@@ -44,7 +44,7 @@ type Notification struct {
 	ValidDuration     time.Duration            `json:"valid_duration"`
 	Template          string                   `json:"template"`
 	UniqueKey         string                   `json:"unique_key"`
-	ReceiverSelectors []map[string]interface{} `json:"receiver_selectors"`
+	ReceiverSelectors []map[string]any `json:"receiver_selectors"`
 	CreatedAt         time.Time                `json:"created_at"`
 
 	// won't be stored in notification table, only to propagate this to notification_subscriber

diff --git a/core/notification/notification_test.go b/core/notification/notification_test.go
@@ -41,7 +41,7 @@ func TestNotification_Validate(t *testing.T) {
 				Labels: map[string]string{
 					"receiver_id": "2",
 				},
-				ReceiverSelectors: []map[string]interface{}{
+				ReceiverSelectors: []map[string]any{
 					{
 						"varkey1": "value1",
 					},

diff --git a/core/notification/router_receiver_service.go b/core/notification/router_receiver_service.go
@@ -87,7 +87,7 @@ func (s *RouterReceiverService) PrepareMetaMessages(ctx context.Context, n Notif
 	return metaMessages, notificationLogs, nil
 }
 
-func (s *RouterReceiverService) handleConfigCase(ctx context.Context, selectors []map[string]interface{}) ([]receiver.Receiver, map[uint64]map[string]interface{}, error) {
+func (s *RouterReceiverService) handleConfigCase(ctx context.Context, selectors []map[string]any) ([]receiver.Receiver, map[uint64]map[string]interface{}, error) {
 	var receiverIDs []uint64
 	userConfigs := make(map[uint64]map[string]interface{})
 
@@ -123,7 +123,7 @@ func (s *RouterReceiverService) handleConfigCase(ctx context.Context, selectors
 	return rcvs, userConfigs, nil
 }
 
-func (s *RouterReceiverService) handleIDOnlyCase(ctx context.Context, selectors []map[string]interface{}) ([]receiver.Receiver, error) {
+func (s *RouterReceiverService) handleIDOnlyCase(ctx context.Context, selectors []map[string]any) ([]receiver.Receiver, error) {
 	convertedSelectors := make([]map[string]string, len(selectors))
 	for i, selector := range selectors {
 		convertedSelectors[i] = make(map[string]string)

diff --git a/core/notification/router_receiver_service_test.go b/core/notification/router_receiver_service_test.go
@@ -26,7 +26,7 @@ func TestRouterReceiverService_PrepareMetaMessage(t *testing.T) {
 		{
 			name: "should return error if number of receiver selector is more than threshold",
 			n: notification.Notification{
-				ReceiverSelectors: []map[string]interface{}{
+				ReceiverSelectors: []map[string]any{
 					{
 						"k1": "v1",
 					},

diff --git a/internal/api/v1beta1/notification.go b/internal/api/v1beta1/notification.go
@@ -19,7 +19,7 @@ import (
 
 const notificationAPIScope = "notification_api"
 
-func (s *GRPCServer) validatePostNotificationPayload(receiverSelectors []map[string]interface{}, labels map[string]string) error {
+func (s *GRPCServer) validatePostNotificationPayload(receiverSelectors []map[string]any, labels map[string]string) error {
 	if len(receiverSelectors) == 0 && len(labels) == 0 {
 		return errors.ErrInvalid.WithMsgf("receivers or labels must be provided")
 	}
@@ -31,16 +31,16 @@ func (s *GRPCServer) validatePostNotificationPayload(receiverSelectors []map[str
 	return nil
 }
 
-func (s *GRPCServer) parseReceivers(pbSelectors []*structpb.Struct) ([]map[string]interface{}, error) {
-	var receiverSelectors []map[string]interface{}
+func (s *GRPCServer) parseReceivers(pbSelectors []*structpb.Struct) ([]map[string]any, error) {
+	var receiverSelectors []map[string]any
 
 	for _, pbSelector := range pbSelectors {
 		selector := make(map[string]interface{})
 		for k, v := range pbSelector.AsMap() {
 			if k == "config" {
 				configMap, ok := v.(map[string]interface{})
 				if !ok {
-					return nil, errors.ErrInvalid.WithMsgf("invalid config format, expected map[string]interface{}")
+					return nil, errors.ErrInvalid.WithMsgf("invalid config format, expected map[string]any")
 				}
 				selector[k] = configMap
 			} else {

diff --git a/internal/api/v1beta1/notification_test.go b/internal/api/v1beta1/notification_test.go
@@ -176,7 +176,7 @@ func TestGRPCServer_ListNotifications(t *testing.T) {
 					"data-key": "data-value",
 				},
 				Labels:            map[string]string{},
-				ReceiverSelectors: []map[string]interface{}{},
+				ReceiverSelectors: []map[string]any{},
 			},
 		}
 

diff --git a/internal/store/model/notification.go b/internal/store/model/notification.go
@@ -53,7 +53,7 @@ func (n *Notification) FromDomain(d notification.Notification) {
 func (n *Notification) ToDomain() *notification.Notification {
 	receiverSelectors := n.ReceiverSelectors
 	if receiverSelectors == nil {
-		receiverSelectors = []map[string]interface{}{}
+		receiverSelectors = []map[string]any{}
 	}
 	return &notification.Notification{
 		ID:                n.ID,

diff --git a/internal/store/postgres/notification.go b/internal/store/postgres/notification.go
@@ -181,7 +181,7 @@ func (r *NotificationRepository) List(ctx context.Context, flt notification.Filt
 
 		// Always ensure ReceiverSelectors is initialized
 		if notificationDomain.ReceiverSelectors == nil {
-			notificationDomain.ReceiverSelectors = []map[string]interface{}{}
+			notificationDomain.ReceiverSelectors = []map[string]any{}
 		}
 
 		notificationsDomain = append(notificationsDomain, *notificationDomain)

diff --git a/internal/store/postgres/notification_test.go b/internal/store/postgres/notification_test.go
@@ -227,7 +227,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 						"label-key": "label-value",
 					},
 					Template: "",
-					ReceiverSelectors: []map[string]interface{}{
+					ReceiverSelectors: []map[string]any{
 						{
 							"team":     "gotocompany-infra",
 							"severity": "WARNING",
@@ -256,7 +256,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 					Template:          "",
 					ValidDuration:     0,
 					UniqueKey:         "",
-					ReceiverSelectors: []map[string]interface{}{},
+					ReceiverSelectors: []map[string]any{},
 				},
 				{
 					ID:          "10911",
@@ -269,7 +269,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 					ValidDuration:     time.Duration(0),
 					Template:          "expiry-alert",
 					UniqueKey:         "",
-					ReceiverSelectors: []map[string]interface{}{},
+					ReceiverSelectors: []map[string]any{},
 				},
 			},
 		},
@@ -290,7 +290,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 					ValidDuration:     time.Duration(0),
 					Template:          "expiry-alert",
 					UniqueKey:         "",
-					ReceiverSelectors: []map[string]interface{}{},
+					ReceiverSelectors: []map[string]any{},
 				},
 			},
 		},
@@ -311,7 +311,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 					},
 					Labels:            map[string]string{"label-key": "label-value"},
 					Template:          "",
-					ReceiverSelectors: []map[string]interface{}{}, // Initialize this
+					ReceiverSelectors: []map[string]any{}, 
 					UniqueKey:         "",
 					ValidDuration:     0,
 				},
@@ -326,7 +326,7 @@ func (s *NotificationRepositoryTestSuite) TestList() {
 						"label-key": "label-value",
 					},
 					Template: "",
-					ReceiverSelectors: []map[string]interface{}{
+					ReceiverSelectors: []map[string]any{
 						{
 							"team":     "gotocompany-infra",
 							"severity": "WARNING",

diff --git a/pkg/pgc/type.go b/pkg/pgc/type.go
@@ -118,7 +118,7 @@ func (a ListString) Value() (driver.Value, error) {
 	return json.Marshal(a)
 }
 
-type ListStringAnyMap []map[string]interface{}
+type ListStringAnyMap []map[string]any
 
 func (m *ListStringAnyMap) Scan(value interface{}) error {
 	if value == nil {