Replace interface{} with any

registrarc/libregistrarc.go

@@ -35,7 +35,7 @@ import (
 func NewRegisterArgs(cfg *config.CGRConfig, tnt string, hostCfgs []*config.RemoteHost) (rargs *RegisterArgs, err error) {
 	rargs = &RegisterArgs{
 		Tenant: tnt,
-		Opts:   make(map[string]interface{}),
+		Opts:   make(map[string]any),
 		Hosts:  make([]*RegisterHostCfg, len(hostCfgs)),
 	}
 	for i, hostCfg := range hostCfgs {
@@ -60,7 +60,7 @@ func NewRegisterArgs(cfg *config.CGRConfig, tnt string, hostCfgs []*config.Remot
 // RegisterArgs the arguments to register the dispacher host
 type RegisterArgs struct {
 	Tenant string
-	Opts   map[string]interface{}
+	Opts   map[string]any
 	Hosts  []*RegisterHostCfg
 }
 
@@ -99,7 +99,7 @@ func (rhc *RegisterHostCfg) AsDispatcherHost(tnt, ip string) *engine.DispatcherH
 func NewUnregisterArgs(tnt string, hostCfgs []*config.RemoteHost) (uargs *UnregisterArgs) {
 	uargs = &UnregisterArgs{
 		Tenant: tnt,
-		Opts:   make(map[string]interface{}),
+		Opts:   make(map[string]any),
 		IDs:    make([]string, len(hostCfgs)),
 	}
 	for i, hostCfg := range hostCfgs {
@@ -111,7 +111,7 @@ func NewUnregisterArgs(tnt string, hostCfgs []*config.RemoteHost) (uargs *Unregi
 // UnregisterArgs the arguments to unregister the dispacher host
 type UnregisterArgs struct {
 	Tenant string
-	Opts   map[string]interface{}
+	Opts   map[string]any
 	IDs    []string
 }
 
@@ -119,8 +119,8 @@ type UnregisterArgs struct {
 func Registrar(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	w.Header().Set("Content-Type", "application/json")
-	var result interface{} = utils.OK
-	var errMessage interface{}
+	var result any = utils.OK
+	var errMessage any
 	var err error
 	var id *json.RawMessage
 	if id, err = register(r); err != nil {
@@ -149,7 +149,7 @@ func register(req *http.Request) (*json.RawMessage, error) {
 		return sReq.Id, err
 	case utils.RegistrarSv1UnregisterDispatcherHosts:
 		var args UnregisterArgs
-		params := []interface{}{&args}
+		params := []any{&args}
 		if err = json.Unmarshal(*sReq.Params, &params); err != nil {
 			utils.Logger.Warning(fmt.Sprintf("<%s> Failed to decode params because: %s",
 				utils.RegistrarC, err))
@@ -182,7 +182,7 @@ func register(req *http.Request) (*json.RawMessage, error) {
 
 	case utils.RegistrarSv1UnregisterRPCHosts:
 		var args UnregisterArgs
-		params := []interface{}{&args}
+		params := []any{&args}
 		if err = json.Unmarshal(*sReq.Params, &params); err != nil {
 			utils.Logger.Warning(fmt.Sprintf("<%s> Failed to decode params because: %s",
 				utils.RegistrarC, err))
@@ -263,7 +263,7 @@ func getConnPort(cfg *config.CGRConfig, transport string, tls bool) (port string
 
 func unmarshallRegisterArgs(req *http.Request, reqParams json.RawMessage) (dH []*engine.DispatcherHost, err error) {
 	var dHs RegisterArgs
-	params := []interface{}{&dHs}
+	params := []any{&dHs}
 	if err = json.Unmarshal(reqParams, &params); err != nil {
 		utils.Logger.Warning(fmt.Sprintf("<%s> Failed to decode params because: %s",
 			utils.RegistrarC, err))

registrarc/libregistrarc_test.go

@@ -50,7 +50,7 @@ func TestRegisterArgsAsDispatcherHosts(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
 	exp := []*engine.DispatcherHost{
 		{
@@ -141,9 +141,9 @@ func TestRegister(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)
@@ -202,9 +202,9 @@ func TestRegister(t *testing.T) {
 	ua := &UnregisterArgs{
 		Tenant: "cgrates.org",
 		IDs:    []string{"Host1", "Host2"},
-		Opts:   make(map[string]interface{}),
+		Opts:   make(map[string]any),
 	}
-	uaJSON, err := json.Marshal([]interface{}{ua})
+	uaJSON, err := json.Marshal([]any{ua})
 	id = json.RawMessage("2")
 	if err != nil {
 		t.Fatal(err)
@@ -347,9 +347,9 @@ func TestRegistrar(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)
@@ -456,9 +456,9 @@ func TestRegisterRegistrarSv1UnregisterRPCHosts(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)
@@ -485,9 +485,9 @@ func TestRegisterRegistrarSv1UnregisterRPCHostsError(t *testing.T) {
 	ra := &UnregisterArgs{
 		IDs:    []string{"Host1"},
 		Tenant: "cgrates.org",
-		Opts:   make(map[string]interface{}),
+		Opts:   make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)
@@ -544,9 +544,9 @@ func TestRegisterRegistrarSv1RegisterRPCHosts(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)
@@ -586,9 +586,9 @@ func TestRegisterRegistrarSv1RegisterRPCHostsError(t *testing.T) {
 				Transport: utils.MetaGOB,
 			},
 		},
-		Opts: make(map[string]interface{}),
+		Opts: make(map[string]any),
 	}
-	raJSON, err := json.Marshal([]interface{}{ra})
+	raJSON, err := json.Marshal([]any{ra})
 	id := json.RawMessage("1")
 	if err != nil {
 		t.Fatal(err)

registrarc/registrarc_it_test.go

@@ -127,10 +127,10 @@ func testDsphLoadData(t *testing.T) {
 }
 
 func testDsphGetNodeID() (id string, err error) {
-	var status map[string]interface{}
+	var status map[string]any
 	if err = dspRPC.Call(utils.DispatcherSv1RemoteStatus, utils.TenantWithAPIOpts{
 		Tenant:  "cgrates.org",
-		APIOpts: map[string]interface{}{},
+		APIOpts: map[string]any{},
 	}, &status); err != nil {
 		return
 	}

registrarc/registrarcrpc_it_test.go

@@ -120,10 +120,10 @@ func testRPCLoadData(t *testing.T) {
 func testRPCChargerSNoAttr(t *testing.T) {
 	cgrEv := &utils.CGREvent{ // matching Charger1
 		Tenant: "cgrates.org",
-		Event: map[string]interface{}{
+		Event: map[string]any{
 			utils.AccountField: "1010",
 		},
-		APIOpts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.},
+		APIOpts: map[string]any{utils.OptsAttributesProcessRuns: 1.},
 	}
 	expErr := utils.NewErrServerError(rpcclient.ErrDisconnected).Error()
 	var rply []*engine.ChrgSProcessEventReply
@@ -143,10 +143,10 @@ func testRPCStartRegc(t *testing.T) {
 func testRPCChargerSWithAttr(t *testing.T) {
 	cgrEv := &utils.CGREvent{ // matching Charger1
 		Tenant: "cgrates.org",
-		Event: map[string]interface{}{
+		Event: map[string]any{
 			utils.AccountField: "1010",
 		},
-		APIOpts: map[string]interface{}{utils.OptsAttributesProcessRuns: 1.},
+		APIOpts: map[string]any{utils.OptsAttributesProcessRuns: 1.},
 	}
 
 	processedEv := []*engine.ChrgSProcessEventReply{
@@ -155,11 +155,11 @@ func testRPCChargerSWithAttr(t *testing.T) {
 			AlteredFields:   []string{"*req.RunID"},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
-				Event: map[string]interface{}{
+				Event: map[string]any{
 					"Account": "1010",
 					"RunID":   "CustomerCharges",
 				},
-				APIOpts: map[string]interface{}{
+				APIOpts: map[string]any{
 					utils.OptsAttributesProcessRuns: 1.,
 					"*subsys":                       "*chargers",
 				},
@@ -170,14 +170,14 @@ func testRPCChargerSWithAttr(t *testing.T) {
 			AlteredFields:      []string{"*req.RunID", "*req.RequestType"},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
-				Event: map[string]interface{}{
+				Event: map[string]any{
 					"Account":     "1010",
 					"RequestType": "*none",
 					"RunID":       "raw",
 				},
-				APIOpts: map[string]interface{}{
+				APIOpts: map[string]any{
 					utils.OptsAttributesProcessRuns: 1.,
-					utils.OptsAttributesProfileIDs:  []interface{}{"*constant:*req.RequestType:*none"},
+					utils.OptsAttributesProfileIDs:  []any{"*constant:*req.RequestType:*none"},
 					"*subsys":                       "*chargers",
 				},
 			},
@@ -187,14 +187,14 @@ func testRPCChargerSWithAttr(t *testing.T) {
 			AlteredFields:      []string{"*req.RunID", "*req.Subject"},
 			CGREvent: &utils.CGREvent{
 				Tenant: "cgrates.org",
-				Event: map[string]interface{}{
+				Event: map[string]any{
 					"Account": "1010",
 					"RunID":   "SupplierCharges",
 					"Subject": "SUPPLIER1",
 				},
-				APIOpts: map[string]interface{}{
+				APIOpts: map[string]any{
 					utils.OptsAttributesProcessRuns: 1.,
-					"*attrProfileIDs":               []interface{}{"ATTR_SUPPLIER1"},
+					"*attrProfileIDs":               []any{"ATTR_SUPPLIER1"},
 					"*subsys":                       "*chargers",
 				},
 			},