criocli: fix/diff-friendlier `zsh` completion generation. #5586

klihub · 2022-02-01T09:23:28Z

What type of PR is this?

/kind bug

What this PR does / why we need it:

Commands with a single quote (') in their usage string cause syntactically incorrect zsh completion generation. This patchset aims to fix that, while it also reformats the generated zsh completions for easier diffing with less contextual noise in the future.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix zsh completion generation.

openshift-ci · 2022-02-01T09:23:36Z

Hi @klihub. Thanks for your PR.

I'm waiting for a cri-o member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

codecov · 2022-02-01T09:32:52Z

Codecov Report

Merging #5586 (e5dad09) into main (293de81) will increase coverage by 0.01%.
The diff coverage is 50.00%.

@@            Coverage Diff             @@
##             main    #5586      +/-   ##
==========================================
+ Coverage   43.23%   43.24%   +0.01%     
==========================================
  Files         123      123              
  Lines       12214    12218       +4     
==========================================
+ Hits         5281     5284       +3     
- Misses       6425     6426       +1     
  Partials      508      508

haircommander · 2022-02-01T15:08:22Z

/ok-to-test
/approve

LGTM, thanks @klihub

klihub · 2022-02-01T16:24:34Z

/test integration_cgroupv2

haircommander · 2022-02-01T18:18:53Z

@cri-o/cri-o-maintainers PTAL

klihub · 2022-02-01T21:27:04Z

/test ?

openshift-ci · 2022-02-01T21:27:05Z

@klihub: The following commands are available to trigger required jobs:

/test ami_fedora
/test ami_rhel
/test critest_fedora
/test critest_rhel
/test e2e-agnostic
/test e2e-gcp
/test e2e_crun
/test e2e_features_fedora
/test e2e_features_rhel
/test e2e_fedora
/test e2e_rhel
/test images
/test integration_crun
/test integration_fedora
/test integration_rhel
/test kata-containers

The following commands are available to trigger optional jobs:

/test e2e_cgroupv2
/test integration_cgroupv2

Use /test all to run the following jobs that were automatically triggered:

kata-containers-2-crio-PR
pull-ci-cri-o-cri-o-main-e2e-agnostic
pull-ci-cri-o-cri-o-main-e2e-gcp
pull-ci-cri-o-cri-o-main-images
test_pull_request_crio_critest_fedora
test_pull_request_crio_critest_rhel
test_pull_request_crio_e2e_crun_fedora
test_pull_request_crio_e2e_crun_fedora_cgroupv2
test_pull_request_crio_e2e_features_fedora
test_pull_request_crio_e2e_features_rhel
test_pull_request_crio_e2e_fedora
test_pull_request_crio_e2e_rhel
test_pull_request_crio_integration_crun_fedora
test_pull_request_crio_integration_crun_fedora_cgroupv2
test_pull_request_crio_integration_fedora
test_pull_request_crio_integration_rhel

Details

In response to this:

/test ?

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

klihub · 2022-02-01T21:32:29Z

/test integration_crun

klihub · 2022-02-01T21:33:48Z

/test integration_cgroupv2

fidencio

@klihub, just a small suggestion, which could be applied to pretty much all blocks changed.
Please, let me know what do you think.

completions/zsh/_crio

TomSweeneyRedHat · 2022-02-01T23:02:11Z

LGTM once tests are happy and @fidencitio suggestions are resolved.

fidencio · 2022-02-02T13:33:34Z

LGTM, thanks @klihub!

haircommander · 2022-02-02T18:00:18Z

/retest

haircommander · 2022-02-02T18:25:12Z

/test integration_crun_cgroupv2

openshift-ci · 2022-02-02T18:25:14Z

@haircommander: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test ami_fedora
/test ami_rhel
/test critest_fedora
/test critest_rhel
/test e2e-agnostic
/test e2e-gcp
/test e2e_crun
/test e2e_features_fedora
/test e2e_features_rhel
/test e2e_fedora
/test e2e_rhel
/test images
/test integration_crun
/test integration_fedora
/test integration_rhel
/test kata-containers

The following commands are available to trigger optional jobs:

/test e2e_cgroupv2
/test integration_cgroupv2

Use /test all to run the following jobs that were automatically triggered:

kata-containers-2-crio-PR
pull-ci-cri-o-cri-o-main-e2e-agnostic
pull-ci-cri-o-cri-o-main-e2e-gcp
pull-ci-cri-o-cri-o-main-images
test_pull_request_crio_critest_fedora
test_pull_request_crio_critest_rhel
test_pull_request_crio_e2e_crun_fedora
test_pull_request_crio_e2e_crun_fedora_cgroupv2
test_pull_request_crio_e2e_features_fedora
test_pull_request_crio_e2e_features_rhel
test_pull_request_crio_e2e_fedora
test_pull_request_crio_e2e_rhel
test_pull_request_crio_integration_crun_fedora
test_pull_request_crio_integration_crun_fedora_cgroupv2
test_pull_request_crio_integration_fedora
test_pull_request_crio_integration_rhel

Details

In response to this:

/test integration_crun_cgroupv2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Reformat generated zsh for easier diffing. Try to be smarter for usage strings that contain single quotes (eg. crio wipe). Signed-off-by: Krisztian Litkey <[email protected]>

fgiudici · 2022-02-04T09:09:14Z

/test integration_fedora

fgiudici · 2022-02-04T09:11:43Z

/test integration_rhel

fidencio · 2022-02-04T13:10:28Z

/retest

haircommander · 2022-02-04T14:57:27Z

/retest-required

(if it continues to fail we can override e2e-agnositc, gcp passed)

ping @saschagrunert for final review/tag?

saschagrunert

/retest-required
/lgtm

openshift-ci · 2022-02-07T08:29:13Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, klihub, saschagrunert

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [haircommander,saschagrunert]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-bot · 2022-02-07T10:10:18Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-07T10:46:21Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-02-07T11:36:49Z

@klihub: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2	`e5dad09`	link	false	`/test e2e_cgroupv2`

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

openshift-bot · 2022-02-07T11:59:28Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-bot · 2022-02-07T12:51:23Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

klihub requested review from mrunalp and runcom as code owners February 1, 2022 09:23

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels Feb 1, 2022

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Feb 1, 2022

openshift-ci bot requested review from fidencio and haircommander February 1, 2022 09:23

klihub mentioned this pull request Feb 1, 2022

server: add support for CDI device injection. #5571

Merged

klihub force-pushed the devel/diff-friendly-completions branch 4 times, most recently from 4357671 to d25d457 Compare February 1, 2022 13:19

fidencio reviewed Feb 1, 2022

View reviewed changes

completions/zsh/_crio Outdated Show resolved Hide resolved

completions/zsh/_crio Outdated Show resolved Hide resolved

klihub force-pushed the devel/diff-friendly-completions branch 2 times, most recently from 11e3639 to a971271 Compare February 2, 2022 13:00

criocli: produce diff-friendlier zsh completions.

e5dad09

Reformat generated zsh for easier diffing. Try to be smarter for usage strings that contain single quotes (eg. crio wipe). Signed-off-by: Krisztian Litkey <[email protected]>

klihub force-pushed the devel/diff-friendly-completions branch from a971271 to e5dad09 Compare February 3, 2022 15:45

saschagrunert approved these changes Feb 7, 2022

View reviewed changes

openshift-ci bot assigned saschagrunert Feb 7, 2022

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 7, 2022

openshift-merge-robot merged commit 93cdb46 into cri-o:main Feb 7, 2022

klihub deleted the devel/diff-friendly-completions branch February 7, 2022 15:05

klihub mentioned this pull request Feb 14, 2022

REQUEST: New reviewer status for @klihub #5640

Closed

4 tasks

askervin mentioned this pull request Jun 6, 2022

Fix zsh autocompletion #4903

Closed

criocli: fix/diff-friendlier zsh completion generation. #5586

criocli: fix/diff-friendlier zsh completion generation. #5586

Uh oh!

Conversation

klihub commented Feb 1, 2022

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Feb 1, 2022

Uh oh!

codecov bot commented Feb 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

haircommander commented Feb 1, 2022

Uh oh!

klihub commented Feb 1, 2022

Uh oh!

haircommander commented Feb 1, 2022

Uh oh!

klihub commented Feb 1, 2022

Uh oh!

openshift-ci bot commented Feb 1, 2022

Uh oh!

klihub commented Feb 1, 2022

Uh oh!

klihub commented Feb 1, 2022

Uh oh!

fidencio left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

TomSweeneyRedHat commented Feb 1, 2022

Uh oh!

fidencio commented Feb 2, 2022

Uh oh!

haircommander commented Feb 2, 2022

Uh oh!

haircommander commented Feb 2, 2022

Uh oh!

openshift-ci bot commented Feb 2, 2022

Uh oh!

fgiudici commented Feb 4, 2022

Uh oh!

fgiudici commented Feb 4, 2022

Uh oh!

fidencio commented Feb 4, 2022

Uh oh!

haircommander commented Feb 4, 2022

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Feb 7, 2022

Uh oh!

openshift-bot commented Feb 7, 2022

Uh oh!

openshift-bot commented Feb 7, 2022

Uh oh!

openshift-ci bot commented Feb 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-bot commented Feb 7, 2022

Uh oh!

openshift-bot commented Feb 7, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

criocli: fix/diff-friendlier `zsh` completion generation. #5586

criocli: fix/diff-friendlier `zsh` completion generation. #5586

codecov bot commented Feb 1, 2022 •

edited

Loading

fidencio left a comment •

edited

Loading

openshift-ci bot commented Feb 7, 2022 •

edited

Loading