Merge pull request kubernetes#84006 from yutedz/k-ctrl-del-msg

k8s-ci-robot · web-flow · commit 5cc945ad0d2f · 2019-11-08T06:12:27.000-08:00
Traverse resources before giving no name error
diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go b/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
@@ -824,10 +824,9 @@ func (b *Builder) visitorResult() *Result {
 			_, err := b.mappingFor(r)
 			if err != nil {
 				return &Result{err: err}
-			} else {
-				return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}
 			}
 		}
+		return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}
 	}
 	return &Result{err: missingResourceError}
 }

Original file line number	Diff line number	Diff line change
`@@ -824,10 +824,9 @@ func (b Builder) visitorResult() Result {`
`824`	`824`	`_, err := b.mappingFor(r)`
`825`	`825`	`if err != nil {`
`826`	`826`	`return &Result{err: err}`
`827`		`- } else {`
`828`		`- return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}`
`829`	`827`	`}`
`830`	`828`	`}`
	`829`	`+ return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")}`
`831`	`830`	`}`
`832`	`831`	`return &Result{err: missingResourceError}`
`833`	`832`	`}`