Enable dupword linter

mxpv · thaJeztah · commit 9cbea6fe783f · 2023-03-08T00:29:25.000+01:00
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com> (cherry picked from commit 06bfcd6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/.golangci.yml b/.golangci.yml
@@ -13,6 +13,7 @@ linters:
     - unconvert
     - unused
     - vet
+    - dupword # Checks for duplicate words in the source code
   disable:
     - errcheck
 
@@ -27,7 +28,7 @@ linters-settings:
     # The following issues surfaced when `gosec` linter
     # was enabled. They are temporarily excluded to unblock
     # the existing workflow, but still to be addressed by
-    # by future works.
+    # future works.
     excludes:
       - G204
       - G305
diff --git a/cmd/containerd-stress/density.go b/cmd/containerd-stress/density.go
@@ -198,6 +198,7 @@ type Stat struct {
 }
 
 func parseStat(data string) (stat Stat, err error) {
+	//nolint:dupword
 	// From proc(5), field 2 could contain space and is inside `(` and `)`.
 	// The following is an example:
 	// 89653 (gunicorn: maste) S 89630 89653 89653 0 -1 4194560 29689 28896 0 3 146 32 76 19 20 0 1 0 2971844 52965376 3920 18446744073709551615 1 1 0 0 0 0 0 16781312 137447943 0 0 0 17 1 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/cmd/containerd/command/main.go b/cmd/containerd/command/main.go
@@ -187,7 +187,7 @@ can be used and modified as necessary as a custom configuration.`
 		// run server initialization in a goroutine so we don't end up blocking important things like SIGTERM handling
 		// while the server is initializing.
 		// As an example opening the bolt database will block forever if another containerd is already running and containerd
-		// will have to be be `kill -9`'ed to recover.
+		// will have to be `kill -9`'ed to recover.
 		chsrv := make(chan srvResp)
 		go func() {
 			defer close(chsrv)
diff --git a/content/local/store.go b/content/local/store.go
@@ -505,6 +505,7 @@ func (s *store) resumeStatus(ref string, total int64, digester digest.Digester)
 		return status, fmt.Errorf("provided total differs from status: %v != %v", total, status.Total)
 	}
 
+	//nolint:dupword
 	// TODO(stevvooe): slow slow slow!!, send to goroutine or use resumable hashes
 	fp, err := os.Open(data)
 	if err != nil {
diff --git a/errdefs/grpc_test.go b/errdefs/grpc_test.go
@@ -42,6 +42,7 @@ func TestGRPCRoundTrip(t *testing.T) {
 			input: ErrNotFound,
 			cause: ErrNotFound,
 		},
+		//nolint:dupword
 		{
 			input: fmt.Errorf("test test test: %w", ErrFailedPrecondition),
 			cause: ErrFailedPrecondition,
diff --git a/images/converter/default.go b/images/converter/default.go
@@ -132,7 +132,7 @@ func copyDesc(desc ocispec.Descriptor) *ocispec.Descriptor {
 	return &descCopy
 }
 
-// convertLayer converts image image layers if c.layerConvertFunc is set.
+// convertLayer converts image layers if c.layerConvertFunc is set.
 //
 // c.layerConvertFunc can be nil, e.g., for converting Docker media types to OCI ones.
 func (c *defaultConverter) convertLayer(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (*ocispec.Descriptor, error) {
diff --git a/pkg/cap/cap_linux_test.go b/pkg/cap/cap_linux_test.go
@@ -89,6 +89,7 @@ func TestFromBitmap(t *testing.T) {
 }
 
 func TestParseProcPIDStatus(t *testing.T) {
+	//nolint:dupword
 	procPIDStatus := `Name:   cat
 Umask:  0022
 State:  R (running)
diff --git a/pkg/cri/server/instrumented_service.go b/pkg/cri/server/instrumented_service.go
@@ -1504,7 +1504,7 @@ func (in *instrumentedService) UpdateRuntimeConfig(ctx context.Context, r *runti
 		if err != nil {
 			log.G(ctx).WithError(err).Error("UpdateRuntimeConfig failed")
 		} else {
-			log.G(ctx).Debug("UpdateRuntimeConfig returns returns successfully")
+			log.G(ctx).Debug("UpdateRuntimeConfig returns successfully")
 		}
 	}()
 	res, err = in.c.UpdateRuntimeConfig(ctrdutil.WithNamespace(ctx), r)
@@ -1520,7 +1520,7 @@ func (in *instrumentedAlphaService) UpdateRuntimeConfig(ctx context.Context, r *
 		if err != nil {
 			log.G(ctx).WithError(err).Error("UpdateRuntimeConfig failed")
 		} else {
-			log.G(ctx).Debug("UpdateRuntimeConfig returns returns successfully")
+			log.G(ctx).Debug("UpdateRuntimeConfig returns successfully")
 		}
 	}()
 	// converts request and response for earlier CRI version to call and get response from the current version
diff --git a/reference/docker/reference.go b/reference/docker/reference.go
@@ -683,7 +683,7 @@ func splitDockerDomain(name string) (domain, remainder string) {
 }
 
 // familiarizeName returns a shortened version of the name familiar
-// to to the Docker UI. Familiar names have the default domain
+// to the Docker UI. Familiar names have the default domain
 // "docker.io" and "library/" repository prefix removed.
 // For example, "docker.io/library/redis" will have the familiar
 // name "redis" and "docker.io/dmcgowan/myapp" will be "dmcgowan/myapp".

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,7 @@ type Stat struct {`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`func parseStat(data string) (stat Stat, err error) {`
	`201`	`+ //nolint:dupword`
`201`	`202`	// From proc(5), field 2 could contain space and is inside `(` and `)`.
`202`	`203`	`// The following is an example:`
`203`	`204`	`// 89653 (gunicorn: maste) S 89630 89653 89653 0 -1 4194560 29689 28896 0 3 146 32 76 19 20 0 1 0 2971844 52965376 3920 18446744073709551615 1 1 0 0 0 0 0 16781312 137447943 0 0 0 17 1 0 0 0 0 0 0 0 0 0 0 0 0 0`
Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,7 @@ func (s *store) resumeStatus(ref string, total int64, digester digest.Digester)`
`505`	`505`	`return status, fmt.Errorf("provided total differs from status: %v != %v", total, status.Total)`
`506`	`506`	`}`
`507`	`507`
	`508`	`+ //nolint:dupword`
`508`	`509`	`// TODO(stevvooe): slow slow slow!!, send to goroutine or use resumable hashes`
`509`	`510`	`fp, err := os.Open(data)`
`510`	`511`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ func TestGRPCRoundTrip(t *testing.T) {`
`42`	`42`	`input: ErrNotFound,`
`43`	`43`	`cause: ErrNotFound,`
`44`	`44`	`},`
	`45`	`+ //nolint:dupword`
`45`	`46`	`{`
`46`	`47`	`input: fmt.Errorf("test test test: %w", ErrFailedPrecondition),`
`47`	`48`	`cause: ErrFailedPrecondition,`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ func copyDesc(desc ocispec.Descriptor) *ocispec.Descriptor {`
`132`	`132`	`return &descCopy`
`133`	`133`	`}`
`134`	`134`
`135`		`-// convertLayer converts image image layers if c.layerConvertFunc is set.`
	`135`	`+// convertLayer converts image layers if c.layerConvertFunc is set.`
`136`	`136`	`//`
`137`	`137`	`// c.layerConvertFunc can be nil, e.g., for converting Docker media types to OCI ones.`
`138`	`138`	`func (c defaultConverter) convertLayer(ctx context.Context, cs content.Store, desc ocispec.Descriptor) (ocispec.Descriptor, error) {`
Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ func TestFromBitmap(t *testing.T) {`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`func TestParseProcPIDStatus(t *testing.T) {`
	`92`	`+ //nolint:dupword`
`92`	`93`	procPIDStatus := `Name: cat
`93`	`94`	`Umask: 0022`
`94`	`95`	`State: R (running)`
Original file line number	Diff line number	Diff line change
`@@ -683,7 +683,7 @@ func splitDockerDomain(name string) (domain, remainder string) {`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`// familiarizeName returns a shortened version of the name familiar`
`686`		`-// to to the Docker UI. Familiar names have the default domain`
	`686`	`+// to the Docker UI. Familiar names have the default domain`
`687`	`687`	`// "docker.io" and "library/" repository prefix removed.`
`688`	`688`	`// For example, "docker.io/library/redis" will have the familiar`
`689`	`689`	`// name "redis" and "docker.io/dmcgowan/myapp" will be "dmcgowan/myapp".`