diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-09-23 10:51:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 10:51:44 -0400 |
| commit | c2beea695857b71250c87eb9ab799f7773b8d251 (patch) | |
| tree | 99f0dafe0248bc4c115d308b31f8c0dc3fb0ad68 | |
| parent | 6b8371b1a3a7364d0527d5d87a8aa9a3d1294ac9 (diff) | |
| parent | b6e5a4909a5070f3092f91a592e6d04c5d358e85 (diff) | |
| download | podman-c2beea695857b71250c87eb9ab799f7773b8d251.tar.gz podman-c2beea695857b71250c87eb9ab799f7773b8d251.tar.bz2 podman-c2beea695857b71250c87eb9ab799f7773b8d251.zip | |
Merge pull request #11721 from Luap99/image-completion
shell completion: do not show images without tag
| -rw-r--r-- | cmd/podman/common/completion.go | 7 | ||||
| -rw-r--r-- | test/system/600-completion.bats | 4 |
2 files changed, 1 insertions, 10 deletions
diff --git a/cmd/podman/common/completion.go b/cmd/podman/common/completion.go index 2ea5fa10f..90522438d 100644 --- a/cmd/podman/common/completion.go +++ b/cmd/podman/common/completion.go @@ -194,21 +194,14 @@ func getImages(cmd *cobra.Command, toComplete string) ([]string, cobra.ShellComp } else { // suggested "registry.fedoraproject.org/f29/httpd:latest" as // - "registry.fedoraproject.org/f29/httpd:latest" - // - "registry.fedoraproject.org/f29/httpd" // - "f29/httpd:latest" - // - "f29/httpd" // - "httpd:latest" - // - "httpd" paths := strings.Split(repo, "/") for i := range paths { suggestionWithTag := strings.Join(paths[i:], "/") if strings.HasPrefix(suggestionWithTag, toComplete) { suggestions = append(suggestions, suggestionWithTag) } - suggestionWithoutTag := strings.SplitN(strings.SplitN(suggestionWithTag, ":", 2)[0], "@", 2)[0] - if strings.HasPrefix(suggestionWithoutTag, toComplete) { - suggestions = append(suggestions, suggestionWithoutTag) - } } } } diff --git a/test/system/600-completion.bats b/test/system/600-completion.bats index fbb0da231..5f4610e9e 100644 --- a/test/system/600-completion.bats +++ b/test/system/600-completion.bats @@ -110,12 +110,10 @@ function check_shell_completion() { is "$output" ".*localhost/$random_image_name:$random_image_tag${nl}" \ "$* $cmd: actual image listed in suggestions" - # check that we complete the image with and without tag after at least one char is typed + # check that we complete the image with tag after at least one char is typed run_completion "$@" $cmd "${extra_args[@]}" "${random_image_name:0:1}" is "$output" ".*$random_image_name:$random_image_tag${nl}" \ "$* $cmd: image name:tag included in suggestions" - is "$output" ".*$random_image_name${nl}" \ - "$* $cmd: image name(w/o tag) included in suggestions" # check that we complete the image id after at least two chars are typed run_completion "$@" $cmd "${extra_args[@]}" "${random_image_id:0:2}" |