Merge pull request #4343 from thaJeztah/cleanup_sprintf

replace some basic uses of fmt.Sprintf(), and minor refactor

cli/command/config/formatter.go

@@ -103,7 +103,7 @@ func (c *configContext) Labels() string {
 	}
 	var joinLabels []string
 	for k, v := range mapLabels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
+		joinLabels = append(joinLabels, k+"="+v)
 	}
 	return strings.Join(joinLabels, ",")
 }

cli/command/container/create.go

@@ -91,7 +91,7 @@ func runCreate(dockerCli command.Cli, flags *pflag.FlagSet, options *createOptio
 		if v == nil {
 			newEnv = append(newEnv, k)
 		} else {
-			newEnv = append(newEnv, fmt.Sprintf("%s=%s", k, *v))
+			newEnv = append(newEnv, k+"="+*v)
 		}
 	}
 	copts.env = *opts.NewListOptsRef(&newEnv, nil)

cli/command/container/run.go

@@ -101,7 +101,7 @@ func runRun(dockerCli command.Cli, flags *pflag.FlagSet, ropts *runOptions, copt
 		if v == nil {
 			newEnv = append(newEnv, k)
 		} else {
-			newEnv = append(newEnv, fmt.Sprintf("%s=%s", k, *v))
+			newEnv = append(newEnv, k+"="+*v)
 		}
 	}
 	copts.env = *opts.NewListOptsRef(&newEnv, nil)

cli/command/formatter/container.go

@@ -247,7 +247,7 @@ func (c *ContainerContext) Labels() string {
 
 	var joinLabels []string
 	for k, v := range c.c.Labels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
+		joinLabels = append(joinLabels, k+"="+v)
 	}
 	return strings.Join(joinLabels, ",")
 }

cli/command/network/formatter.go

@@ -103,7 +103,7 @@ func (c *networkContext) Labels() string {
 
 	var joinLabels []string
 	for k, v := range c.n.Labels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
+		joinLabels = append(joinLabels, k+"="+v)
 	}
 	return strings.Join(joinLabels, ",")
 }

cli/command/secret/formatter.go

@@ -110,7 +110,7 @@ func (c *secretContext) Labels() string {
 	}
 	var joinLabels []string
 	for k, v := range mapLabels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
+		joinLabels = append(joinLabels, k+"="+v)
 	}
 	return strings.Join(joinLabels, ",")
 }

cli/command/system/events.go

@@ -133,7 +133,7 @@ func prettyPrintEvent(out io.Writer, event eventtypes.Message) error {
 		sort.Strings(keys)
 		for _, k := range keys {
 			v := event.Actor.Attributes[k]
-			attrs = append(attrs, fmt.Sprintf("%s=%s", k, v))
+			attrs = append(attrs, k+"="+v)
 		}
 		fmt.Fprintf(out, " (%s)", strings.Join(attrs, ", "))
 	}

cli/compose/convert/service.go

@@ -1,7 +1,6 @@
 package convert
 
 import (
-	"fmt"
 	"os"
 	"sort"
 	"strings"
@@ -134,7 +133,7 @@ func Service(
 				Hosts:           convertExtraHosts(service.ExtraHosts),
 				DNSConfig:       dnsConfig,
 				Healthcheck:     healthcheck,
-				Env:             sortStrings(convertEnvironment(service.Environment)),
+				Env:             convertEnvironment(service.Environment),
 				Labels:          AddStackLabel(namespace, service.Labels),
 				Dir:             service.WorkingDir,
 				User:            service.User,
@@ -200,11 +199,6 @@ func getPlacementPreference(preferences []composetypes.PlacementPreferences) []s
 	return result
 }
 
-func sortStrings(strs []string) []string {
-	sort.Strings(strs)
-	return strs
-}
-
 func convertServiceNetworks(
 	networks map[string]*composetypes.ServiceNetworkConfig,
 	networkConfigs networkMap,
@@ -597,6 +591,8 @@ func convertEndpointSpec(endpointMode string, source []composetypes.ServicePortC
 	}
 }
 
+// convertEnvironment converts key/value mappings to a slice, and sorts
+// the results.
 func convertEnvironment(source map[string]*string) []string {
 	var output []string
 
@@ -605,10 +601,10 @@ func convertEnvironment(source map[string]*string) []string {
 		case nil:
 			output = append(output, name)
 		default:
-			output = append(output, fmt.Sprintf("%s=%s", name, *value))
+			output = append(output, name+"="+*value)
 		}
 	}
-
+	sort.Strings(output)
 	return output
 }
 

cli/compose/convert/service_test.go

@@ -3,7 +3,6 @@ package convert
 import (
 	"context"
 	"os"
-	"sort"
 	"strings"
 	"testing"
 	"time"
@@ -59,7 +58,6 @@ func TestConvertEnvironment(t *testing.T) {
 		"key": strPtr("value"),
 	}
 	env := convertEnvironment(source)
-	sort.Strings(env)
 	assert.Check(t, is.DeepEqual([]string{"foo=bar", "key=value"}, env))
 }