Skip to content

umoci config: disable flag argument re-ordering - #328

Merged
cyphar merged 2 commits into
opencontainers:masterfrom
cyphar:cli-hotfix
Jun 21, 2020
Merged

cyphar merged 2 commits into
opencontainers:masterfrom
cyphar:cli-hotfix

Conversation

@cyphar

@cyphar cyphar commented Jun 20, 2020

Copy link
Copy Markdown
Member

It turns out that urfave/cli hasn't been happy with parsing
command-lines like [--config.cmd -c] for quite some time, and only
just exposed the issue in a test-case
. There are loads of more subtle
cases where you could see this happened even in the version of
urfave/cli we have vendored.

Until it's fixed upstream (which might not happen), we have to work
around this by disabling argument reordering for 'umoci config' (which
is the only command that usually has to deal with such flag arguments,
and luckily doesn't take any positional arguments).

Signed-off-by: Aleksa Sarai asarai@suse.de

cyphar added 2 commits June 20, 2020 14:14
It turns out that urfave/cli hasn't been happy with parsing
command-lines like [--config.cmd -c] for quite some time, and only just
exposed the issue in a test-case[1]. There are loads of more subtle
cases where you could see this happened even in the version of
urfave/cli we have vendored.

Until it's fixed upstream (which might not happen), we have to work
around this by disabling argument reordering for 'umoci config' (which
is the only command that usually has to deal with such flag arguments,
and luckily doesn't take any positional arguments).

[1]: urfave/cli#1152

Signed-off-by: Aleksa Sarai <asarai@suse.de>
  % go get -u all
  go: github.com/google/go-cmp upgrade => v0.5.0
  go: github.com/kr/text upgrade => v0.2.0
  go: github.com/mattn/go-colorable upgrade => v0.1.6
  go: github.com/mattn/go-isatty upgrade => v0.0.12
  go: github.com/stretchr/testify upgrade => v1.6.1
  go: github.com/tj/assert upgrade => v0.0.3
  go: github.com/urfave/cli upgrade => v1.22.4
  go: gopkg.in/check.v1 upgrade => v1.0.0-20200227125254-8fa46927fb4f
  go: gopkg.in/yaml.v2 upgrade => v2.3.0
  go: gopkg.in/yaml.v3 upgrade => v3.0.0-20200615113413-eeeca48fe776

This also removes the excludes block stopping github.com/urfave/cli
updates, now that we've worked around the 'umoci config' issue by
skipping argument reordering.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
@cyphar

cyphar commented Jun 20, 2020

Copy link
Copy Markdown
Member Author

LGTM.

/cc @vbatts @tych0

@tych0

tych0 commented Jun 21, 2020

Copy link
Copy Markdown
Member

LGTM

@cyphar
cyphar merged commit 1d78577 into opencontainers:master Jun 21, 2020
@cyphar
cyphar deleted the cli-hotfix branch June 21, 2020 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

⌂ 换网址