diff --git a/.golangci.yml b/.golangci.yml index 82680200fe..049ed9c113 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -146,8 +146,6 @@ linters: - regexpSimplify - singleCaseSwitch - sloppyReassign - - stringsCompare - - stringConcatSimplify - stringXbytes - typeAssertChain - typeDefFirst diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go index 5639d7d3d2..b05d8e30ca 100644 --- a/daemon/cluster/executor/container/container.go +++ b/daemon/cluster/executor/container/container.go @@ -254,7 +254,7 @@ func (c *containerConfig) labels() map[string]string { // finally, we apply the system labels, which override all labels. for k, v := range system { - labels[strings.Join([]string{systemLabelPrefix, k}, ".")] = v + labels[systemLabelPrefix+"."+k] = v } return labels diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go index e03ad4df4d..86a740f566 100644 --- a/integration-cli/docker_api_images_test.go +++ b/integration-cli/docker_api_images_test.go @@ -105,7 +105,7 @@ func (s *DockerAPISuite) TestAPIImagesImportBadSrc(c *testing.T) { ctx := testutil.GetContext(c) for _, te := range tt { - res, _, err := request.Post(ctx, strings.Join([]string{"/images/create?fromSrc=", te.fromSrc}, ""), request.JSON) + res, _, err := request.Post(ctx, "/images/create?fromSrc="+te.fromSrc, request.JSON) assert.NilError(c, err) assert.Equal(c, res.StatusCode, te.statusExp) assert.Equal(c, res.Header.Get("Content-Type"), "application/json") diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index e26de3de57..356df06aa1 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -1679,7 +1679,7 @@ func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *testing.T) if err != nil { t.Fatal(err) } - if strings.Compare(strings.TrimSpace(oldContainerIP), strings.TrimSpace(newContainerIP)) == 0 { + if strings.TrimSpace(oldContainerIP) == strings.TrimSpace(newContainerIP) { t.Fatalf("new container ip should not equal to old running container ip") } diff --git a/libnetwork/cmd/diagnostic/main.go b/libnetwork/cmd/diagnostic/main.go index fc70976c7f..c2c186bf9e 100644 --- a/libnetwork/cmd/diagnostic/main.go +++ b/libnetwork/cmd/diagnostic/main.go @@ -193,7 +193,7 @@ func fetchTable(ip string, port int, network, tableName string, clusterPeers, ne reader := bufio.NewReader(os.Stdin) text, _ := reader.ReadString('\n') text = strings.ReplaceAll(text, "\n", "") - if strings.Compare(text, "Yes") == 0 { + if text == "Yes" { for _, k := range orphanKeys { r, err := http.Get(fmt.Sprintf(deleteEntry, ip, port, network, tableName, k)) if err != nil {