github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove error wrapping from builder

Browse Source
This commit is contained in:
Ivo Gosemann
2024-02-08 09:51:15 +01:00
parent 365cbe1b41
commit e821e0de15
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,7 +803,7 @@ func (b *Builder) mappingFor(resourceOrKindArg string) (*meta.RESTMapping, error
// if the error is _not_ a *meta.NoKindMatchError, then we had trouble doing discovery, // if the error is _not_ a *meta.NoKindMatchError, then we had trouble doing discovery,
// so we should return the original error since it may help a user diagnose what is actually wrong // so we should return the original error since it may help a user diagnose what is actually wrong
if meta.IsNoMatchError(err) { if meta.IsNoMatchError(err) {
return nil, fmt.Errorf("the server doesn't have a resource type %q: %w", groupResource.Resource, err) return nil, fmt.Errorf("the server doesn't have a resource type %q", groupResource.Resource)
} }
return nil, err return nil, err
} }

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

@@ -1053,9 +1053,6 @@ func TestRestMappingErrors(t *testing.T) {
if !strings.Contains(err.Error(), "server doesn't have a resource type \"foo\"") { if !strings.Contains(err.Error(), "server doesn't have a resource type \"foo\"") {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
if !errors.Is(err, &meta.NoKindMatchError{}) {
t.Fatalf("unexpected error type: %v", err)
}
} }
expectedErr := fmt.Errorf("expected error") expectedErr := fmt.Errorf("expected error")