1berry/docker-cli
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #207 from cyli/warn-swarm-ca-command

Browse Source 
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
This commit is contained in:
Sebastiaan van Stijn 2017-06-26 20:56:54 -07:00 committed by GitHub
commit cfff0e2259
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/command/swarm/ca.go
View File

@ -61,6 +61,11 @@ func runRotateCA(dockerCli command.Cli, flags *pflag.FlagSet, opts caOptions) er
} }
if !opts.rotate { if !opts.rotate {
for _, f := range []string{flagCACert, flagCAKey, flagCACert, flagExternalCA} {
if flags.Changed(f) {
return fmt.Errorf("`--%s` flag requires the `--rotate` flag to update the CA", f)
}
}
if swarmInspect.ClusterInfo.TLSInfo.TrustRoot == "" { if swarmInspect.ClusterInfo.TLSInfo.TrustRoot == "" {
fmt.Fprintln(dockerCli.Out(), "No CA information available") fmt.Fprintln(dockerCli.Out(), "No CA information available")
} else { } else {
@ -71,7 +76,7 @@ func runRotateCA(dockerCli command.Cli, flags *pflag.FlagSet, opts caOptions) er
genRootCA := true genRootCA := true
spec := &swarmInspect.Spec spec := &swarmInspect.Spec
opts.mergeSwarmSpec(spec, flags) opts.mergeSwarmSpec(spec, flags) // updates the spec given the cert expiry or external CA flag
if flags.Changed(flagCACert) { if flags.Changed(flagCACert) {
spec.CAConfig.SigningCACert = opts.rootCACert.Contents() spec.CAConfig.SigningCACert = opts.rootCACert.Contents()
genRootCA = false genRootCA = false