[qfix] Enable depguard linter (#1490)

* enable depguard linter Signed-off-by: Nikita Skrynnik <[email protected]> * fix linter Signed-off-by: Nikita Skrynnik <[email protected]> * fix linter Signed-off-by: Nikita Skrynnik <[email protected]> * fix linter Signed-off-by: Nikita Skrynnik <[email protected]> * rerun CI Signed-off-by: Nikita Skrynnik <[email protected]> --------- Signed-off-by: Nikita Skrynnik <[email protected]>
networkservicemesh · Jul 20, 2023 · 8dc1419 · 8dc1419
1 parent 7d9fde6
commit 8dc1419
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 25 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -42,13 +42,11 @@ linters-settings:
     min-len: 2
     min-occurrences: 2
   depguard:
-    list-type: blacklist
-    include-go-root: false
-    packages:
-      - errors
-    packages-with-error-message:
-      # specify an error message to output when a blacklisted package is used
-      - errors: "Please use \"github.com/pkg/errors\" instead of \"errors\" in go imports"
+    rules:
+      main:
+        deny:
+          - pkg: "errors"
+            desc: "Please use \"github.com/pkg/errors\" instead of \"errors\" in go imports"
   misspell:
     locale: US
   unparam:
@@ -129,11 +127,10 @@ linters-settings:
 linters:
   disable-all: true
   enable:
-    # - rowserrcheck
     - goheader
     - bodyclose
     - deadcode
-    # - depguard
+    - depguard
     - dogsled
     - dupl
     - errcheck
@@ -150,7 +147,6 @@ linters:
     - govet
     - ineffassign
     - interfacer
-    # - lll
     - misspell
     - nakedret
     - scopelint
@@ -160,7 +156,6 @@ linters:
     - typecheck
     - unconvert
     - unparam
-    # - unused
     - varcheck
     - whitespace
 issues:

diff --git a/pkg/networkservice/common/mechanisms/kernel/vlan/server.go b/pkg/networkservice/common/mechanisms/kernel/vlan/server.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2021-2022 Nordix Foundation.
 //
+// Copyright (c) 2023 Cisco Foundation.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,9 +24,10 @@ package vlan
 
 import (
 	"context"
-	"errors"
 	"sync"
 
+	"github.com/pkg/errors"
+
 	"github.com/RoaringBitmap/roaring"
 	"github.com/golang/protobuf/ptypes/empty"
 

diff --git a/pkg/networkservice/common/mechanisms/server_test.go b/pkg/networkservice/common/mechanisms/server_test.go
@@ -2,6 +2,8 @@
 //
 // Copyright (c) 2021 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2023 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +22,10 @@ package mechanisms_test
 
 import (
 	"context"
-	"errors"
 	"testing"
 
+	"github.com/pkg/errors"
+
 	"github.com/stretchr/testify/require"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkcontext"

diff --git a/pkg/networkservice/common/timeout/server.go b/pkg/networkservice/common/timeout/server.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
-// Copyright (c) 2020-2022 Cisco Systems, Inc.
+// Copyright (c) 2020-2023 Cisco Systems, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -23,10 +23,9 @@ import (
 	"context"
 	"time"
 
-	iserror "errors"
+	"github.com/pkg/errors"
 
 	"github.com/golang/protobuf/ptypes/empty"
-	"github.com/pkg/errors"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/begin"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
@@ -90,7 +89,7 @@ func (s *timeoutServer) Request(ctx context.Context, request *networkservice.Net
 
 func (s *timeoutServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
 	_, err := next.Server(ctx).Close(ctx, conn)
-	if !(iserror.Is(err, context.DeadlineExceeded) || iserror.Is(err, context.Canceled)) {
+	if !(errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled)) {
 		if oldCancel, loaded := loadAndDelete(ctx, metadata.IsClient(s)); loaded {
 			oldCancel()
 		}

diff --git a/pkg/networkservice/connectioncontext/ipcontext/vl3/client.go b/pkg/networkservice/connectioncontext/ipcontext/vl3/client.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Cisco and/or its affiliates.
+// Copyright (c) 2022-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -20,7 +20,8 @@ package vl3
 
 import (
 	"context"
-	"errors"
+
+	"github.com/pkg/errors"
 
 	"github.com/edwarnicke/serialize"
 	"github.com/golang/protobuf/ptypes/empty"

diff --git a/pkg/networkservice/connectioncontext/ipcontext/vl3/server.go b/pkg/networkservice/connectioncontext/ipcontext/vl3/server.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2022 Cisco and/or its affiliates.
+// Copyright (c) 2022-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -18,7 +18,8 @@ package vl3
 
 import (
 	"context"
-	"errors"
+
+	"github.com/pkg/errors"
 
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/ipam"

diff --git a/pkg/networkservice/core/adapters/networkservice_test.go b/pkg/networkservice/core/adapters/networkservice_test.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2020 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2023 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,9 +20,10 @@ package adapters_test
 
 import (
 	"context"
-	"errors"
 	"testing"
 
+	"github.com/pkg/errors"
+
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/stretchr/testify/require"

diff --git a/pkg/registry/common/dnsresolve/ns_server.go b/pkg/registry/common/dnsresolve/ns_server.go
@@ -20,9 +20,10 @@ package dnsresolve
 
 import (
 	"context"
-	"errors"
 	"net"
 
+	"github.com/pkg/errors"
+
 	"github.com/networkservicemesh/sdk/pkg/tools/clienturlctx"
 
 	"github.com/networkservicemesh/sdk/pkg/tools/interdomain"

diff --git a/pkg/tools/grpcutils/errors.go b/pkg/tools/grpcutils/errors.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2021 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2023 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +19,7 @@
 package grpcutils
 
 import (
-	"errors"
+	"github.com/pkg/errors"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/pkg/tools/sandbox/fake_resolver.go b/pkg/tools/sandbox/fake_resolver.go
@@ -1,5 +1,7 @@
 // Copyright (c) 2020-2022 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2023 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,13 +20,14 @@ package sandbox
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"net/url"
 	"strconv"
 	"sync"
 
+	"github.com/pkg/errors"
+
 	"github.com/networkservicemesh/sdk/pkg/registry/common/dnsresolve"
 )