Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1204 from thaJeztah/improve-version-align 

Improve version output alignment
This commit is contained in:
Silvin 2018-07-12 10:53:50 +02:00 committed by GitHub
parent c8b9c21ef9 0f7ae34ea9
commit ee8cdb3850
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 103 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cli/command/system/testdata/docker-client-version.golden vendored
View File

@ -6,3 +6,39 @@ Client:
Built: Wed May 30 22:21:05 2018
OS/Arch: linux/amd64
Experimental: true
Server: Docker Enterprise Edition (EE) 2.0
Engine:
Version: 17.06.2-ee-15
API version: 1.30 (minimum version 1.12)
Go version: go1.8.7
Git commit: 64ddfa6
Built: Mon Jul 9 23:38:38 2018
OS/Arch: linux/amd64
Experimental: false
Universal Control Plane:
Version: 17.06.2-ee-15
ApiVersion: 1.30
Arch: amd64
BuildTime: Mon Jul 2 21:24:07 UTC 2018
GitCommit: 4513922
GoVersion: go1.9.4
MinApiVersion: 1.20
Os: linux
Version: 3.0.3-tp2
Kubernetes:
Version: 1.8+
buildDate: 2018-04-26T16:51:21Z
compiler: gc
gitCommit: 8d637aedf46b9c21dde723e29c645b9f27106fa5
gitTreeState: clean
gitVersion: v1.8.11-docker-8d637ae
goVersion: go1.8.3
major: 1
minor: 8+
platform: linux/amd64
Calico:
Version: v3.0.8
cni: v2.0.6
kube-controllers: v2.0.5
node: v3.0.8

2
cli/command/system/version.go
View File

@ -204,7 +204,7 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
}
func prettyPrintVersion(dockerCli command.Cli, vd versionInfo, tmpl *template.Template) error {
t := tabwriter.NewWriter(dockerCli.Out(), 15, 1, 1, ' ', 0)
t := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 1, ' ', 0)
err := tmpl.Execute(t, vd)
t.Write([]byte("\n"))
t.Flush()

59
cli/command/system/version_test.go
View File

@ -43,8 +43,67 @@ func TestVersionAlign(t *testing.T) {
BuildTime: "Wed May 30 22:21:05 2018",
Experimental: true,
},
Server: &types.Version{},
}
vi.Server.Platform.Name = "Docker Enterprise Edition (EE) 2.0"
vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
Name: "Engine",
Version: "17.06.2-ee-15",
Details: map[string]string{
"ApiVersion": "1.30",
"MinAPIVersion": "1.12",
"GitCommit": "64ddfa6",
"GoVersion": "go1.8.7",
"Os": "linux",
"Arch": "amd64",
"BuildTime": "Mon Jul 9 23:38:38 2018",
"Experimental": "false",
},
})
vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
Name: "Universal Control Plane",
Version: "17.06.2-ee-15",
Details: map[string]string{
"Version": "3.0.3-tp2",
"ApiVersion": "1.30",
"Arch": "amd64",
"BuildTime": "Mon Jul 2 21:24:07 UTC 2018",
"GitCommit": "4513922",
"GoVersion": "go1.9.4",
"MinApiVersion": "1.20",
"Os": "linux",
},
})
vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
Name: "Kubernetes",
Version: "1.8+",
Details: map[string]string{
"buildDate": "2018-04-26T16:51:21Z",
"compiler": "gc",
"gitCommit": "8d637aedf46b9c21dde723e29c645b9f27106fa5",
"gitTreeState": "clean",
"gitVersion": "v1.8.11-docker-8d637ae",
"goVersion": "go1.8.3",
"major": "1",
"minor": "8+",
"platform": "linux/amd64",
},
})
vi.Server.Components = append(vi.Server.Components, types.ComponentVersion{
Name: "Calico",
Version: "v3.0.8",
Details: map[string]string{
"cni": "v2.0.6",
"kube-controllers": "v2.0.5",
"node": "v3.0.8",
},
})
cli := test.NewFakeCli(&fakeClient{})
tmpl, err := newVersionTemplate("")
assert.NilError(t, err)