From b0eeb5412b00ec1ce1f1139b09dfc1830972df4e Mon Sep 17 00:00:00 2001 From: vardhaman22 Date: Wed, 23 Aug 2023 00:35:18 +0530 Subject: [PATCH] skip linting rules these linting rules are enabled by default now in latest golangci-lint revive pluign --- .golangci.json | 20 ++++++++++++++++++++ go.mod | 13 +++++-------- go.sum | 20 ++++++++++---------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/.golangci.json b/.golangci.json index b998d60ca..34121c4cd 100644 --- a/.golangci.json +++ b/.golangci.json @@ -61,6 +61,26 @@ { "linters": "typecheck", "text": "imported but not used as apierrors" + }, + { + "linters": "revive", + "text": "unused-parameter" + }, + { + "linters": "revive", + "text": "redefines-builtin-id" + }, + { + "linters": "revive", + "text": "superfluous-else" + }, + { + "linters": "revive", + "text": "empty-block" + }, + { + "linters": "revive", + "text": "if-return: redundant if" } ] } diff --git a/go.mod b/go.mod index 5805d2255..5c526cd57 100644 --- a/go.mod +++ b/go.mod @@ -6,11 +6,8 @@ replace ( github.com/crewjam/saml => github.com/rancher/saml v0.2.0 github.com/knative/pkg => github.com/rancher/pkg v0.0.0-20181214184433-b04c0947ad2f github.com/matryer/moq => github.com/rancher/moq v0.0.0-20190404221404-ee5226d43009 - github.com/rancher/apiserver => github.com/vardhaman22/apiserver v1.27.4-rancher1 - github.com/rancher/dynamiclistener => github.com/vardhaman22/dynamiclistener v1.27.4-rancher1 - github.com/rancher/lasso => github.com/vardhaman22/lasso v1.27.4-rancher2 - github.com/rancher/wrangler => github.com/vardhaman22/wrangler v1.27.4-rancher1 - k8s.io/client-go => github.com/vardhaman22/rancher-client-go v1.27.4-rancher1 + github.com/rancher/wrangler => github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df + k8s.io/client-go => github.com/rancher/client-go v1.27.4-rancher1 ) require ( @@ -21,8 +18,8 @@ require ( github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.16.0 - github.com/rancher/apiserver v0.0.0-20230810214006-d134152ce6fb - github.com/rancher/dynamiclistener v0.3.5 + github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba + github.com/rancher/dynamiclistener v0.3.6-rc2 github.com/rancher/kubernetes-provider-detector v0.1.5 github.com/rancher/norman v0.0.0-20230811152901-078862e5648c github.com/rancher/remotedialer v0.3.0 @@ -78,7 +75,7 @@ require ( github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.10.1 // indirect - github.com/rancher/lasso v0.0.0-20230810170912-a86ba6c749aa // indirect + github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect diff --git a/go.sum b/go.sum index 0e2617ac3..9e60e92c9 100644 --- a/go.sum +++ b/go.sum @@ -511,12 +511,22 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba h1:ceAHvddZkuNbUTuMgqxYAcUSQ/+YtJQO9Z1PHjmQZBY= +github.com/rancher/apiserver v0.0.0-20230831052300-120e615b17ba/go.mod h1:1m5KKYXq6iMZFQ5kiC9rBgVLfGRNR8E+lp88f5tEAsI= +github.com/rancher/client-go v1.27.4-rancher1 h1:1W1A0bV6KXYbu1z+KIezlfLsHPc1wiasAM42BICVKBM= +github.com/rancher/client-go v1.27.4-rancher1/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= +github.com/rancher/dynamiclistener v0.3.6-rc2 h1:Y1nai+Xv+4qqlB3c+hmrY2uBo1EcCDU9kmN5hbnmZhA= +github.com/rancher/dynamiclistener v0.3.6-rc2/go.mod h1:wOh62hdJIgyqTdD/VAHO77UPKAbUsJJ5gYRjzgBL3Wo= github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM7QmfO4OedvFE3QwXiH60I= github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0= +github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29 h1:+kige/h8/LnzWgPjB5NUIHz/pWiW/lFpqcTUkN5uulY= +github.com/rancher/lasso v0.0.0-20230830164424-d684fdeb6f29/go.mod h1:kgk9kJVMj9FIrrXU0iyM6u/9Je4bEjPImqswkTVaKsQ= github.com/rancher/norman v0.0.0-20230811152901-078862e5648c h1:WIb4uByAj1nbLhZtzE2EtWG1F0pcphB03X0XVITjYkI= github.com/rancher/norman v0.0.0-20230811152901-078862e5648c/go.mod h1:PCB8nUi/3MvvQ10H6V/yuZZuCaUkKlbBpH3dbgW5N0k= github.com/rancher/remotedialer v0.3.0 h1:y1EO8JCsgZo0RcqTUp6U8FXcBAv27R+TLnWRcpvX1sM= github.com/rancher/remotedialer v0.3.0/go.mod h1:BwwztuvViX2JrLLUwDlsYt5DiyUwHLlzynRwkZLAY0Q= +github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df h1:WJ+aaUICHPX8HeLmHE9JL/RFHhilMfcJlqmhgpc7gJU= +github.com/rancher/wrangler v1.1.1-0.20230831050635-df1bd5aae9df/go.mod h1:4T80p+rLh2OLbjCjdExIjRHKNBgK9NUAd7eIU/gRPKk= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -586,16 +596,6 @@ github.com/urfave/cli v1.22.14 h1:ebbhrRiGK2i4naQJr+1Xj92HXZCrK7MsyTS/ob3HnAk= github.com/urfave/cli v1.22.14/go.mod h1:X0eDS6pD6Exaclxm99NJ3FiCDRED7vIHpx2mDOHLvkA= github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= -github.com/vardhaman22/apiserver v1.27.4-rancher1 h1:PS/QJxxVx9k++6wB4NvL5W/86lGsBW2NTJ3TlvE87z0= -github.com/vardhaman22/apiserver v1.27.4-rancher1/go.mod h1:n3ZxUZcDE4L6C2KBtibI4aapttvbrNvQw9nC83E7DJE= -github.com/vardhaman22/dynamiclistener v1.27.4-rancher1 h1:VcwTfjgFEAh05HT7tJLyMC5LYwkJZGV85/m9b8KJLpI= -github.com/vardhaman22/dynamiclistener v1.27.4-rancher1/go.mod h1:dfaXonL4QiPj7N6oGL+KQ0K1BuoBAWyZR73EBmPeo3g= -github.com/vardhaman22/lasso v1.27.4-rancher2 h1:uBoYLclpTyhzuOSL55D4JsuNj/yiJ8kuddbZkekRlc0= -github.com/vardhaman22/lasso v1.27.4-rancher2/go.mod h1:qwPZXqLqTa7dFWv2KaJoFpc5ry5DIQ8ozogt3T5bXJw= -github.com/vardhaman22/rancher-client-go v1.27.4-rancher1 h1:2PGJt+WbKhd4X28bCXb21fDhBhkXhJwwiSpre+Kei0I= -github.com/vardhaman22/rancher-client-go v1.27.4-rancher1/go.mod h1:ragcly7lUlN0SRPk5/ZkGnDjPknzb37TICq07WhI6Xc= -github.com/vardhaman22/wrangler v1.27.4-rancher1 h1:iqMBmu9Pnv1+fkwL3QcI/oI2z13OeYsg3st3DrTZDsY= -github.com/vardhaman22/wrangler v1.27.4-rancher1/go.mod h1:m22ZvQuq+j1TKE9QhrBaPc0xZBO8omxSnwNbmhp/g5s= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=