Skip to content

Commit c30a55f

Browse files
author
Antonio Murdaca
committed
Refactor utils/utils, fixes #11923
Signed-off-by: Antonio Murdaca <[email protected]>
1 parent 7ecf4e5 commit c30a55f

46 files changed

Lines changed: 530 additions & 427 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/client/attach.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/docker/docker/engine"
1010
flag "github.com/docker/docker/pkg/mflag"
1111
"github.com/docker/docker/pkg/signal"
12-
"github.com/docker/docker/utils"
1312
)
1413

1514
// CmdAttach attaches to a running container.
@@ -81,7 +80,7 @@ func (cli *DockerCli) CmdAttach(args ...string) error {
8180
return err
8281
}
8382
if status != 0 {
84-
return &utils.StatusError{StatusCode: status}
83+
return &StatusError{StatusCode: status}
8584
}
8685

8786
return nil

‎api/client/build.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func (cli *DockerCli) CmdBuild(args ...string) error {
302302
if jerr.Code == 0 {
303303
jerr.Code = 1
304304
}
305-
return &utils.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
305+
return &StatusError{Status: jerr.Message, StatusCode: jerr.Code}
306306
}
307307
return err
308308
}

‎api/client/client.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,15 @@
33
// Run "docker help SUBCOMMAND" or "docker SUBCOMMAND --help" to see more information on any Docker subcommand, including the full list of options supported for the subcommand.
44
// See https://docs.docker.com/installation/ for instructions on installing Docker.
55
package client
6+
7+
import "fmt"
8+
9+
// An StatusError reports an unsuccessful exit by a command.
10+
type StatusError struct {
11+
Status string
12+
StatusCode int
13+
}
14+
15+
func (e *StatusError) Error() string {
16+
return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
17+
}

‎api/client/exec.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/docker/docker/api/types"
1010
"github.com/docker/docker/pkg/promise"
1111
"github.com/docker/docker/runconfig"
12-
"github.com/docker/docker/utils"
1312
)
1413

1514
// CmdExec runs a command in a running container.
@@ -21,7 +20,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
2120
execConfig, err := runconfig.ParseExec(cmd, args)
2221
// just in case the ParseExec does not exit
2322
if execConfig.Container == "" || err != nil {
24-
return &utils.StatusError{StatusCode: 1}
23+
return &StatusError{StatusCode: 1}
2524
}
2625

2726
stream, _, err := cli.call("POST", "/containers/"+execConfig.Container+"/exec", execConfig, nil)
@@ -122,7 +121,7 @@ func (cli *DockerCli) CmdExec(args ...string) error {
122121
}
123122

124123
if status != 0 {
125-
return &utils.StatusError{StatusCode: status}
124+
return &StatusError{StatusCode: status}
126125
}
127126

128127
return nil

‎api/client/history.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"github.com/docker/docker/api/types"
1010
flag "github.com/docker/docker/pkg/mflag"
1111
"github.com/docker/docker/pkg/stringid"
12+
"github.com/docker/docker/pkg/stringutils"
1213
"github.com/docker/docker/pkg/units"
13-
"github.com/docker/docker/utils"
1414
)
1515

1616
// CmdHistory shows the history of an image.
@@ -51,7 +51,7 @@ func (cli *DockerCli) CmdHistory(args ...string) error {
5151
if *noTrunc {
5252
fmt.Fprintf(w, "%s\t", entry.CreatedBy)
5353
} else {
54-
fmt.Fprintf(w, "%s\t", utils.Trunc(entry.CreatedBy, 45))
54+
fmt.Fprintf(w, "%s\t", stringutils.Truncate(entry.CreatedBy, 45))
5555
}
5656
fmt.Fprintf(w, "%s\t", units.HumanSize(float64(entry.Size)))
5757
fmt.Fprintf(w, "%s", entry.Comment)

‎api/client/inspect.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"text/template"
1010

1111
flag "github.com/docker/docker/pkg/mflag"
12-
"github.com/docker/docker/utils"
1312
)
1413

1514
// CmdInspect displays low-level information on one or more containers or images.
@@ -27,7 +26,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
2726
var err error
2827
if tmpl, err = template.New("").Funcs(funcMap).Parse(*tmplStr); err != nil {
2928
fmt.Fprintf(cli.err, "Template parsing error: %v\n", err)
30-
return &utils.StatusError{StatusCode: 64,
29+
return &StatusError{StatusCode: 64,
3130
Status: "Template parsing error: " + err.Error()}
3231
}
3332
}
@@ -86,7 +85,7 @@ func (cli *DockerCli) CmdInspect(args ...string) error {
8685
}
8786

8887
if status != 0 {
89-
return &utils.StatusError{StatusCode: status}
88+
return &StatusError{StatusCode: status}
9089
}
9190
return nil
9291
}

‎api/client/ps.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
flag "github.com/docker/docker/pkg/mflag"
1616
"github.com/docker/docker/pkg/parsers/filters"
1717
"github.com/docker/docker/pkg/stringid"
18+
"github.com/docker/docker/pkg/stringutils"
1819
"github.com/docker/docker/pkg/units"
19-
"github.com/docker/docker/utils"
2020
)
2121

2222
// CmdPs outputs a list of Docker containers.
@@ -135,7 +135,7 @@ func (cli *DockerCli) CmdPs(args ...string) error {
135135
)
136136

137137
if !*noTrunc {
138-
command = utils.Trunc(command, 20)
138+
command = stringutils.Truncate(command, 20)
139139

140140
// only display the default name for the container with notrunc is passed
141141
for _, name := range names {

‎api/client/run.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"github.com/docker/docker/pkg/resolvconf"
1313
"github.com/docker/docker/pkg/signal"
1414
"github.com/docker/docker/runconfig"
15-
"github.com/docker/docker/utils"
1615
)
1716

1817
func (cid *cidFile) Close() error {
@@ -242,7 +241,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
242241
}
243242
}
244243
if status != 0 {
245-
return &utils.StatusError{StatusCode: status}
244+
return &StatusError{StatusCode: status}
246245
}
247246
return nil
248247
}

‎api/client/search.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
flag "github.com/docker/docker/pkg/mflag"
1212
"github.com/docker/docker/pkg/parsers"
13+
"github.com/docker/docker/pkg/stringutils"
1314
"github.com/docker/docker/registry"
14-
"github.com/docker/docker/utils"
1515
)
1616

1717
type ByStars []registry.SearchResult
@@ -68,7 +68,7 @@ func (cli *DockerCli) CmdSearch(args ...string) error {
6868
desc := strings.Replace(res.Description, "\n", " ", -1)
6969
desc = strings.Replace(desc, "\r", " ", -1)
7070
if !*noTrunc && len(desc) > 45 {
71-
desc = utils.Trunc(desc, 42) + "..."
71+
desc = stringutils.Truncate(desc, 42) + "..."
7272
}
7373
fmt.Fprintf(w, "%s\t%s\t%d\t", res.Name, desc, res.StarCount)
7474
if res.IsOfficial {

‎api/client/start.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
flag "github.com/docker/docker/pkg/mflag"
1212
"github.com/docker/docker/pkg/promise"
1313
"github.com/docker/docker/pkg/signal"
14-
"github.com/docker/docker/utils"
1514
)
1615

1716
func (cli *DockerCli) forwardAllSignals(cid string) chan os.Signal {
@@ -156,7 +155,7 @@ func (cli *DockerCli) CmdStart(args ...string) error {
156155
return err
157156
}
158157
if status != 0 {
159-
return &utils.StatusError{StatusCode: status}
158+
return &StatusError{StatusCode: status}
160159
}
161160
}
162161
return nil

0 commit comments

Comments
 (0)