github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-09-05 09:01:06 +00:00
Code Issues Projects Releases Wiki Activity

add more options for fetching openapiv3 in clients

Browse Source 
remove serialized types from client

update tests

Kubernetes-commit: fec79e75a50f334d8384a5377513fc78222ea36a
This commit is contained in:
Alexander Zielenski
2022-10-12 11:43:46 -07:00
committed by Kubernetes Publisher
parent b6d3c8d376
commit 8b6ceae557
5 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
openapi/groupversion.go
View File

@@ -19,15 +19,16 @@ package openapi
import (
"context"
openapi_v3 "github.com/google/gnostic/openapiv3"
"google.golang.org/protobuf/proto"
"k8s.io/kube-openapi/pkg/handler3"
)
const openAPIV3mimePb = "application/com.github.proto-openapi.spec.v3@v1.0+protobuf"
const jsonMime = "application/json"
type GroupVersion interface {
Schema() (*openapi_v3.Document, error)
// Raw data types
SchemaJSON() ([]byte, error)
SchemaPB() ([]byte, error)
}
type groupversion struct {
@@ -39,7 +40,7 @@ func newGroupVersion(client *client, item handler3.OpenAPIV3DiscoveryGroupVersio
return &groupversion{client: client, item: item}
}
func (g *groupversion) Schema() (*openapi_v3.Document, error) {
func (g *groupversion) SchemaPB() ([]byte, error) {
data, err := g.client.restClient.Get().
RequestURI(g.item.ServerRelativeURL).
SetHeader("Accept", openAPIV3mimePb).
@@ -49,11 +50,18 @@ func (g *groupversion) Schema() (*openapi_v3.Document, error) {
if err != nil {
return nil, err
}
return data, nil
}
document := &openapi_v3.Document{}
if err := proto.Unmarshal(data, document); err != nil {
func (g *groupversion) SchemaJSON() ([]byte, error) {
data, err := g.client.restClient.Get().
RequestURI(g.item.ServerRelativeURL).
SetHeader("Accept", jsonMime).
Do(context.TODO()).
Raw()
if err != nil {
return nil, err
}
return document, nil
return data, nil
}