Skip to content

Commit 6f3c030

Browse files
pirog-spbpirog-spb
andauthored
ci: fix golangci-lint failing due to Go toolchain mismatch (#651)
Signed-off-by: pirog-spb <[email protected]> Co-authored-by: pirog-spb <[email protected]>
1 parent 6c6383c commit 6f3c030

19 files changed

Lines changed: 65 additions & 58 deletions

‎.github/actions/raw-upf-presetup/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ runs:
88
packages: clang llvm gcc-multilib libbpf-dev
99

1010
- name: Set up Go
11-
uses: actions/setup-go@v4
11+
uses: actions/setup-go@v5
1212
with:
13-
go-version: '>=1.21.0'
13+
go-version-file: go.mod
1414
cache: true
1515

1616
- name: Install swaggo

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414

1515
- name: Raw UPF Presetup
1616
uses: ./.github/actions/raw-upf-presetup
@@ -23,9 +23,10 @@ jobs:
2323
run: go vet ./cmd/...
2424

2525
- name: golangci-lint
26-
uses: golangci/golangci-lint-action@v3
26+
uses: golangci/golangci-lint-action@v8
2727
with:
2828
working-directory: ./cmd
29+
version: v2.6.2
2930

3031
- name: Run tests
3132
run: sudo go test -v ./cmd/...

‎cmd/api/rest/far_map.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ type FarMapElement struct {
2020
}
2121

2222
func (h *ApiHandler) getFarValue(c *gin.Context) {
23-
id, err := strconv.Atoi(c.Param("id"))
23+
id, err := strconv.ParseUint(c.Param("id"), 10, 32)
2424
if err != nil {
2525
log.Printf("Not an integer id: %s", err.Error())
2626
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
2727
return
2828
}
2929

3030
var value ebpf.FarInfo
31-
if err = h.BpfObjects.IpEntrypointObjects.FarMap.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
31+
if err = h.BpfObjects.FarMap.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
3232
log.Printf("Error reading map: %s", err.Error())
3333
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
3434
return
@@ -60,7 +60,7 @@ func (h *ApiHandler) setFarValue(c *gin.Context) {
6060
TransportLevelMarking: farElement.TransportLevelMarking,
6161
}
6262

63-
if err := h.BpfObjects.IpEntrypointObjects.FarMap.Put(uint32(farElement.Id), unsafe.Pointer(&value)); err != nil {
63+
if err := h.BpfObjects.FarMap.Put(uint32(farElement.Id), unsafe.Pointer(&value)); err != nil {
6464
log.Printf("Error writting map: %s", err.Error())
6565
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
6666
return

‎cmd/api/rest/pfcp_sessions.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
package rest
22

33
import (
4-
"github.com/edgecomllc/eupf/cmd/core"
5-
"github.com/gin-gonic/gin"
64
"net"
75
"net/http"
86
"strconv"
7+
8+
"github.com/edgecomllc/eupf/cmd/core"
9+
"github.com/gin-gonic/gin"
910
)
1011

1112
// ListPfcpSessionsFiltered godoc
13+
//
1214
// @Summary If no parameters are given, list all PFCP sessions. If ip or teid is given, single session will be returned. If both ip and teid are given, it is possible to return two sessions.
1315
// @Tags PFCP
1416
// @Produce json
@@ -37,7 +39,7 @@ func (h *ApiHandler) listPfcpSessionsFiltered(c *gin.Context) {
3739
}
3840

3941
if sTeid != "" {
40-
if teid, err := strconv.Atoi(sTeid); err == nil {
42+
if teid, err := strconv.ParseUint(sTeid, 10, 32); err == nil {
4143
if session := FilterSessionsByTeid(&h.PfcpSrv.NodeAssociations, uint32(teid)); session != nil {
4244
sessions = append(sessions, *session) // Append session by TEID match
4345
}

‎cmd/api/rest/qer_map.go‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
package rest
22

33
import (
4-
"github.com/edgecomllc/eupf/cmd/ebpf"
5-
"github.com/gin-gonic/gin"
6-
"github.com/rs/zerolog/log"
74
"net/http"
85
"strconv"
96
"unsafe"
7+
8+
"github.com/edgecomllc/eupf/cmd/ebpf"
9+
"github.com/gin-gonic/gin"
10+
"github.com/rs/zerolog/log"
1011
)
1112

1213
// ListQerMapContent godoc
14+
//
1315
// @Summary List QER map content
1416
// @Description List QER map content
1517
// @Tags QER
1618
// @Produce json
1719
// @Success 200 {object} []ebpf.QerMapElement
1820
// @Router /qer_map [get]
1921
func (h *ApiHandler) listQerMapContent(c *gin.Context) {
20-
if elements, err := ebpf.ListQerMapContents(h.BpfObjects.IpEntrypointObjects.QerMap); err != nil {
22+
if elements, err := ebpf.ListQerMapContents(h.BpfObjects.QerMap); err != nil {
2123
log.Info().Msgf("Error reading map: %s", err.Error())
2224
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
2325
} else {
@@ -26,6 +28,7 @@ func (h *ApiHandler) listQerMapContent(c *gin.Context) {
2628
}
2729

2830
// GetQerValue godoc
31+
//
2932
// @Summary List QER map content
3033
// @Description List QER map content
3134
// @Tags QER
@@ -34,7 +37,7 @@ func (h *ApiHandler) listQerMapContent(c *gin.Context) {
3437
// @Success 200 {object} []ebpf.QerMapElement
3538
// @Router /qer_map/{id} [get]
3639
func (h *ApiHandler) getQerValue(c *gin.Context) {
37-
id, err := strconv.Atoi(c.Param("id"))
40+
id, err := strconv.ParseUint(c.Param("id"), 10, 32)
3841
if err != nil {
3942
log.Info().Msgf("Error converting id to int: %s", err.Error())
4043
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -43,7 +46,7 @@ func (h *ApiHandler) getQerValue(c *gin.Context) {
4346

4447
var value ebpf.QerInfo
4548

46-
if err = h.BpfObjects.IpEntrypointObjects.QerMap.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
49+
if err = h.BpfObjects.QerMap.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
4750
log.Printf("Error reading map: %s", err.Error())
4851
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
4952
return
@@ -77,7 +80,7 @@ func (h *ApiHandler) setQerValue(c *gin.Context) {
7780
StartDL: 0,
7881
}
7982

80-
if err := h.BpfObjects.IpEntrypointObjects.QerMap.Put(uint32(qerElement.Id), unsafe.Pointer(&value)); err != nil {
83+
if err := h.BpfObjects.QerMap.Put(uint32(qerElement.Id), unsafe.Pointer(&value)); err != nil {
8184
log.Printf("Error writting map: %s", err.Error())
8285
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
8386
return

‎cmd/api/rest/uplink_pdr.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ type PdrElement struct {
1818
}
1919

2020
func (h *ApiHandler) getUplinkPdrValue(c *gin.Context) {
21-
id, err := strconv.Atoi(c.Param("id"))
21+
id, err := strconv.ParseUint(c.Param("id"), 10, 32)
2222
if err != nil {
2323
log.Printf("Not an integer id: %s", err.Error())
2424
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
2525
return
2626
}
2727

2828
var value ebpf.PdrInfo
29-
if err = h.BpfObjects.IpEntrypointObjects.PdrMapTeidIp4.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
29+
if err = h.BpfObjects.PdrMapTeidIp4.Lookup(uint32(id), unsafe.Pointer(&value)); err != nil {
3030
log.Printf("Error reading map: %s", err.Error())
3131
c.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
3232
return
@@ -55,7 +55,7 @@ func (h *ApiHandler) setUplinkPdrValue(c *gin.Context) {
5555
QerId: pdrElement.QerId,
5656
}
5757

58-
if err := h.BpfObjects.IpEntrypointObjects.PdrMapTeidIp4.Put(uint32(pdrElement.Id), unsafe.Pointer(&value)); err != nil {
58+
if err := h.BpfObjects.PdrMapTeidIp4.Put(uint32(pdrElement.Id), unsafe.Pointer(&value)); err != nil {
5959
log.Printf("Error writting map: %s", err.Error())
6060
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
6161
return

‎cmd/core/config_edit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
func SetConfig(conf config.UpfConfig) error {
1212
// For now only logging_level parameter update in config.UpfConfig is supported.
1313
if err := SetLoggerLevel(conf.LoggingLevel); err != nil {
14-
return fmt.Errorf("Logger configuring error: %s. Using '%s' level",
14+
return fmt.Errorf("logger configuring error: %s. Using '%s' level",
1515
err.Error(), zerolog.GlobalLevel().String())
1616
}
1717
return nil

‎cmd/core/display_utils.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func printSessionDeleteRequest(req *message.SessionDeletionRequest) {
186186

187187
func displayBar(sb *strings.Builder, bar *ie.IE) {
188188
barId, _ := bar.BARID()
189-
sb.WriteString(fmt.Sprintf("BAR ID: %d\n", barId))
189+
fmt.Fprintf(sb, "BAR ID: %d\n", barId)
190190

191191
downlink, err := bar.DownlinkDataNotificationDelay()
192192
if err == nil {
@@ -204,7 +204,7 @@ func displayBar(sb *strings.Builder, bar *ie.IE) {
204204

205205
func displayUrr(sb *strings.Builder, urr *ie.IE) {
206206
urrId, _ := urr.URRID()
207-
sb.WriteString(fmt.Sprintf("URR ID: %d \n", urrId))
207+
fmt.Fprintf(sb, "URR ID: %d \n", urrId)
208208

209209
measurementMethod, err := urr.MeasurementMethod()
210210
if err == nil {
@@ -226,7 +226,7 @@ func displayUrr(sb *strings.Builder, urr *ie.IE) {
226226

227227
func displayQer(sb *strings.Builder, qer *ie.IE) {
228228
qerId, _ := qer.QERID()
229-
sb.WriteString(fmt.Sprintf("QER ID: %d \n", qerId))
229+
fmt.Fprintf(sb, "QER ID: %d \n", qerId)
230230

231231
gateStatusDL, err := qer.GateStatusDL()
232232
if err == nil {
@@ -252,7 +252,7 @@ func displayQer(sb *strings.Builder, qer *ie.IE) {
252252

253253
func displayFar(sb *strings.Builder, far *ie.IE) {
254254
farId, _ := far.FARID()
255-
sb.WriteString(fmt.Sprintf("FAR ID: %d \n", farId))
255+
fmt.Fprintf(sb, "FAR ID: %d \n", farId)
256256

257257
applyAction, err := far.ApplyAction()
258258
if err == nil {
@@ -324,7 +324,7 @@ func displayFar(sb *strings.Builder, far *ie.IE) {
324324

325325
func displayPdr(sb *strings.Builder, pdr *ie.IE) {
326326
pdrId, _ := pdr.PDRID()
327-
sb.WriteString(fmt.Sprintf("PDR ID: %d \n", pdrId))
327+
fmt.Fprintf(sb, "PDR ID: %d \n", pdrId)
328328

329329
if outerHeaderRemoval, err := pdr.OuterHeaderRemovalDescription(); err == nil {
330330
writeLineTabbed(sb, fmt.Sprintf("Outer Header Removal: %d ", outerHeaderRemoval), 2)

‎cmd/core/gtp_path_manager.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func (gtpPathManager *GtpPathManager) sendEcho(gtpPeerAddress string, seq uint16
9393
if err != nil {
9494
return 0, fmt.Errorf("can't create UDP connection: %v", err)
9595
}
96-
defer conn.Close()
96+
defer func() { _ = conn.Close() }()
9797

9898
receiveBuffer := make([]byte, 1500)
9999
_ = conn.SetReadDeadline(time.Now().Add(time.Second * 3))

‎cmd/core/ie_overwrite_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ func (mapOps *MapOperationsMock) UpdateUrr(internalId uint32, urrInfo ebpf.UrrIn
6969
return nil
7070
}
7171

72-
func (mapOps *MapOperationsMock) DeleteUrr(internalId uint32) (error, ebpf.UrrInfo) {
73-
return nil, mapOps.urr
72+
func (mapOps *MapOperationsMock) DeleteUrr(internalId uint32) (ebpf.UrrInfo, error) {
73+
return mapOps.urr, nil
7474
}
7575

7676
func TestSessionOverwrite(t *testing.T) {

0 commit comments

Comments
 (0)