From 99f0369f9d9110dbe5d36c20e067e25077a50d9d Mon Sep 17 00:00:00 2001 From: xiongzhongliang Date: Thu, 4 Feb 2021 19:15:18 +0800 Subject: [PATCH] fix kubectl patch command error message --- staging/src/k8s.io/cli-runtime/pkg/resource/builder.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go | 4 ++-- staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go b/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go index 5ea50169856..2f665bb51d0 100644 --- a/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go +++ b/staging/src/k8s.io/cli-runtime/pkg/resource/builder.go @@ -839,7 +839,7 @@ func (b *Builder) visitorResult() *Result { return &Result{err: err} } } - 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 was specified")} } return &Result{err: missingResourceError} } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go index f5e36e3bbee..dbe94cad3e7 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_test.go @@ -794,13 +794,13 @@ func TestResourceErrors(t *testing.T) { "resources but no selectors": { args: []string{"pods"}, errFn: func(err error) bool { - return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") + return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified") }, }, "multiple resources but no selectors": { args: []string{"pods,deployments"}, errFn: func(err error) bool { - return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") + return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified") }, }, } diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go index e3f7169764e..63176eedabe 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/label/label_test.go @@ -311,13 +311,13 @@ func TestLabelErrors(t *testing.T) { "resources but no selectors": { args: []string{"pods", "app=bar"}, errFn: func(err error) bool { - return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") + return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified") }, }, "multiple resources but no selectors": { args: []string{"pods,deployments", "app=bar"}, errFn: func(err error) bool { - return strings.Contains(err.Error(), "resource(s) were provided, but no name, label selector, or --all flag specified") + return strings.Contains(err.Error(), "resource(s) were provided, but no name was specified") }, }, }