replace golint with revive, as it's deprecated

thaJeztah · thaJeztah · commit 1cab8eda24e7 · 2022-07-04T10:15:54.000+02:00
WARN [runner] The linter 'golint' is deprecated (since v1.41.0) due to: The repository of the linter has been archived by the owner.  Replaced by revive.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/daemon/network.go b/daemon/network.go
@@ -365,7 +365,7 @@ func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string
 	n, err := c.NewNetwork(driver, create.Name, id, nwOptions...)
 	if err != nil {
 		if _, ok := err.(libnetwork.ErrDataStoreNotInitialized); ok {
-			//nolint: golint
+			//nolint: revive
 			return nil, errors.New("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again.")
 		}
 		return nil, err
diff --git a/hack/validate/golangci-lint.yml b/hack/validate/golangci-lint.yml
@@ -3,12 +3,12 @@ linters:
     - deadcode
     - depguard
     - goimports
-    - golint
     - gosec
     - gosimple
     - govet
     - ineffassign
     - misspell
+    - revive
     - staticcheck
     - structcheck
     - typecheck
@@ -55,10 +55,6 @@ issues:
     - text: "Error return value of .((os\\.)?std(out|err)\\..*|.*Close|.*Flush|os\\.Remove(All)?|.*print(f|ln)?|os\\.(Un)?Setenv). is not checked"
       linters:
         - errcheck
-    # EXC0003
-    - text: "func name will be used as test\\.Test.* by other packages, and that stutters; consider calling this"
-      linters:
-        - golint
     # EXC0006
     - text: "Use of unsafe calls should be audited"
       linters:
@@ -102,7 +98,7 @@ issues:
     - text: "type name will be used as (container|volume)\\.(Container|Volume).* by other packages, and that stutters; consider calling this"
       path: "api/types/(volume|container)/"
       linters:
-        - golint
+        - revive
     # FIXME temporarily suppress these. See #39924
     - text: "SA1019: .*\\.Xattrs has been deprecated since Go 1.10: Use PAXRecords instead"
       linters:
diff --git a/integration/internal/network/network.go b/integration/internal/network/network.go
@@ -26,7 +26,7 @@ func Create(ctx context.Context, client client.APIClient, name string, ops ...fu
 }
 
 // CreateNoError creates a network with the specified options and verifies there were no errors
-func CreateNoError(ctx context.Context, t *testing.T, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) string { //nolint: golint
+func CreateNoError(ctx context.Context, t *testing.T, client client.APIClient, name string, ops ...func(*types.NetworkCreate)) string {
 	t.Helper()
 
 	name, err := createNetwork(ctx, client, name, ops...)

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,7 @@ func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string`
`365`	`365`	`n, err := c.NewNetwork(driver, create.Name, id, nwOptions...)`
`366`	`366`	`if err != nil {`
`367`	`367`	`if _, ok := err.(libnetwork.ErrDataStoreNotInitialized); ok {`
`368`		`- //nolint: golint`
	`368`	`+ //nolint: revive`
`369`	`369`	`return nil, errors.New("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again.")`
`370`	`370`	`}`
`371`	`371`	`return nil, err`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ func Create(ctx context.Context, client client.APIClient, name string, ops ...fu`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// CreateNoError creates a network with the specified options and verifies there were no errors`
`29`		`-func CreateNoError(ctx context.Context, t testing.T, client client.APIClient, name string, ops ...func(types.NetworkCreate)) string { //nolint: golint`
	`29`	`+func CreateNoError(ctx context.Context, t testing.T, client client.APIClient, name string, ops ...func(types.NetworkCreate)) string {`
`30`	`30`	`t.Helper()`
`31`	`31`
`32`	`32`	`name, err := createNetwork(ctx, client, name, ops...)`