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

Merge pull request #83825 from zhouya0/fix-kubectl-delete-semantic-error

Browse Source 
fix kubectl delete semantic error
This commit is contained in:
Kubernetes Prow Robot 2019-10-15 23:06:30 -07:00 committed by GitHub
commit 2afb403fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
View File

@ -820,7 +820,14 @@ func (b *Builder) visitorResult() *Result {
} }
if len(b.resources) != 0 { if len(b.resources) != 0 {
return &Result{err: fmt.Errorf("resource(s) were provided, but no name, label selector, or --all flag specified")} for _, r := range b.resources {
_, 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: missingResourceError} return &Result{err: missingResourceError}
} }

11
staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go
View File

@ -1228,7 +1228,18 @@ func TestFieldSelectorRequiresKnownTypes(t *testing.T) {
t.Errorf("unexpected non-error") t.Errorf("unexpected non-error")
} }
} }
func TestNoSelectorUnknowResourceType(t *testing.T) {
b := newDefaultBuilder().
NamespaceParam("test").
ResourceTypeOrNameArgs(false, "unknown")
err := b.Do().Err()
if err != nil {
if !strings.Contains(err.Error(), "server doesn't have a resource type \"unknown\"") {
t.Fatalf("unexpected error: %v", err)
}
}
}
func TestSingleResourceType(t *testing.T) { func TestSingleResourceType(t *testing.T) {
b := newDefaultBuilder(). b := newDefaultBuilder().
LabelSelectorParam("a=b"). LabelSelectorParam("a=b").