imjasonh/client-go2
1
0
Fork 0
mirror of https://github.com/imjasonh/client-go2 synced 2026-07-18 22:58:43 +00:00
Code Activity

just take a GVR in NewClient

Browse source
This commit is contained in:
Jason Hall 2021-09-10 13:56:24 -04:00
parent 5539a6fa1d
commit 08c01c3a33
2 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

37
generic/client.go
View file

@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/json"
"strings"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -14,38 +13,20 @@ import (
)
type obj interface {
GetObjectKind() schema.ObjectKind
}
func NewClient[T obj](config *rest.Config) client[T] {
func NewClient[T any](gvr schema.GroupVersionResource, config *rest.Config) client[T] {
return client[T] {
gvr: gvr,
dyn: dynamic.NewForConfigOrDie(config),
}
}
type client[T obj] struct {
type client[T any] struct {
gvr schema.GroupVersionResource
dyn dynamic.Interface // TODO: don't depend on dynamic client
}
// gvr translates the T to a GVR, via GVK
// GVK->GVR translation is a terrible hack; we need something better.
func (c client[T]) gvr() schema.GroupVersionResource {
// BOOM!
// This panics because T is a nil *corev1.Pod; the runtime.Object interface is only satisfied by *corev1.Pod, not the instantiable corev1.Pod.
// https://go.googlesource.com/proposal/+/refs/heads/master/design/43651-type-parameters.md#pointer-method-example
// https://go.googlesource.com/proposal/+/refs/heads/master/design/43651-type-parameters.md#no-way-to-require-pointer-methods
var t T
gvk := t.GetObjectKind().GroupVersionKind()
return schema.GroupVersionResource{
Group: gvk.Group,
Version: gvk.Version,
Resource: strings.ToLower(gvk.Kind) + "s", // HACK
}
}
func (c client[T]) List(ctx context.Context, namespace string) ([]T, error) {
ul, err := c.dyn.Resource(c.gvr()).Namespace(namespace).List(ctx, metav1.ListOptions{})
ul, err := c.dyn.Resource(c.gvr).Namespace(namespace).List(ctx, metav1.ListOptions{})
if err != nil {
return nil, err
}
@ -54,7 +35,7 @@ func (c client[T]) List(ctx context.Context, namespace string) ([]T, error) {
var t T
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(u.Object); err != nil { return nil, err }
if err := json.NewDecoder(&buf).Decode(t); err != nil { return nil, err }
if err := json.NewDecoder(&buf).Decode(&t); err != nil { return nil, err }
out = append(out, t)
}
return out, nil
@ -62,13 +43,13 @@ func (c client[T]) List(ctx context.Context, namespace string) ([]T, error) {
func (c client[T]) Get(ctx context.Context, namespace, name string) (T, error) {
var t T
u, err := c.dyn.Resource(c.gvr()).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
u, err := c.dyn.Resource(c.gvr).Namespace(namespace).Get(ctx, name, metav1.GetOptions{})
if err != nil {
return t, err
}
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(u.Object); err != nil { return t, err }
if err := json.NewDecoder(&buf).Decode(t); err != nil { return t, err }
if err := json.NewDecoder(&buf).Decode(&t); err != nil { return t, err }
return t, nil
}
@ -78,7 +59,7 @@ func (c client[T]) Create(ctx context.Context, namespace string, t T) error {
if err := json.NewEncoder(&buf).Encode(t); err != nil { return err }
if err := json.NewDecoder(&buf).Decode(&m); err != nil { return err }
u := &unstructured.Unstructured{Object:m}
_, err := c.dyn.Resource(c.gvr()).Namespace(namespace).Create(ctx, u, metav1.CreateOptions{})
_, err := c.dyn.Resource(c.gvr).Namespace(namespace).Create(ctx, u, metav1.CreateOptions{})
return err
}