From 32d834a88673614080bc37727f8cc94b9b85bc86 Mon Sep 17 00:00:00 2001 From: Alexander Zielenski <351783+alexzielenski@users.noreply.github.com> Date: Mon, 17 Oct 2022 10:51:27 -0700 Subject: [PATCH] address feedback --- .../k8s.io/client-go/discovery/discovery_client_test.go | 8 ++++++-- staging/src/k8s.io/client-go/openapi/groupversion.go | 7 +------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go index 4dc4a84c6b7..47e41970b44 100644 --- a/staging/src/k8s.io/client-go/discovery/discovery_client_test.go +++ b/staging/src/k8s.io/client-go/discovery/discovery_client_test.go @@ -594,7 +594,9 @@ func TestGetOpenAPISchemaV3(t *testing.T) { } expected := testV3Specs[k] - if contentType == runtime.ContentTypeJSON { + switch contentType { + + case runtime.ContentTypeJSON: var actualSpec spec3.OpenAPI if err := json.Unmarshal(actual, &actualSpec); err != nil { @@ -606,7 +608,7 @@ func TestGetOpenAPISchemaV3(t *testing.T) { // Our test server parses the files in directly as gnostic // which retains empty maps/lists, etc. require.EqualValues(t, expected, &actualSpec) - } else { + case openapi.ContentTypeOpenAPIV3PB: // Convert to JSON then to gnostic then to PB for comparison expectedJSON, err := json.Marshal(expected) if err != nil { @@ -625,6 +627,8 @@ func TestGetOpenAPISchemaV3(t *testing.T) { if !reflect.DeepEqual(expectedPB, actual) { t.Fatalf("expected equal values: %v", cmp.Diff(expectedPB, actual)) } + default: + panic(fmt.Errorf("unrecognized content type: %v", contentType)) } // Ensure that fetching schema once again does not return same instance diff --git a/staging/src/k8s.io/client-go/openapi/groupversion.go b/staging/src/k8s.io/client-go/openapi/groupversion.go index 6822b047626..32133a29b8a 100644 --- a/staging/src/k8s.io/client-go/openapi/groupversion.go +++ b/staging/src/k8s.io/client-go/openapi/groupversion.go @@ -38,14 +38,9 @@ func newGroupVersion(client *client, item handler3.OpenAPIV3DiscoveryGroupVersio } func (g *groupversion) Schema(contentType string) ([]byte, error) { - data, err := g.client.restClient.Get(). + return g.client.restClient.Get(). RequestURI(g.item.ServerRelativeURL). SetHeader("Accept", contentType). Do(context.TODO()). Raw() - - if err != nil { - return nil, err - } - return data, nil }