From 524d5ba93b22c64765de4be1750f405ff2da1306 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 24 Dec 2021 00:57:32 +0000 Subject: [PATCH 1/4] Cirrus: Whitelist type assertions in varnamelen linter --- .golangci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.golangci.yml b/.golangci.yml index 53e6130..5fe9f4c 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -6,3 +6,5 @@ linters-settings: replace-allow-list: - "github.com/namecoin/x509-compressed" - "github.com/coreos/go-systemd" + varnamelen: + ignore-type-assert-ok: true From 0eb6f7c76181ce5753e2999bec8cb429a7114814 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 24 Dec 2021 01:05:13 +0000 Subject: [PATCH 2/4] Fix comment typo --- util/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/util.go b/util/util.go index 3691f88..d4cb239 100644 --- a/util/util.go +++ b/util/util.go @@ -74,7 +74,7 @@ func SplitDomainByFloatingAnchor(qname, anchor string) (subname, basename, rootn // scanning for rootname if v == anchor { if i == 0 { - // i is alreay zero, so we have something like bit.x.y.z. + // i is already zero, so we have something like bit.x.y.z. rootname = qname return } From f4fcb012208a982f32ad36a33807270dc1446288 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 24 Dec 2021 01:34:54 +0000 Subject: [PATCH 3/4] Fix varnamelen warning in SplitDomainByFloatingAnchor --- util/util.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/util/util.go b/util/util.go index d4cb239..9b16030 100644 --- a/util/util.go +++ b/util/util.go @@ -68,20 +68,20 @@ func SplitDomainByFloatingAnchor(qname, anchor string) (subname, basename, rootn return } - for i := len(parts) - 1; i >= 0; i-- { - v := parts[i] + for partIndex := len(parts) - 1; partIndex >= 0; partIndex-- { + v := parts[partIndex] // scanning for rootname if v == anchor { - if i == 0 { - // i is already zero, so we have something like bit.x.y.z. + if partIndex == 0 { + // partIndex is already zero, so we have something like bit.x.y.z. rootname = qname return } - rootname = strings.Join(parts[i:], ".") - basename = parts[i-1] - subname = strings.Join(parts[0:i-1], ".") + rootname = strings.Join(parts[partIndex:], ".") + basename = parts[partIndex-1] + subname = strings.Join(parts[0:partIndex-1], ".") return } } From f6d956b5ec8300b6cb313baf6887888ae8eb8e22 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Fri, 24 Dec 2021 01:40:03 +0000 Subject: [PATCH 4/4] Cirrus: Mark varnamelen as non-mandatory. It can be re-enabled after golangci-lint v1.44 is released, which includes a fix for https://github.com/blizzy78/varnamelen/issues/1 . --- .cirrus.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 1ee0959..052334e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -59,7 +59,8 @@ task: GOLANGCI_ARGS: "--new-from-rev=HEAD~" - name: "Go Lint $GOOS Mandatory$MODULES_NAME" env: - GOLANGCI_ARGS: "--disable=cyclop,deadcode,errcheck,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,wastedassign,whitespace,wrapcheck,wsl" + # TODO: Re-enable varnamelen after golangci-lint v1.44 is released. + GOLANGCI_ARGS: "--disable=cyclop,deadcode,errcheck,errorlint,exhaustivestruct,forbidigo,forcetypeassert,funlen,gci,gocognit,gocritic,godot,godox,goerr113,gofumpt,goimports,golint,gosec,gosimple,govet,ineffassign,lll,maligned,nakedret,nestif,nilerr,nlreturn,paralleltest,revive,scopelint,staticcheck,stylecheck,thelper,unconvert,unparam,unused,varnamelen,wastedassign,whitespace,wrapcheck,wsl" - name: "Go Lint $GOOS$MODULES_NAME" env: GOLANGCI_ARGS: ""