Merge pull request #355 from wazsone/bug/fix-linter-and-sdks

Fix linter and sdks
networkservicemesh · Feb 17, 2023 · ddc22e8 · ddc22e8
2 parents c8e3e6c + 3b311f2
commit ddc22e8
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -18,7 +18,7 @@ jobs:
   golangci-lint:
     uses: networkservicemesh/.github/.github/workflows/golangci-lint.yaml@main
     with:
-      linter-version: v1.45.2
+      linter-version: v1.51.1
 
   excludeFmtErrorf:
     uses: networkservicemesh/.github/.github/workflows/exclude-fmt-errorf.yaml@main

diff --git a/.golangci.yml b/.golangci.yml
@@ -1,7 +1,7 @@
 ---
 run:
   # concurrency: 6
-  go: "1.17"
+  go: "1.19"
   timeout: 2m
   issues-exit-code: 1
   tests: true
@@ -166,3 +166,7 @@ issues:
   exclude-use-default: false
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-rules:
+    - path: main.go
+      linters:
+        - revive
diff --git a/go.mod b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/edwarnicke/vpphelper v0.0.0-20210512223648-f914b171f679
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1
-	github.com/networkservicemesh/sdk v0.5.1-0.20230213134519-3aa9aa0d5e1b
-	github.com/networkservicemesh/sdk-vpp v0.0.0-20230213142924-f83ab06a3e97
+	github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b
+	github.com/networkservicemesh/sdk-vpp v0.0.0-20230214123245-36ad9b74b357
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	github.com/spiffe/go-spiffe/v2 v2.0.0
@@ -24,6 +24,7 @@ require (
 	github.com/agnivade/levenshtein v1.1.1 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
 	github.com/edwarnicke/exechelper v1.0.2 // indirect
+	github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 // indirect
 	github.com/edwarnicke/log v1.0.0 // indirect
 	github.com/edwarnicke/serialize v1.0.7 // indirect
 	github.com/fsnotify/fsnotify v1.5.4 // indirect
@@ -39,7 +40,7 @@ require (
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect
-	github.com/networkservicemesh/sdk-kernel v0.0.0-20230213141018-c280bc6ee279 // indirect
+	github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af // indirect
 	github.com/open-policy-agent/opa v0.44.0 // indirect
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/tchap/go-patricia/v2 v2.3.1 // indirect

diff --git a/go.sum b/go.sum
@@ -80,6 +80,8 @@ github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/edwarnicke/exechelper v1.0.2 h1:dD49Ui2U0FBFxxhalnKw6vLS0P0TkgnXBRvKL/xmC5w=
 github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs=
+github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 h1:4/2wgileNvQB4HfJbq7u4FFLKIfc38a6P0S/51ZGgX8=
+github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29/go.mod h1:3m+ZfVq+z0pTLW798jmqnifMsalrVLIKmfXaMFvqSuc=
 github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0 h1:3qXBk0lN7PhPrS/2TVJE30TZA/Ecd6LwkFW4rBxxb2w=
 github.com/edwarnicke/govpp v0.0.0-20230130211138-14ef5d20b1d0/go.mod h1:kHDnxA+SSNFeMEHz7xvhub1zvx4mOTRlWWRCay2n5NM=
 github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k=
@@ -222,12 +224,12 @@ github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc=
 github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKksXsXsnDsEo+Cfn43pdPfML024ad//QcdKfgXK4=
 github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8=
-github.com/networkservicemesh/sdk v0.5.1-0.20230213134519-3aa9aa0d5e1b h1:0FNADw+V7ZmS1BQ02fIAll8bO45VYVQTeGHDZk/DsbI=
-github.com/networkservicemesh/sdk v0.5.1-0.20230213134519-3aa9aa0d5e1b/go.mod h1:0AB74FQa4HEAvazQ0v92E2Cnb7k0E1/gsbp+vFd0ukw=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20230213141018-c280bc6ee279 h1:8M3W+i2sJvCMbs2+xNLz/vqcIbngDPxzrbkDYnZ8jJk=
-github.com/networkservicemesh/sdk-kernel v0.0.0-20230213141018-c280bc6ee279/go.mod h1:6Sxg3ytjRrwhv8BR9807rHR4LMgyPYqvSOdsgBgSeM4=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20230213142924-f83ab06a3e97 h1:iCo6Ch1BOFecWMoSVo/gCFVUlZ5moaDP5R9q4coYg4E=
-github.com/networkservicemesh/sdk-vpp v0.0.0-20230213142924-f83ab06a3e97/go.mod h1:CBh1JuDun/uFDbl/wV7qGLhmGmzhusI9hRjJiHh5B6k=
+github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b h1:DAAqODDVm0Pm3bCfSfOKD71fRkfbDn746oiFcBuIjfk=
+github.com/networkservicemesh/sdk v0.5.1-0.20230214013943-438ec051e69b/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af h1:eIXf3IXkRZnL3xS6fEzR6WEElxHLf4Zm4Gy2WXRsMoA=
+github.com/networkservicemesh/sdk-kernel v0.0.0-20230214122858-b7a1313f02af/go.mod h1:PA9AjrnlqpFOKpjU2IKOXmiw5afBNI+HdBxtz2pjrRU=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20230214123245-36ad9b74b357 h1:dyGADn2x5zSW9tozEb3S7bPBz3FJZSFNq6Q5DqV/IMo=
+github.com/networkservicemesh/sdk-vpp v0.0.0-20230214123245-36ad9b74b357/go.mod h1:B7EPH1Kfvarlu2ZmGGv1LjdczcQ+IJAvmf1drtlTB1Y=
 github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.1.0 h1:e3YP4dN/HYPpGh29X1ZkcxcEICsOls9huyVCRBaxjq8=
 github.com/onsi/gomega v1.1.0/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=

diff --git a/internal/imports/gen.go b/internal/imports/gen.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2021 Doc.ai and/or its affiliates.
 //
-// Copyright (c) 2022 Cisco and/or its affiliates.
+// Copyright (c) 2022-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// Package imports is used for generating list of imports to optimize use of docker build cache
 package imports
 
 //go:generate bash -c "rm -f imports*.go"