Bump spf13/cobra to v0.0.3, pflag to v1.0.1 #37106

thaJeztah · 2018-05-19T01:25:51Z

Use a tagged release of Cobra. All relevant PR's were merged, so the fork is
no longer needed.

spf13/cobra@7b2c5ac...v0.0.3

Relevant changes:

Add a field to disable [flags] in UseLine() spf13/cobra#552 Add a field to disable [flags] in UseLine()
Add CalledAs method to cobra.Command (w/ tests) spf13/cobra#567 Add CalledAs method to cobra.Command
Update error message for missing required flags spf13/cobra#580 Update error message for missing required flags
Add support for --version flag spf13/cobra#584 Add support for --version flag
cmd: Fix #612 spf13/cobra#614 If user has a project in symlink, just use its destination folder and work there
terminates the flags when -- is found in commandline spf13/cobra#649 terminates the flags when -- is found in commandline
Add support for ignoring parse errors spf13/cobra#662 Add support for ignoring parse errors
doc: hide hidden parent flags spf13/cobra#686 doc: hide hidden parent flags

Also various improvements were added for generating Bash
completion scripts (currently not used by us)

Fixes usage output for dockerd;

Before this update:

dockerd --help

Usage:	dockerd COMMAND

A self-sufficient runtime for containers.

After this update:

dockerd --help

Usage:	dockerd [OPTIONS] [flags]

A self-sufficient runtime for containers.

Bump spf13/pflag to v1.0.1

spf13/pflag@97afa5e...v1.0.1

Relevant changes:

allow lookup by shorthand spf13/pflag#106 allow lookup by shorthand
Add SortFlags option spf13/pflag#113 Add SortFlags option
Generate flag error output for errors returned from the parseFunc spf13/pflag#138 Generate flag error output for errors returned from the parseFunc
Fixing Count flag usage string spf13/pflag#141 Fixing Count flag usage string
add int16 flag spf13/pflag#143 add int16 flag
DurationSlice: implementation and tests spf13/pflag#122 DurationSlice: implementation and tests
Implement BytesHex type of argument spf13/pflag#115 Implement BytesHex type of argument
Add uintSlice and boolSlice to name prettifier spf13/pflag#150 Add uintSlice and boolSlice to name prettifier
Add multiline wrapping support spf13/pflag#155 Add multiline wrapping support
doc: clarify difference between string slice vs. array spf13/pflag#158 doc: clarify difference between string slice vs. array
add ability to ignore unknown flags spf13/pflag#160 add ability to ignore unknown flags
Allow Users To Show Deprecated Flags spf13/pflag#163 Allow Users To Show Deprecated Flags

Hide [flags] in usage output

Hides the [flags] in the usage output of commands (present in newer
versions of Cobra), using the .DisableFlagsInUseLine option.

Before this change:

dockerd --help

Usage:	dockerd [OPTIONS] [flags]

A self-sufficient runtime for containers.

After this change:

dockerd --help

Usage:	dockerd [OPTIONS]

A self-sufficient runtime for containers.

Use a tagged release of Cobra. All relevant PR's were merged, so the fork is no longer needed. Relevant changes: - spf13/cobra#552 Add a field to disable [flags] in UseLine() - spf13/cobra#567 Add `CalledAs` method to cobra.Command - spf13/cobra#580 Update error message for missing required flags - spf13/cobra#584 Add support for --version flag - spf13/cobra#614 If user has a project in symlink, just use its destination folder and work there - spf13/cobra#649 terminates the flags when -- is found in commandline - spf13/cobra#662 Add support for ignoring parse errors - spf13/cobra#686 doc: hide hidden parent flags Also various improvements were added for generating Bash completion scripts (currently not used by us) Fixes usage output for dockerd; Before this update: dockerd --help Usage: dockerd COMMAND A self-sufficient runtime for containers. After this update: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. Bump spf13/pflag to v1.0.1 Relevant changes: - spf13/pflag#106 allow lookup by shorthand - spf13/pflag#113 Add SortFlags option - spf13/pflag#138 Generate flag error output for errors returned from the parseFunc - spf13/pflag#141 Fixing Count flag usage string - spf13/pflag#143 add int16 flag - spf13/pflag#122 DurationSlice: implementation and tests - spf13/pflag#115 Implement BytesHex type of argument - spf13/pflag#150 Add uintSlice and boolSlice to name prettifier - spf13/pflag#155 Add multiline wrapping support - spf13/pflag#158 doc: clarify difference between string slice vs. array - spf13/pflag#160 add ability to ignore unknown flags - spf13/pflag#163 Allow Users To Show Deprecated Flags Hide [flags] in usage output Hides the [flags] in the usage output of commands (present in newer versions of Cobra), using the `.DisableFlagsInUseLine` option. Before this change: dockerd --help Usage: dockerd [OPTIONS] [flags] A self-sufficient runtime for containers. After this change: dockerd --help Usage: dockerd [OPTIONS] A self-sufficient runtime for containers. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Â# modified: vendor/github.com/spf13/pflag/string_array.go § Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

> HasAvailableFlags checks if the command contains any flags (local > plus persistent from the entire structure) which are not hidden or > deprecated. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

dockerd has no subcommands, so the help command is not used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah · 2018-05-19T10:32:47Z

Janky https://jenkins.dockerproject.org/job/Docker-PRs/49493/console is failing on a flaky test (#32673)

02:47:16 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
02:47:16 
02:47:16 [d6f467bb9f2d8] waiting for daemon to start
02:47:16 [d6f467bb9f2d8] daemon started
02:47:16 
02:47:16 [da904da1ba566] waiting for daemon to start
02:47:16 [da904da1ba566] daemon started
02:47:16 
02:47:16 [d99314c8d1b6d] waiting for daemon to start
02:47:16 [d99314c8d1b6d] daemon started
02:47:16 
02:47:16 [d6f467bb9f2d8] exiting daemon
02:47:16 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
02:47:16 [da904da1ba566] exiting daemon
02:47:16 [d99314c8d1b6d] exiting daemon

PowerPC https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/9920/console as well, but different test (#33041)

03:08:15 FAIL: docker_cli_swarm_test.go:1372: DockerSwarmSuite.TestSwarmClusterRotateUnlockKey
03:08:15 
03:08:15 [dfead4008b72e] waiting for daemon to start
03:08:15 [dfead4008b72e] daemon started
03:08:15 
03:08:15 [de4c4ad13eeaf] waiting for daemon to start
03:08:15 [de4c4ad13eeaf] daemon started
03:08:15 
03:08:15 [d30249e346d26] waiting for daemon to start
03:08:15 [d30249e346d26] daemon started
03:08:15 
03:08:15 [de4c4ad13eeaf] exiting daemon
03:08:15 [de4c4ad13eeaf] waiting for daemon to start
03:08:15 [de4c4ad13eeaf] daemon started
03:08:15 
03:08:15 [d30249e346d26] exiting daemon
03:08:15 [d30249e346d26] waiting for daemon to start
03:08:15 [d30249e346d26] daemon started
03:08:15 
03:08:15 docker_cli_swarm_test.go:1449:
03:08:15     c.Assert(err, checker.IsNil)
03:08:15 ... value *exec.ExitError = &exec.ExitError{ProcessState:(*os.ProcessState)(0xc423fc6260), Stderr:[]uint8(nil)} ("exit status 1")
03:08:15 
03:08:15 [dfead4008b72e] exiting daemon
03:08:15 [de4c4ad13eeaf] exiting daemon
03:08:15 [d30249e346d26] exiting daemon

thaJeztah · 2018-05-19T12:58:42Z

Hm...failure on PowerPC; https://jenkins.dockerproject.org/job/Docker-PRs-powerpc/9921/console

I see this failed on some other runs, e.g. #36511 (comment) - looks like flaky

11:31:27 FAIL: docker_api_containers_test.go:435: DockerSuite.TestContainerAPITop
11:31:27 
11:31:27 docker_api_containers_test.go:453:
11:31:27     c.Assert(top.Processes[0][10], checker.Equals, "/bin/sh -c top")
11:31:27 ... obtained string = "top"
11:31:27 ... expected string = "/bin/sh -c top"
11:31:27

Opened #37109 for tracking

codecov · 2018-05-19T21:05:46Z

Codecov Report

❗ No coverage uploaded for pull request base (master@76e4353). Click here to learn what that means.
The diff coverage is 0%.

@@            Coverage Diff            @@
##             master   #37106   +/-   ##
=========================================
  Coverage          ?   35.38%           
=========================================
  Files             ?      615           
  Lines             ?    45816           
  Branches          ?        0           
=========================================
  Hits              ?    16211           
  Misses            ?    27456           
  Partials          ?     2149

thaJeztah · 2018-05-20T13:17:12Z

this is green now; @dnephin @vdemeester

boaz0

LGTM 👍

vdemeester

LGTM 🐯

thaJeztah added 4 commits May 19, 2018 03:09

Use HasAvailableFlags instead of HasFlags for Options in help

9411856

> HasAvailableFlags checks if the command contains any flags (local > plus persistent from the entire structure) which are not hidden or > deprecated. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Use Cobra built-in --version feature

0c3192d

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Remove unused help command

298a26e

dockerd has no subcommands, so the help command is not used. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

thaJeztah added area/cli status/2-code-review labels May 19, 2018

GordonTheTurtle added the status/0-triage label May 19, 2018

thaJeztah requested a review from dnephin May 19, 2018 01:25

thaJeztah removed the status/0-triage label May 19, 2018

thaJeztah added rebuild/janky labels May 19, 2018

GordonTheTurtle removed rebuild/janky labels May 19, 2018

thaJeztah mentioned this pull request May 19, 2018

Flaky test: TestContainerAPITop #37109

Closed

thaJeztah added the rebuild/powerpc label May 19, 2018

GordonTheTurtle removed the rebuild/powerpc label May 19, 2018

thaJeztah added the rebuild/powerpc label May 19, 2018

GordonTheTurtle removed the rebuild/powerpc label May 19, 2018

boaz0 approved these changes May 20, 2018

View reviewed changes

vdemeester approved these changes May 22, 2018

View reviewed changes

vdemeester merged commit 032a4b6 into moby:master May 22, 2018

thaJeztah deleted the unfork-cobra branch May 22, 2018 08:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump spf13/cobra to v0.0.3, pflag to v1.0.1 #37106

Bump spf13/cobra to v0.0.3, pflag to v1.0.1 #37106

thaJeztah commented May 19, 2018

thaJeztah commented May 19, 2018

thaJeztah commented May 19, 2018 •

edited

Loading

codecov bot commented May 19, 2018

thaJeztah commented May 20, 2018

boaz0 left a comment

vdemeester left a comment

Bump spf13/cobra to v0.0.3, pflag to v1.0.1 #37106

Bump spf13/cobra to v0.0.3, pflag to v1.0.1 #37106

Conversation

thaJeztah commented May 19, 2018

Bump spf13/pflag to v1.0.1

Hide [flags] in usage output

thaJeztah commented May 19, 2018

thaJeztah commented May 19, 2018 • edited Loading

codecov bot commented May 19, 2018

Codecov Report

thaJeztah commented May 20, 2018

boaz0 left a comment

Choose a reason for hiding this comment

vdemeester left a comment

Choose a reason for hiding this comment

thaJeztah commented May 19, 2018 •

edited

Loading