chore: enable revive's conditions nesting related rules

Signed-off-by: Matthieu MOREL <[email protected]>

Author: mmorel-35

.golangci.yml

@@ -123,11 +123,21 @@ linters:
 
     revive:
       rules:
+        - name: early-return      # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#early-return
+          arguments:
+            - preserveScope
         - name: empty-block       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#empty-block
         - name: empty-lines       # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#empty-lines
+        - name: if-return         # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#if-return
         - name: import-shadowing  # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#import-shadowing
+        - name: indent-error-flow # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#indent-error-flow
+          arguments:
+            - preserveScope
         - name: line-length-limit # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#line-length-limit
           arguments: [200]
+        - name: superfluous-else # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#superfluous-else
+          arguments:
+            - preserveScope
         - name: unused-receiver   # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#unused-receiver
         - name: use-any           # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md#use-any
 
@@ -137,21 +147,22 @@ linters:
       context-todo: false       # FIXME(thaJeztah): Disable `context.TODO()` detections; should be automatically disabled on Go < 1.24; see https://github.com/docker/cli/pull/5835#issuecomment-2665302478
 
   exclusions:
-    # We prefer to use an "linters.exclusions.rules" so that new "default" exclusions are not
-    # automatically inherited. We can decide whether or not to follow upstream
-    # defaults when updating golang-ci-lint versions.
-    # Unfortunately, this means we have to copy the whole exclusion pattern, as
-    # (unlike the "include" option), the "exclude" option does not take exclusion
-    # ID's.
-    #
-    # These exclusion patterns are copied from the default excluses at:
-    # https://github.com/golangci/golangci-lint/blob/v1.44.0/pkg/config/issues.go#L10-L104
-    #
-    # The default list of exclusions can be found at:
-    # https://golangci-lint.run/usage/false-positives/#default-exclusions
     generated: strict
 
     rules:
+        # We prefer to use an "linters.exclusions.rules" so that new "default" exclusions are not
+        # automatically inherited. We can decide whether or not to follow upstream
+        # defaults when updating golang-ci-lint versions.
+        # Unfortunately, this means we have to copy the whole exclusion pattern, as
+        # (unlike the "include" option), the "exclude" option does not take exclusion
+        # ID's.
+        #
+        # These exclusion patterns are copied from the default excluses at:
+        # https://github.com/golangci/golangci-lint/blob/v1.44.0/pkg/config/issues.go#L10-L104
+        #
+        # The default list of exclusions can be found at:
+        # https://golangci-lint.run/usage/false-positives/#default-exclusions
+
         # EXC0003
       - text: "func name will be used as test\\.Test.* by other packages, and that stutters; consider calling this"
         linters:

cli/command/container/create.go

@@ -342,24 +342,23 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *c
 	response, err := dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, platform, options.name)
 	if err != nil {
 		// Pull image if it does not exist locally and we have the PullImageMissing option. Default behavior.
-		if errdefs.IsNotFound(err) && namedRef != nil && options.pull == PullImageMissing {
-			if !options.quiet {
-				// we don't want to write to stdout anything apart from container.ID
-				_, _ = fmt.Fprintf(dockerCli.Err(), "Unable to find image '%s' locally\n", reference.FamiliarString(namedRef))
-			}
-
-			if err := pullAndTagImage(); err != nil {
-				return "", err
-			}
+		if !errdefs.IsNotFound(err) || namedRef == nil || options.pull != PullImageMissing {
+			return "", err
+		}
+		if !options.quiet {
+			// we don't want to write to stdout anything apart from container.ID
+			_, _ = fmt.Fprintf(dockerCli.Err(), "Unable to find image '%s' locally\n", reference.FamiliarString(namedRef))
+		}
 
-			var retryErr error
-			response, retryErr = dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, platform, options.name)
-			if retryErr != nil {
-				return "", retryErr
-			}
-		} else {
+		if err := pullAndTagImage(); err != nil {
 			return "", err
 		}
+
+		var retryErr error
+		response, retryErr = dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, platform, options.name)
+		if retryErr != nil {
+			return "", retryErr
+		}
 	}
 
 	if warn := localhostDNSWarning(*hostConfig); warn != "" {

cli/command/formatter/container.go

@@ -167,16 +167,16 @@ func (c *ContainerContext) Image() string {
 		// truncate digest if no-trunc option was not selected
 		ref, err := reference.ParseNormalizedNamed(c.c.Image)
 		if err == nil {
-			if nt, ok := ref.(reference.NamedTagged); ok {
-				// case for when a tag is provided
-				if namedTagged, err := reference.WithTag(reference.TrimNamed(nt), nt.Tag()); err == nil {
-					return reference.FamiliarString(namedTagged)
-				}
-			} else {
+			nt, ok := ref.(reference.NamedTagged)
+			if !ok {
 				// case for when a tag is not provided
 				named := reference.TrimNamed(ref)
 				return reference.FamiliarString(named)
 			}
+			// case for when a tag is provided
+			if namedTagged, err := reference.WithTag(reference.TrimNamed(nt), nt.Tag()); err == nil {
+				return reference.FamiliarString(namedTagged)
+			}
 		}
 	}
 

cli/command/formatter/tabwriter/tabwriter_test.go

@@ -23,14 +23,13 @@ func (b *buffer) clear() { b.a = b.a[0:0] }
 func (b *buffer) Write(buf []byte) (written int, err error) {
 	n := len(b.a)
 	m := len(buf)
-	if n+m <= cap(b.a) {
-		b.a = b.a[0 : n+m]
-		for i := 0; i < m; i++ {
-			b.a[n+i] = buf[i]
-		}
-	} else {
+	if n+m > cap(b.a) {
 		panic("buffer.Write: buffer too small")
 	}
+	b.a = b.a[0 : n+m]
+	for i := 0; i < m; i++ {
+		b.a[n+i] = buf[i]
+	}
 	return len(buf), nil
 }
 

cli/command/swarm/opts.go

@@ -184,11 +184,10 @@ func parseExternalCA(caSpec string) (*swarm.ExternalCA, error) {
 		switch strings.ToLower(key) {
 		case "protocol":
 			hasProtocol = true
-			if strings.ToLower(value) == string(swarm.ExternalCAProtocolCFSSL) {
-				externalCA.Protocol = swarm.ExternalCAProtocolCFSSL
-			} else {
+			if strings.ToLower(value) != string(swarm.ExternalCAProtocolCFSSL) {
 				return nil, errors.Errorf("unrecognized external CA protocol %s", value)
 			}
+			externalCA.Protocol = swarm.ExternalCAProtocolCFSSL
 		case "url":
 			hasURL = true
 			externalCA.URL = value