Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve version output alignment #1204

Merged
merged 2 commits into from
Jul 12, 2018
Merged

Improve version output alignment #1204

merged 2 commits into from
Jul 12, 2018

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 11, 2018 •
edited

Add some extra fixture information and test, and increase the column-width to account for wide names in component output;

Before this change;

docker version

Client:
 Version:      18.99.5-ce
 API version:  1.38
 Go version:   go1.10.2
 Git commit:   deadbeef
 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

With this change applied:

docker version

Client:
 Version:           18.99.5-ce
 API version:       1.38
 Go version:        go1.10.2
 Git commit:        deadbeef
 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

@thaJeztah
Extend version-align test with components
55ff66d 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Adapt min-column width to component information
0f7ae34 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah changed the title [wip] Improve version output alignment Improve version output alignment Jul 11, 2018
vdemeester
vdemeester approved these changes Jul 12, 2018
View reviewed changes
Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🐸

silvin-lubecki
silvin-lubecki reviewed Jul 12, 2018
View reviewed changes
cli/command/system/testdata/docker-client-version.golden
Version: 1.8+
buildDate: 2018-04-26T16:51:21Z
compiler: gc
gitCommit: 8d637aedf46b9c21dde723e29c645b9f27106fa5
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are those lowercase? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's more to improve there 😞 - I'll send you an internal issue

silvin-lubecki
silvin-lubecki approved these changes Jul 12, 2018
View reviewed changes
Copy link
Contributor

@silvin-lubecki silvin-lubecki left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@silvin-lubecki silvin-lubecki merged commit ee8cdb3 into docker:master Jul 12, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.07.0 milestone Jul 12, 2018
@thaJeztah thaJeztah deleted the improve-version-align branch July 12, 2018 09:13
@thaJeztah thaJeztah mentioned this pull request Jul 12, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

@silvin-lubecki silvin-lubecki silvin-lubecki approved these changes

Assignees
No one assigned
Labels
status/2-code-review
Projects
None yet
Milestone
18.09.0
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@thaJeztah @vdemeester @silvin-lubecki @GordonTheTurtle