upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #133380 from tchap/kubectl-get-watch-error-message

Browse source 
cli-runtime: Return defined error object from resource.Builder on SingleResourceType violated
This commit is contained in:
Kubernetes Prow Robot 2025-09-02 08:01:22 -07:00 committed by GitHub
commit d182e9d29d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
staging/src/k8s.io/cli-runtime/pkg/resource/builder.go
View file

@ -129,6 +129,10 @@ Example resource specifications include:
var StdinMultiUseError = errors.New("standard input cannot be used for multiple arguments")
// ErrMultipleResourceTypes is returned when Builder.SingleResourceType() was called,
// but multiple resource types were specified.
var ErrMultipleResourceTypes = errors.New("you may only specify a single resource type")
// TODO: expand this to include other errors.
func IsUsageError(err error) bool {
if err == nil {
@ -813,7 +817,7 @@ func (b *Builder) mappingFor(resourceOrKindArg string) (*meta.RESTMapping, error
func (b *Builder) resourceMappings() ([]*meta.RESTMapping, error) {
if len(b.resources) > 1 && b.singleResourceType {
return nil, fmt.Errorf("you may only specify a single resource type")
return nil, ErrMultipleResourceTypes
}
mappings := []*meta.RESTMapping{}
seen := map[schema.GroupVersionKind]bool{}
@ -849,7 +853,7 @@ func (b *Builder) resourceTupleMappings() (map[string]*meta.RESTMapping, error)
canonical[mapping.Resource] = struct{}{}
}
if len(canonical) > 1 && b.singleResourceType {
return nil, fmt.Errorf("you may only specify a single resource type")
return nil, ErrMultipleResourceTypes
}
return mappings, nil
}

4
staging/src/k8s.io/cli-runtime/pkg/resource/builder_test.go
View file

@ -1367,8 +1367,8 @@ func TestSingleResourceType(t *testing.T) {
SingleResourceType().
ResourceTypeOrNameArgs(true, "pods,services")
if b.Do().Err() == nil {
t.Errorf("unexpected non-error")
if err := b.Do().Err(); !errors.Is(err, ErrMultipleResourceTypes) {
t.Errorf("unexpected error: %s", err)
}
}

3
staging/src/k8s.io/kubectl/pkg/cmd/get/get.go
View file

@ -629,9 +629,6 @@ func (o *GetOptions) watch(f cmdutil.Factory, args []string) error {
}
return err
}
if multipleGVKsRequested(infos) {
return i18n.Errorf("watch is only supported on individual resources and resource collections - more than 1 resource was found")
}
info := infos[0]
mapping := info.ResourceMapping()