Update golangci-lint to support go version 1.23

Some linters got inactivated leading to an error
when running the linter. Thus, they are now removed
from the config file's enable list.
Also, deadline is not a valid linter run option based
on config verify.

Author: zolug

.golangci.yml

@@ -1,5 +1,4 @@
 run:
-  deadline: 5m
   timeout: 5m
 
 linters:

Makefile

@@ -273,7 +273,7 @@ output-dir:
 
 .PHONY: golangci-lint
 golangci-lint:
-	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.62.2)
+	$(call go-get-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint@v1.63.4)
 
 .PHONY: proto-compiler
 proto-compiler: protoc protoc-gen-go protoc-gen-go-grpc
@@ -335,6 +335,7 @@ define go-get-tool
 set -e ;\
 TMP_DIR=$$(mktemp -d) ;\
 cd $$TMP_DIR ;\
+go version ;\
 go mod init tmp ;\
 echo "Downloading $(2)" ;\
 GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\

api/v1/webhook_suite_test.go

@@ -134,7 +134,7 @@ var _ = BeforeSuite(func() {
 		if err != nil {
 			return err
 		}
-		conn.Close()
+		_ = conn.Close()
 		return nil
 	}).Should(Succeed())
 

cmd/frontend/internal/bird/bird.go

@@ -124,7 +124,9 @@ func (b *RoutingService) Run(ctx context.Context, monitorLogs bool) error {
 				return
 			}
 			// when context is done, close File thus signalling EOF to bufio Scan()
-			defer w.Close()
+			defer func() {
+				_ = w.Close()
+			}()
 			<-ctx.Done()
 			b.logger.Info("Context closed, terminate log monitoring")
 		}()

cmd/frontend/internal/bird/configure.go

@@ -51,7 +51,9 @@ func (r *routingConfig) Apply() error {
 	if err != nil {
 		return fmt.Errorf("create %v, err: %v", r.path, err)
 	}
-	defer file.Close()
+	defer func() {
+		_ = file.Close()
+	}()
 
 	_, err = file.WriteString(r.config)
 	if err != nil {

cmd/frontend/main.go

@@ -113,7 +113,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dial NSP", "error", err)
 	}
-	defer conn.Close()
+	defer func() {
+		_ = conn.Close()
+	}()
 
 	// monitor status of NSP connection and adjust probe status accordingly
 	if err := connection.Monitor(ctx, health.NSPCliSvc, conn); err != nil {
@@ -131,7 +133,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dial loadbalancer", "error", err)
 	}
-	defer lbConn.Close()
+	defer func() {
+		_ = lbConn.Close()
+	}()
 
 	// create and start frontend service
 	c := &feConfig.Config{

cmd/ipam/main.go

@@ -137,7 +137,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dial NSP err", "error", err)
 	}
-	defer conn.Close()
+	defer func() {
+		_ = conn.Close()
+	}()
 
 	// monitor status of NSP connection and adjust probe status accordingly
 	if err := connection.Monitor(ctx, health.NSPCliSvc, conn); err != nil {

cmd/operator/main.go

@@ -87,7 +87,9 @@ func setupTLSCert(socket string) error {
 	certDir := "/tmp/k8s-webhook-server/serving-certs"
 
 	go func() {
-		defer client.Close()
+		defer func() {
+			_ = client.Close()
+		}()
 		err := client.WatchX509Context(ctx, &x509Watcher{CertDir: certDir})
 		if err != nil && status.Code(err) != codes.Canceled {
 			log.Fatal(setupLog, "error watching X.509 context", "error", err)
@@ -132,7 +134,7 @@ func main() {
 			"Enabling this will ensure there is only one active controller manager.")
 
 	if os.Getenv(common.LogLevelEnv) == "" { // trace as default value
-		os.Setenv(common.LogLevelEnv, "trace")
+		_ = os.Setenv(common.LogLevelEnv, "trace")
 	}
 
 	ver := flag.Bool("version", false, "Print version and quit")

cmd/proxy/main.go

@@ -164,7 +164,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dialing IPAM", "error", err)
 	}
-	defer conn.Close()
+	defer func() {
+		_ = conn.Close()
+	}()
 
 	// monitor status of IPAM connection and adjust probe status accordingly
 	if err := connection.Monitor(signalCtx, health.IPAMCliSvc, conn); err != nil {
@@ -193,7 +195,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dialing NSP", "error", err)
 	}
-	defer nspConn.Close()
+	defer func() {
+		_ = nspConn.Close()
+	}()
 
 	// monitor status of NSP connection and adjust probe status accordingly
 	if err := connection.Monitor(signalCtx, health.NSPCliSvc, nspConn); err != nil {
@@ -234,14 +238,18 @@ func main() {
 		cancelSignalCtx()
 		return
 	}
-	defer cc.Close()
+	defer func() {
+		_ = cc.Close()
+	}()
 	monitorClient := networkservice.NewMonitorConnectionClient(cc)
 	go nsmmonitor.ConnectionMonitor(ctx, config.Name, monitorClient)
 
 	// create and start NSC that connects all remote NSE belonging to the right service
 	interfaceMonitorClient := interfacemonitor.NewClient(interfaceMonitor, p, netUtils)
 	nsmClient := service.GetNSC(ctx, &config, nsmAPIClient, p, interfaceMonitorClient, monitorClient)
-	defer nsmClient.Close()
+	defer func() {
+		_ = nsmClient.Close()
+	}()
 	go func() {
 		service.StartNSC(nsmClient, config.NetworkServiceName)
 		cancelSignalCtx() // let others with proper clean-up gracefully terminate

cmd/stateless-lb/main.go

@@ -178,7 +178,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "Dial NSP", "error", err)
 	}
-	defer conn.Close()
+	defer func() {
+		_ = conn.Close()
+	}()
 
 	// Monitor status of NSP connection and adjust probe status accordingly
 	if err := connection.Monitor(ctx, health.NSPCliSvc, conn); err != nil {
@@ -329,7 +331,9 @@ func main() {
 		cancel()
 		return
 	}
-	defer cc.Close()
+	defer func() {
+		_ = cc.Close()
+	}()
 	// Start monitoring NSM connections the LB is part of
 	monitorClient := networkservice.NewMonitorConnectionClient(cc)
 	go nsmmonitor.ConnectionMonitor(ctx, config.Name, monitorClient)

cmd/tapa/main.go

@@ -170,7 +170,9 @@ func main() {
 	if err != nil {
 		log.Fatal(logger, "dial to NSMgr", "error", err)
 	}
-	defer cc.Close()
+	defer func() {
+		_ = cc.Close()
+	}()
 	monitorClient := networkservice.NewMonitorConnectionClient(cc)
 
 	if err := os.RemoveAll(config.Socket); err != nil {

pkg/health/probe/probe.go

@@ -118,7 +118,9 @@ func (hp *HealthProbe) Request(ctx context.Context) error {
 	if err != nil {
 		return fmt.Errorf("failed to connect service %q, %w", hp.addr, err)
 	}
-	defer conn.Close()
+	defer func() {
+		_ = conn.Close()
+	}()
 
 	rpcCtx, rpcCancel := context.WithTimeout(ctx, hp.rpcTimeout)
 	defer rpcCancel()

pkg/ipam/storage/sqlite/sqlite_test.go

@@ -30,7 +30,9 @@ const dbFileName = "test.db"
 
 func Test_Add_Get(t *testing.T) {
 	_ = os.Remove(dbFileName)
-	defer os.Remove(dbFileName)
+	defer func() {
+		_ = os.Remove(dbFileName)
+	}()
 
 	store, err := sqlite.New(dbFileName)
 	assert.Nil(t, err)
@@ -74,7 +76,9 @@ func Test_Add_Get(t *testing.T) {
 
 func Test_GetChilds(t *testing.T) {
 	_ = os.Remove(dbFileName)
-	defer os.Remove(dbFileName)
+	defer func() {
+		_ = os.Remove(dbFileName)
+	}()
 
 	store, err := sqlite.New(dbFileName)
 	assert.Nil(t, err)
@@ -106,7 +110,9 @@ func Test_GetChilds(t *testing.T) {
 
 func Test_Delete(t *testing.T) {
 	_ = os.Remove(dbFileName)
-	defer os.Remove(dbFileName)
+	defer func() {
+		_ = os.Remove(dbFileName)
+	}()
 
 	store, err := sqlite.New(dbFileName)
 	assert.Nil(t, err)

pkg/nsm/client.go

@@ -172,7 +172,7 @@ func (apiClient *APIClient) Delete() {
 		apiClient.cancel()
 	}
 	if apiClient.GRPCClient != nil {
-		apiClient.GRPCClient.Close()
+		_ = apiClient.GRPCClient.Close()
 	}
 }
 

pkg/nsp/registry/sqlite/sqlite.go

@@ -60,7 +60,7 @@ func (trsql *TargetRegistrySQLite) Close() error {
 	if err != nil {
 		return fmt.Errorf("failed to close db connection: %w", err)
 	}
-	sqlDB.Close()
+	_ = sqlDB.Close()
 	return nil
 }
 

pkg/nsp/registry/sqlite/sqlite_test.go

@@ -31,12 +31,12 @@ func TestTargetRegistrySQLite_Set(t *testing.T) {
 	t.Cleanup(func() { goleak.VerifyNone(t) })
 
 	dbFile := "test.db"
-	os.Remove(dbFile)
+	_ = os.Remove(dbFile)
 	db, err := sqlite.New(dbFile)
 	assert.Nil(t, err)
 	defer func() {
-		db.Close()
-		os.Remove(dbFile)
+		_ = db.Close()
+		_ = os.Remove(dbFile)
 	}()
 
 	ctx := context.Background()