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.

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

Include whether the managers in the swarm are autolocked as part of `docker info` #471

Merged
merged 1 commit into from Aug 28, 2017

Conversation

Projects
None yet
6 participants
@cyli
Contributor

cyli commented Aug 24, 2017

Currently, the only way to tell if the cluster is autolocked is to attempt to unlock or get the unlock key. The info is already available on the API for docker info, so also include it in the text output on the CLI.

cc @friism

image

@codecov-io

This comment has been minimized.

Show comment
Hide comment
@codecov-io

codecov-io Aug 24, 2017

Codecov Report

Merging #471 into master will increase coverage by 1.14%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #471      +/-   ##
==========================================
+ Coverage   47.39%   48.54%   +1.14%     
==========================================
  Files         199      199              
  Lines       16405    16410       +5     
==========================================
+ Hits         7775     7966     +191     
+ Misses       8233     8030     -203     
- Partials      397      414      +17

codecov-io commented Aug 24, 2017

Codecov Report

Merging #471 into master will increase coverage by 1.14%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master     #471      +/-   ##
==========================================
+ Coverage   47.39%   48.54%   +1.14%     
==========================================
  Files         199      199              
  Lines       16405    16410       +5     
==========================================
+ Hits         7775     7966     +191     
+ Misses       8233     8030     -203     
- Partials      397      414      +17
@dnephin

Thanks! If the data is already in Info then I think it does make sense to print it.

A few comments about the tests to make them more readable and consistent with our existing tests.

Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info_test.go Outdated
Show outdated Hide outdated cli/command/system/info.go Outdated
Include whether the managers in the swarm are autolocked as part of `…
…docker info`.

Signed-off-by: Ying Li <ying.li@docker.com>
@cyli

This comment has been minimized.

Show comment
Hide comment
@cyli

cyli Aug 25, 2017

Contributor

Thanks for the review @dnephin! I think I've addressed all the comments, and added a test for the warnings since the golden testdata files makes that way easier.

Contributor

cyli commented Aug 25, 2017

Thanks for the review @dnephin! I think I've addressed all the comments, and added a test for the warnings since the golden testdata files makes that way easier.

@dnephin

LGTM!

@dnephin dnephin requested review from vdemeester and vieux Aug 28, 2017

@vdemeester

LGTM 🐮

@vdemeester vdemeester merged commit 7e52344 into docker:master Aug 28, 2017

9 checks passed

ci/circleci: cross Your tests passed on CircleCI!
Details
ci/circleci: lint Your tests passed on CircleCI!
Details
ci/circleci: shellcheck Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
ci/circleci: validate Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 50%)
Details
codecov/project 48.54% (+1.14%) compared to 21b5bbe
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
dco-signed All commits are signed

@GordonTheTurtle GordonTheTurtle added this to the 17.08.0 milestone Aug 28, 2017

@cyli cyli deleted the cyli:surface-autolock branch Aug 28, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment