From ae5801c4907282e3712e8e323c3e99ef8f3cc5a6 Mon Sep 17 00:00:00 2001 From: Guillaume Belanger Date: Fri, 5 Jan 2024 11:17:22 -0500 Subject: [PATCH] chore: Adds errcheck lint check (#56) --- .golangci.yml | 2 +- service/init.go | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 2f86aa5..88eeb11 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -222,7 +222,7 @@ linters: enable: - gofmt # - govet - # - errcheck + - errcheck - staticcheck - unused # - gosimple diff --git a/service/init.go b/service/init.go index c4e4f37..d3d7939 100644 --- a/service/init.go +++ b/service/init.go @@ -513,7 +513,10 @@ func getPccRules(slice *protos.NetworkSlice, sessionRule *models.SessionRule) (p } pccPolicy.IdGenerator = idgenerator.NewGenerator(1, math.MaxInt64) for _, pccrule := range slice.AppFilters.PccRuleBase { - id, _ := pccPolicy.IdGenerator.Allocate() + id, err := pccPolicy.IdGenerator.Allocate() + if err != nil { + logger.GrpcLog.Errorf("IdGenerator allocation failed: %v", err) + } var rule models.PccRule var qos models.QosData rule.PccRuleId = strconv.FormatInt(int64(id), 10) @@ -565,7 +568,10 @@ func getPccRules(slice *protos.NetworkSlice, sessionRule *models.SessionRule) (p var flow models.FlowInformation flow.FlowDescription = pflow.FlowDesc //flow.TosTrafficClass = pflow.TosTrafficClass - id, _ := pccPolicy.IdGenerator.Allocate() + id, err := pccPolicy.IdGenerator.Allocate() + if err != nil { + logger.GrpcLog.Errorf("IdGenerator allocation failed: %v", err) + } flow.PackFiltId = strconv.FormatInt(id, 10) if pflow.FlowDir == protos.PccFlowDirection_DOWNLINK { @@ -658,7 +664,10 @@ func (pcf *PCF) UpdatePcfSubsriberPolicyData(slice *protos.NetworkSlice) { make(map[string]*models.QosData), make(map[string]*models.TrafficControlData), make(map[string]*context.SessionPolicy), nil} policyData.PccPolicy[sliceid].SessionPolicy[dnn] = &context.SessionPolicy{make(map[string]*models.SessionRule), idgenerator.NewGenerator(1, math.MaxInt16)} - id, _ := policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRuleIdGenerator.Allocate() + id, err := policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRuleIdGenerator.Allocate() + if err != nil { + logger.GrpcLog.Errorf("SessionRuleIdGenerator allocation failed: %v", err) + } //tcid, _ := policyData.PccPolicy[sliceid].TcIdGenerator.Allocate() sessionrule.SessRuleId = dnn + "-" + strconv.Itoa(int(id)) policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRules[sessionrule.SessRuleId] = sessionrule @@ -702,7 +711,10 @@ func (pcf *PCF) UpdatePcfSubsriberPolicyData(slice *protos.NetworkSlice) { policyData.PccPolicy[sliceid].SessionPolicy[dnn] = &context.SessionPolicy{make(map[string]*models.SessionRule), idgenerator.NewGenerator(1, math.MaxInt16)} //Added session rules - id, _ := policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRuleIdGenerator.Allocate() + id, err := policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRuleIdGenerator.Allocate() + if err != nil { + logger.GrpcLog.Errorf("SessionRuleIdGenerator allocation failed: %v", err) + } sessionrule.SessRuleId = dnn + strconv.Itoa(int(id)) policyData.PccPolicy[sliceid].SessionPolicy[dnn].SessionRules[sessionrule.SessRuleId] = sessionrule //Added pcc rules