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.

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

Already on GitHub? Sign in to your account

Add support for `--type=secret` in `docker inspect` #32124

Merged
merged 1 commit into from Mar 30, 2017

Conversation

@vdemeester
Copy link
Member

vdemeester commented Mar 27, 2017

Taking into account @allencloud, add support for docker inspect --type=secret because, why not 馃懠.

/cc @icecrime :trollface: @thaJeztah @cpuguy83 @AkihiroSuda @dnephin @tiborvass @vieux

馃

Signed-off-by: Vincent Demeester vincent@sbr.pm

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 27, 2017

design LGTM

@@ -144,6 +149,10 @@ func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool,
objectType: "plugin",
objectInspector: inspectPlugin(ctx, dockerCli),
},
{
objectType: "secret",
objectInspector: inspectSecret(ctx, dockerCli),

This comment has been minimized.

Copy link
@thaJeztah

thaJeztah Mar 27, 2017

Member
isSwarmObject: true,

This comment has been minimized.

Copy link
@vdemeester

vdemeester Mar 27, 2017

Author Member

@thaJeztah nice I missed that one 馃懠

@vdemeester vdemeester force-pushed the vdemeester:system-inspect-secret branch from eee4188 to 533511f Mar 27, 2017
@allencloud

This comment has been minimized.

Copy link
Contributor

allencloud commented Mar 27, 2017

That is great. Thanks a lot. @vdemeester
Eh... Please do not forget to update inspect.md under command docs directory. 馃槃

@vdemeester

This comment has been minimized.

Copy link
Member Author

vdemeester commented Mar 27, 2017

Eh... Please do not forget to update inspect.md under command docs directory. 馃槃

Right, I was waiting for it to pass design phase but.. it's already the case 馃槢

@ehazlett

This comment has been minimized.

Copy link
Contributor

ehazlett commented Mar 27, 2017

design lgtm

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 27, 2017

oh, when updating; perhaps you can also update the completion scripts 馃

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@vdemeester vdemeester force-pushed the vdemeester:system-inspect-secret branch from 533511f to 71129f6 Mar 28, 2017
@vdemeester

This comment has been minimized.

Copy link
Member Author

vdemeester commented Mar 28, 2017

@thaJeztah completions scripts updated (cc @sdurrheimer @albers)

Copy link
Member

thaJeztah left a comment

code LGTM, but needs updates to the documentation as mentioned above 馃槃

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 28, 2017

docs is being taken care of in #32112

@albers

This comment has been minimized.

Copy link
Member

albers commented Mar 28, 2017

Bash completion tested locally, perfect!

@ehazlett

This comment has been minimized.

Copy link
Contributor

ehazlett commented Mar 30, 2017

LGTM

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Mar 30, 2017

pssst @ehazlett; looks like it can be moved to status/4-merge 馃槆

@vdemeester vdemeester merged commit ee61f28 into moby:master Mar 30, 2017
6 checks passed
6 checks passed
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 32182 has succeeded
Details
janky Jenkins build Docker-PRs 40794 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 956 has succeeded
Details
windowsRS1 Jenkins build Docker-PRs-WoW-RS1 11995 has succeeded
Details
z Jenkins build Docker-PRs-s390x 787 has succeeded
Details
@vdemeester vdemeester deleted the vdemeester:system-inspect-secret branch Mar 30, 2017
@@ -2713,6 +2713,8 @@ __docker_subcommand() {
__docker_complete_nodes && ret=0
elif [[ ${words[(r)--type=plugin]} == --type=plugin ]]; then
__docker_complete_plugins && ret=0
elif [[ ${words[(r)--type=service]} == --type=secrets ]]; then

This comment has been minimized.

Copy link
@sdurrheimer

sdurrheimer Mar 30, 2017

Contributor

Sorry for looking at this too late, should be elif [[ ${words[(r)--type=secrets]} not elif [[ ${words[(r)--type=service]}

This comment has been minimized.

Copy link
@vdemeester

vdemeester Mar 30, 2017

Author Member

oh shit, my bad I missed one 馃槺 I'll fix 馃懠

This comment has been minimized.

Copy link
@thaJeztah

thaJeztah Mar 30, 2017

Member

Oh, thanks of the catch; can you open a pull request to fix that, or want someone else to do that?

dnephin pushed a commit to dnephin/docker that referenced this pull request Apr 17, 2017
Add support for `--type=secret` in `docker inspect`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
7 participants
You can鈥檛 perform that action at this time.