Commit Graph

23 Commits

Author SHA1 Message Date
ac7952530f Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed,
and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 4615c92f66
Component: cli
2017-07-12 14:56:28 -07:00
d73fe10e9e Update some tests to remove unnecessary buffers.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 42a3800783
Component: cli
2017-07-11 17:52:43 -04:00
1e5fbb03aa Update FakeCli to remove duplication in tests.
Use byte buffers by default, since that is what is done most of the time.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 69b142b52a
Component: cli
2017-07-11 14:49:30 -04:00
05c34f9c1a Refactor caCommand
Split out a swarmCAOptions struct for options that are shared between
the ca and update commands.

Change the 'no trust root' message to an error.

Add some unit tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 81e9837859
Component: cli
2017-06-29 17:57:06 -04:00
f453764eee Merge pull request #207 from cyli/warn-swarm-ca-command
If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
Upstream-commit: cfff0e2259
Component: cli
2017-06-26 20:56:54 -07:00
8a5a7a8a1e If docker swarm ca is not called with the --rotate flag, the other
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 32b43bc21a
Component: cli
2017-06-20 18:55:10 -07:00
003a07af7c Add unparam linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3e3934c19f
Component: cli
2017-06-14 16:55:08 -07:00
c9b100a0be Add unconvert linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3bf0317fea
Component: cli
2017-06-14 16:54:27 -07:00
2cdc30d891 Add unused linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 01e1e58ada
Component: cli
2017-06-14 16:54:27 -07:00
d92c450866 Avoid loop when discarding contents of progress pipe
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 51f698337d
Component: cli
2017-05-16 14:34:59 -07:00
a87d4d281d Provide command line tool to view and rotate swarm's currently CA root certificate.
Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 3fe8321d0c
Component: cli
2017-05-16 14:31:15 -07:00
242da31a23 Update cli imports to using local package
Also, rename a bunch of variable to not *shadow* the `opts` package
name.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d7f6563efc
Component: cli
2017-05-15 14:45:19 +02:00
5a1580a2fc Add line length linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c31d25653f
Component: cli
2017-05-08 15:57:56 -04:00
edf78faba7 Add interfacer linter
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 37ccc00d0e
Component: cli
2017-05-08 15:57:50 -04:00
2ff5f1eac9 cli: gofmt + goimports
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
Upstream-commit: 295140edf2
Component: cli
2017-05-08 10:51:30 -07:00
82b8acb640 rm client and vendor it instead
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 57230a7212
Component: cli
2017-05-08 10:33:56 -07:00
056c564996 Inroduce SWARM --data-path-addr flag
This new flag will allow the configuration of an interface that
can be used for data path traffic to be isolated from control
plane traffic. This flag is simply percolated down to libnetwork
and will be used by all the global scope drivers (today overlay)

Negative test added for invalid flag arguments

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
Upstream-commit: 169160ba63
Component: cli
2017-05-03 18:45:48 -07:00
8f4c7f862a Add the CACert parameter to the ExternalCA object in order to match
swarmkit's API type.  Make sure this parameter gets propagated to
swarmkit, and also add an extra option to the CLI when providing
external CAs to parse the CA cert from a file.

Signed-off-by: Ying Li <ying.li@docker.com>
Upstream-commit: 81f87595fe
Component: cli
2017-05-03 18:45:48 -07:00
8339598b82 Unit tests for cli/commands/image (except build and tag)
Signed-off-by: Ignacio Capurro <icapurrofagian@gmail.com>
Upstream-commit: e7793092a2
Component: cli
2017-05-03 18:40:22 -07:00
02642ac6f8 Output docker swarm join on a single line
This avoids issues when copy/pasting between different shells on
different OSes, which may not all support `\` as a continuation
character.

Fixes #32725

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
Upstream-commit: 2b31a4bf8d
Component: cli
2017-05-03 17:46:41 -07:00
8315ceea29 Add deadcode linter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f73a12f9b
Component: cli
2017-05-02 17:57:46 -04:00
82309a74cd Update imports.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 10641c2aae
Component: cli
2017-04-17 18:07:56 -04:00
b2d0c4c107 Import docker/docker/cli
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
Upstream-commit: 1630fc40f8
Component: cli
2017-04-17 17:40:59 -04:00