Fix vet warnings following go version update

apier/v1/apier.go

@@ -436,13 +436,13 @@ func (apiv1 *APIerSv1) SetRatingProfile(attrs utils.AttrSetRatingProfile, reply
 		at, err := utils.ParseTimeDetectLayout(ra.ActivationTime,
 			apiv1.Config.GeneralCfg().DefaultTimezone)
 		if err != nil {
-			return fmt.Errorf(fmt.Sprintf("%s:Cannot parse activation time from %v", utils.ErrServerError.Error(), ra.ActivationTime))
+			return fmt.Errorf("%s:Cannot parse activation time from %v", utils.ErrServerError.Error(), ra.ActivationTime)
 		}
 		if exists, err := apiv1.DataManager.HasData(utils.RATING_PLAN_PREFIX,
 			ra.RatingPlanId, ""); err != nil {
 			return utils.NewErrServerError(err)
 		} else if !exists {
-			return fmt.Errorf(fmt.Sprintf("%s:RatingPlanId:%s", utils.ErrNotFound.Error(), ra.RatingPlanId))
+			return fmt.Errorf("%s:RatingPlanId:%s", utils.ErrNotFound.Error(), ra.RatingPlanId)
 		}
 		rpfl.RatingPlanActivations = append(rpfl.RatingPlanActivations,
 			&engine.RatingPlanActivation{

apier/v2/tp_it_test.go

@@ -182,20 +182,32 @@ func testTPitTimings(t *testing.T) {
 	}
 	// Test get
 	var rplyTmDummy *utils.ApierTPTiming
-	if err := tpRPC.Call(utils.APIerSv2GetTPTiming, v1.AttrGetTPTiming{tmDummyRemove.TPid, tmDummyRemove.ID}, &rplyTmDummy); err != nil {
+	if err := tpRPC.Call(utils.APIerSv2GetTPTiming,
+		v1.AttrGetTPTiming{
+			TPid: tmDummyRemove.TPid,
+			ID:   tmDummyRemove.ID,
+		}, &rplyTmDummy); err != nil {
 		t.Error("Calling APIerSv2.GetTPTiming, got error: ", err.Error())
 	} else if !reflect.DeepEqual(tmDummyRemove, rplyTmDummy) {
 		t.Errorf("Calling APIerSv2.GetTPTiming expected: %v, received: %v", tmDummyRemove, rplyTmDummy)
 	}
 	var rplyTmIDs []string
 	expectedTmIDs := []string{"OFFPEAK_EVENING", "OFFPEAK_MORNING", "OFFPEAK_WEEKEND", "PEAK", tmDummyRemove.ID}
-	if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil {
+	if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds,
+		v1.AttrGetTPTimingIds{
+			TPid:                testTPid,
+			PaginatorWithSearch: utils.PaginatorWithSearch{},
+		}, &rplyTmIDs); err != nil {
 		t.Error("Calling APIerSv1.GetTPTimingIds, got error: ", err.Error())
 	} else if len(expectedTmIDs) != len(rplyTmIDs) {
 		t.Errorf("Calling APIerSv1.GetTPTimingIds expected: %v, received: %v", expectedTmIDs, rplyTmIDs)
 	}
 	// Test remove
-	if err := tpRPC.Call(utils.APIerSv2RemoveTPTiming, v1.AttrGetTPTiming{tmDummyRemove.TPid, tmDummyRemove.ID}, &reply); err != nil {
+	if err := tpRPC.Call(utils.APIerSv2RemoveTPTiming,
+		v1.AttrGetTPTiming{
+			TPid: tmDummyRemove.TPid,
+			ID:   tmDummyRemove.ID,
+		}, &reply); err != nil {
 		t.Error("Calling APIerSv2.RemoveTPTiming, got error: ", err.Error())
 	} else if reply != utils.OK {
 		t.Error("Calling APIerSv2.RemoveTPTiming received: ", reply)
@@ -203,7 +215,11 @@ func testTPitTimings(t *testing.T) {
 	// Test getIds
 	rplyTmIDs = []string{}
 	expectedTmIDs = []string{"OFFPEAK_EVENING", "OFFPEAK_MORNING", "OFFPEAK_WEEKEND", "PEAK"}
-	if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds, v1.AttrGetTPTimingIds{testTPid, utils.PaginatorWithSearch{}}, &rplyTmIDs); err != nil {
+	if err := tpRPC.Call(utils.APIerSv1GetTPTimingIds,
+		v1.AttrGetTPTimingIds{
+			TPid:                testTPid,
+			PaginatorWithSearch: utils.PaginatorWithSearch{},
+		}, &rplyTmIDs); err != nil {
 		t.Error("Calling APIerSv1.GetTPTimingIds, got error: ", err.Error())
 	} else if len(expectedTmIDs) != len(rplyTmIDs) {
 		t.Errorf("Calling APIerSv1.GetTPTimingIds expected: %v, received: %v", expectedTmIDs, rplyTmIDs)

engine/filters_test.go

@@ -634,7 +634,7 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*req.Account:1007"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -642,14 +642,14 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*req.Account:1007"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
 	//not
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*notstring:~*req.Account:1007"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -665,32 +665,32 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*prefix:~*req.Account:10"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*prefix:~*req.Account:10"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*suffix:~*req.Account:07"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*suffix:~*req.Account:07"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
 	//not
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*notsuffix:~*req.Account:07"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -706,20 +706,20 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~Tenant(~^cgr.*\\.org$)"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Tenant(~^cgr.*\\.org$)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
 	//not
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*notrsr::~*req.Tenant(~^cgr.*\\.org$)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -737,13 +737,13 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*destinations:~*req.Destination:EU"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*destinations:~*req.Destination:EU_LANDLINE"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -759,13 +759,13 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*gte:~*req.Weight:20"}, fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*gte:~*req.Weight:10"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -797,26 +797,26 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
 	for key := range failEvent {
 		if pass, err := filterS.Pass("cgrates.org", []string{"*empty:~*req." + key + ":"},
 			fEv); err != nil {
-			t.Errorf(err.Error())
+			t.Error(err)
 		} else if pass {
 			t.Errorf("For %s expecting: %+v, received: %+v", key, false, pass)
 		}
 		if pass, err := filterS.Pass("cgrates.org", []string{"*empty:~*req." + key + ":"},
 			pEv); err != nil {
-			t.Errorf(err.Error())
+			t.Error(err)
 		} else if !pass {
 			t.Errorf("For %s expecting: %+v, received: %+v", key, true, pass)
 		}
 	}
 	if pass, err := filterS.Pass("cgrates.org", []string{"*exists:~*req.NewKey:"},
 		fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("For NewKey expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org", []string{"*notexists:~*req.NewKey:"},
 		fEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("For NewKey expecting: %+v, received: %+v", true, pass)
 	}
@@ -838,7 +838,7 @@ func TestPassRsr(t *testing.T) {
 
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.8(~^004)"}, pEv1); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -851,7 +851,7 @@ func TestPassRsr(t *testing.T) {
 
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.5(~^0$)"}, pEv1); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -872,7 +872,7 @@ func TestPassRsr2(t *testing.T) {
 
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.8(~^004)"}, pEv1); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -904,13 +904,13 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 	pEv2.Set([]string{utils.MetaReq}, passEvent2)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{}, pEv1); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
 	if pass, err := filterS.Pass("itsyscom.com",
 		[]string{}, pEv2); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -921,7 +921,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, ev)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Test(~^\\w{30,})"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -932,7 +932,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, ev)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Test(~^\\w{30,})"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -946,7 +946,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, ev)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Test.Test2(~^\\w{30,})"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -959,7 +959,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, ev)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Test.Test2(~^\\w{30,})"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", false, pass)
 	}
@@ -977,7 +977,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
 		[]string{"*string:~*req.Account:1003", "*prefix:~*req.Destination:10",
 			"*suffix:~*req.Subject:03", "*rsr::~*req.Destination(1002)"},
 		pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: %+v, received: %+v", true, pass)
 	}
@@ -999,7 +999,7 @@ func TestPassFilterMaxCost(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent1)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: false , received: %+v", pass)
 	}
@@ -1011,7 +1011,7 @@ func TestPassFilterMaxCost(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent2)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: false, received: %+v", pass)
 	}
@@ -1023,13 +1023,13 @@ func TestPassFilterMaxCost(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent3)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true, received: %+v", pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*gt:~*req.MaxUsage:0"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true, received: %+v", pass)
 	}
@@ -1051,7 +1051,7 @@ func TestPassFilterMissingField(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent1)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Category(^$)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}
@@ -1063,7 +1063,7 @@ func TestPassFilterMissingField(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent2)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~Category(^$)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}
@@ -1075,7 +1075,7 @@ func TestPassFilterMissingField(t *testing.T) {
 	pEv.Set([]string{utils.MetaReq}, passEvent3)
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*rsr::~*req.Category(^$)"}, pEv); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if pass {
 		t.Errorf("Expecting: false , received: %+v", pass)
 	}
@@ -1220,25 +1220,25 @@ func TestEventCostFilter(t *testing.T) {
 
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.Balance.Value:50"}, cgrDp); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.AccountID:cgrates.org:1001"}, cgrDp); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*ec.Charges[0].Rating.Rates[0].Value:0.1574"}, cgrDp); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}
 	if pass, err := filterS.Pass("cgrates.org",
 		[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.Balance.ID:MONETARY_POSTPAID"}, cgrDp); err != nil {
-		t.Errorf(err.Error())
+		t.Error(err)
 	} else if !pass {
 		t.Errorf("Expecting: true , received: %+v", pass)
 	}

engine/onstor_it_test.go

@@ -1386,7 +1386,11 @@ func testOnStorITTiming(t *testing.T) {
 
 func testOnStorITCRUDHistory(t *testing.T) {
 	time := time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)
-	ist := &utils.LoadInstance{"Load", "RatingLoad", "Account", time}
+	ist := &utils.LoadInstance{LoadID: "Load",
+		RatingLoadID:     "RatingLoad",
+		AccountingLoadID: "Account",
+		LoadTime:         time,
+	}
 	if err := onStor.DataDB().AddLoadHistory(ist, 1, utils.NonTransactional); err != nil {
 		t.Error(err)
 	}

general_tests/a1_it_test.go

@@ -170,7 +170,7 @@ func testA1itAddBalance1(t *testing.T) {
 	if err := a1rpc.Call(utils.APIerSv1AddBalance, argAdd, &reply); err != nil {
 		t.Error(err)
 	} else if reply != utils.OK {
-		t.Errorf(reply)
+		t.Errorf("received unexpected reply: %s", reply)
 	}
 	argGet := &utils.AttrGetAccount{Tenant: argAdd.Tenant, Account: argAdd.Account}
 	var acnt *engine.Account

migrator/thresholds_it_test.go

@@ -198,11 +198,14 @@ func testTrsITMigrateAndMove(t *testing.T) {
 	}
 
 	tresProf := &engine.ThresholdProfile{
-		ID:                 v1trs.ID,
-		Tenant:             config.CgrConfig().GeneralCfg().DefaultTenant,
-		Weight:             v1trs.Weight,
-		ActivationInterval: &utils.ActivationInterval{v1trs.ExpirationDate, v1trs.ActivationDate},
-		MinSleep:           v1trs.MinSleep,
+		ID:     v1trs.ID,
+		Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
+		Weight: v1trs.Weight,
+		ActivationInterval: &utils.ActivationInterval{
+			ActivationTime: v1trs.ActivationDate,
+			ExpiryTime:     v1trs.ExpirationDate,
+		},
+		MinSleep: v1trs.MinSleep,
 	}
 
 	v2trs := &v2Threshold{