Upgrade go to v1.23.1

.golangci.yml

@@ -26,6 +26,29 @@ linters-settings:
           - (github.com/sirupsen/logrus.FieldLogger).Warnf
           - (github.com/sirupsen/logrus.FieldLogger).Errorf
           - (github.com/sirupsen/logrus.FieldLogger).Fatalf
+  revive:
+    confidence: 0.8
+    rules:
+      - name: exported
+      - name: blank-imports
+      - name: context-as-argument
+      - name: context-keys-type
+      - name: dot-imports
+      - name: error-return
+      - name: error-strings
+      - name: error-naming
+      - name: exported
+      - name: increment-decrement
+      - name: var-naming
+      - name: package-comments
+      - name: range
+      - name: receiver-naming
+      - name: time-naming
+      - name: unexported-return
+      - name: indent-error-flow
+      - name: errorf
+      - name: superfluous-else
+      - name: unreachable-code
   goimports:
     local-prefixes: github.com/networkservicemesh/sdk
   gocyclo:
@@ -57,81 +80,51 @@ linters-settings:
   gosec:
     excludes:
       - G115
-      - G301 # Fixable
-      - G302 # Fixable
-      - G306 # Fixable
+      - G204
+      - G301
+      - G302
+      - G306
   gocritic:
     enabled-checks:
-      - appendAssign
-      - assignOp
       - appendCombine
-      - argOrder
-      - badCall
-      - badCond
       - boolExprSimplify
       - builtinShadow
-      - captLocal
-      - caseOrder
-      - codegenComment
-      - commentFormatting
       - commentedOutCode
       - commentedOutImport
-      - defaultCaseOrder
-      - deprecatedComment
       - docStub
-      - dupArg
-      - dupBranchBody
-      - dupCase
       - dupImport
-      - dupSubExpr
-      - elseif
       - emptyFallthrough
       - emptyStringTest
       - equalFold
       - evalOrder
-      - exitAfterDefer
-      - flagDeref
-      - flagName
       - hexLiteral
       - hugeParam
-      - ifElseChain
       - importShadow
       - indexAlloc
       - initClause
       - methodExprCall
       - nestingReduce
-      - newDeref
       - nilValReturn
       - octalLiteral
-      - offBy1
       - paramTypeCombine
       - rangeExprCopy
       - rangeValCopy
-      - regexpMust
       - regexpPattern
-      - singleCaseSwitch
-      - sloppyLen
       - sloppyReassign
       - stringXbytes
-      - switchTrue
       - typeAssertChain
-      - typeSwitchVar
       - typeUnparen
       - unlabelStmt
       - unnamedResult
       - unnecessaryBlock
-      - underef
-      - unlambda
-      - unslice
-      - valSwap
       - weakCond
-      - wrapperFunc
       - yodaStyleExpr
 linters:
   disable-all: true
   enable:
     - goheader
     - bodyclose
+    - unused
     - depguard
     - dogsled
     - dupl
@@ -143,12 +136,14 @@ linters:
     - gocyclo
     - gofmt
     - goimports
+    - revive
     - gosec
     - gosimple
     - govet
     - ineffassign
     - misspell
     - nakedret
+    - copyloopvar
     - staticcheck
     - stylecheck
     - typecheck
@@ -162,9 +157,6 @@ issues:
   exclude-rules:
     # We really *do* want to pass a pointer to an interface in these cases.  See comments in file for New{Server,Client}
     # function for why
-    - path: .*\.gen\.go
-      linters:
-        - dupl
     - path: .*registry.*.go
       linters:
         - dupl
@@ -216,30 +208,10 @@ issues:
       linters:
         - dupl
       text: "lines are duplicate of"
-    - path: pkg/tools/spiffeutils/tls_peer.go
-      linters:
-        - gosec
-      text: "G402: TLS InsecureSkipVerify set true"
     - path: pkg/networkservice/common/updatepath/server_test.go
       linters:
         - gochecknoinits
       text: "don't use `init` function"
-    - path: pkg/tools/debug/self.go
-      linters:
-        - gosec
-      text: "G204: Subprocess launched with variable"
-    - path: pkg/tools/executils/start.go
-      linters:
-        - gosec
-      text: "G204: Subprocess launched with variable"
-    - path: pkg/tools/executils/run.go
-      linters:
-        - gosec
-      text: "G204: Subprocess launched with variable"
-    - path: pkg/tools/executils/output.go
-      linters:
-        - gosec
-      text: "G204: Subprocess launched with variable"
     - path: pkg/tools/spire/start.go
       linters:
         - funlen
@@ -274,7 +246,16 @@ issues:
     - path: pkg/networkservice/common/switchcase/.*_test.go
       linters:
         - dupl
+    - path: pkg/tools/ippool/ippool.go
+      linters:
+        - unused
+    - path: pkg/networkservice/common/switchcase/common_test.go
+      linters:
+        - revive
+    - path: pkg/tools/opa/policies.go
+      linters:
+        - revive
+    # TODO - remove deprecated opentelemetry functions
     - path: pkg/tools/tracing/grpcoptions.go
       linters:
         - staticcheck
-      text: "SA1019: otelgrpc.*"

pkg/networkservice/common/clientinfo/client_test.go

@@ -1,5 +1,7 @@
 // Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2024 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -133,7 +135,6 @@ func TestClientInfo(t *testing.T) {
 	}
 
 	for _, tc := range tests {
-		tc := tc
 		t.Run(tc.name, func(t *testing.T) {
 			err := setEnvs(tc.envs)
 			require.NoError(t, err)

pkg/networkservice/common/monitor/monitor_connection_server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2023 Cisco and/or its affiliates.
+// Copyright (c) 2021-2024 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -82,7 +82,6 @@ func (m *monitorConnectionServer) Send(event *networkservice.ConnectionEvent) (_
 			return
 		}
 		for id, filter := range m.filters {
-			id, filter := id, filter
 			e := event.Clone()
 			filter.executor.AsyncExec(func() {
 				var err error

pkg/networkservice/common/switchcase/client_test.go

@@ -45,7 +45,6 @@ func testSwitchClient(t *testing.T, conditions []switchcase.Condition, expected
 
 	var cases []*switchcase.ClientCase
 	for i, cond := range conditions {
-		i := i
 		cases = append(cases, &switchcase.ClientCase{
 			Condition: cond,
 			Client: checkcontext.NewClient(t, func(*testing.T, context.Context) {

pkg/networkservice/common/switchcase/server_test.go

@@ -45,7 +45,6 @@ func testSwitchServer(t *testing.T, conditions []switchcase.Condition, expected
 
 	var cases []*switchcase.ServerCase
 	for i, cond := range conditions {
-		i := i
 		cases = append(cases, &switchcase.ServerCase{
 			Condition: cond,
 			Server: checkcontext.NewServer(t, func(*testing.T, context.Context) {

pkg/networkservice/connectioncontext/ipcontext/vl3/ipam.go

@@ -137,14 +137,6 @@ func (p *IPAM) freeIfAllocated(ipNet string) {
 	}
 }
 
-func (p *IPAM) isExcluded(ipNet string) bool {
-	p.Lock()
-	defer p.Unlock()
-
-	_, r := p.excludedPrefixes[ipNet]
-	return r
-}
-
 // Reset resets IPAM's ippol by setting new prefix
 func (p *IPAM) Reset(prefix string, excludePrefixes ...string) error {
 	p.Lock()

pkg/registry/common/authorize/common.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2023 Cisco and/or its affiliates.
+// Copyright (c) 2022-2024 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -32,7 +32,7 @@ import (
 type RegistryOpaInput struct {
 	ResourceID         string                      `json:"resource_id"`
 	ResourceName       string                      `json:"resource_name"`
-	ResourcePathIdsMap map[string][]string         `json:"resource_path_ids_map"`
+	ResourcePathIDsMap map[string][]string         `json:"resource_path_ids_map"`
 	PathSegments       []*grpcmetadata.PathSegment `json:"path_segments"`
 	Index              uint32                      `json:"index"`
 }

pkg/registry/common/authorize/ns_client.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2022-2023 Cisco and/or its affiliates.
+// Copyright (c) 2022-2024 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -35,14 +35,14 @@ import (
 
 type authorizeNSClient struct {
 	policies     policiesList
-	nsPathIdsMap *genericsync.Map[string, []string]
+	nsPathIDsMap *genericsync.Map[string, []string]
 }
 
 // NewNetworkServiceRegistryClient - returns a new authorization registry.NetworkServiceRegistryClient
 // Authorize registry client checks spiffeID of NS.
 func NewNetworkServiceRegistryClient(opts ...Option) registry.NetworkServiceRegistryClient {
 	o := &options{
-		resourcePathIdsMap: new(genericsync.Map[string, []string]),
+		resourcePathIDsMap: new(genericsync.Map[string, []string]),
 	}
 
 	for _, opt := range opts {
@@ -51,7 +51,7 @@ func NewNetworkServiceRegistryClient(opts ...Option) registry.NetworkServiceRegi
 
 	return &authorizeNSClient{
 		policies:     o.policies,
-		nsPathIdsMap: o.resourcePathIdsMap,
+		nsPathIDsMap: o.resourcePathIDsMap,
 	}
 }
 
@@ -79,17 +79,17 @@ func (c *authorizeNSClient) Register(ctx context.Context, ns *registry.NetworkSe
 
 	path = grpcmetadata.PathFromContext(ctx)
 	spiffeID := getSpiffeIDFromPath(ctx, path)
-	rawMap := getRawMap(c.nsPathIdsMap)
+	rawMap := getRawMap(c.nsPathIDsMap)
 
 	input := RegistryOpaInput{
 		ResourceID:         spiffeID.String(),
 		ResourceName:       resp.Name,
-		ResourcePathIdsMap: rawMap,
+		ResourcePathIDsMap: rawMap,
 		PathSegments:       path.PathSegments,
 		Index:              path.Index,
 	}
 	if err := c.policies.check(ctx, input); err != nil {
-		if _, load := c.nsPathIdsMap.Load(resp.Name); !load {
+		if _, load := c.nsPathIDsMap.Load(resp.Name); !load {
 			unregisterCtx, cancelUnregister := postponeCtxFunc()
 			defer cancelUnregister()
 
@@ -101,7 +101,7 @@ func (c *authorizeNSClient) Register(ctx context.Context, ns *registry.NetworkSe
 		return nil, err
 	}
 
-	c.nsPathIdsMap.Store(resp.Name, resp.PathIds)
+	c.nsPathIDsMap.Store(resp.Name, resp.PathIds)
 	return resp, nil
 }
 
@@ -130,19 +130,19 @@ func (c *authorizeNSClient) Unregister(ctx context.Context, ns *registry.Network
 	}
 
 	spiffeID := getSpiffeIDFromPath(ctx, path)
-	rawMap := getRawMap(c.nsPathIdsMap)
+	rawMap := getRawMap(c.nsPathIDsMap)
 
 	input := RegistryOpaInput{
 		ResourceID:         spiffeID.String(),
 		ResourceName:       ns.Name,
-		ResourcePathIdsMap: rawMap,
+		ResourcePathIDsMap: rawMap,
 		PathSegments:       path.PathSegments,
 		Index:              path.Index,
 	}
 	if err := c.policies.check(ctx, input); err != nil {
 		return nil, err
 	}
 
-	c.nsPathIdsMap.Delete(ns.Name)
+	c.nsPathIDsMap.Delete(ns.Name)
 	return resp, nil
 }