github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

prevent "No resources found" output on forbidden error

Browse Source
This commit is contained in:
juanvallejo 2018-08-08 10:26:20 -04:00
parent 733a381ec4
commit df0077f362
No known key found for this signature in database
GPG Key ID: 7D2C958002D6448D
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/get/get.go
View File

@ -454,7 +454,7 @@ func (o *GetOptions) Run(f cmdutil.Factory, cmd *cobra.Command, args []string) e
} }
} }
w.Flush() w.Flush()
if nonEmptyObjCount == 0 && !o.IgnoreNotFound { if nonEmptyObjCount == 0 && !o.IgnoreNotFound && len(allErrs) == 0 {
fmt.Fprintln(o.ErrOut, "No resources found.") fmt.Fprintln(o.ErrOut, "No resources found.")
} }
return utilerrors.NewAggregate(allErrs) return utilerrors.NewAggregate(allErrs)

4
test/cmd/get.sh
View File

@ -72,6 +72,10 @@ run_kubectl_get_tests() {
# Pre-condition: no pods exist # Pre-condition: no pods exist
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
# Command # Command
output_message=$(! kubectl get foobar 2>&1 "${kube_flags[@]}")
# Post-condition: The text "No resources found" should not be part of the output when an error occurs
kube::test::if_has_not_string "${output_message}" 'No resources found'
# Command
output_message=$(kubectl get pods 2>&1 "${kube_flags[@]}") output_message=$(kubectl get pods 2>&1 "${kube_flags[@]}")
# Post-condition: The text "No resources found" should be part of the output # Post-condition: The text "No resources found" should be part of the output
kube::test::if_has_string "${output_message}" 'No resources found' kube::test::if_has_string "${output_message}" 'No resources found'