refactor: client package

Signed-off-by: Charles-Edouard Brétéché <[email protected]>

Author: eddycharly

go.mod

@@ -5,6 +5,7 @@ go 1.22.2
 require (
 	github.com/Masterminds/sprig v2.22.0+incompatible
 	github.com/dustinkirkland/golang-petname v0.0.0-20240428194347-eebcea082ee0
+	github.com/evanphx/json-patch v5.9.0+incompatible
 	github.com/fatih/color v1.17.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
@@ -58,7 +59,6 @@ require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect

pkg/client/client.go

@@ -5,7 +5,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/rest"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -41,8 +40,3 @@ type Client interface {
 	// RESTMapper returns the rest this client is using.
 	RESTMapper() meta.RESTMapper
 }
-
-func New(cfg *rest.Config) (Client, error) {
-	var opts ctrlclient.Options
-	return ctrlclient.New(cfg, opts)
-}

pkg/client/dry_run.go

@@ -0,0 +1,53 @@
+package dryrun
+
+import (
+	"context"
+
+	"github.com/kyverno/chainsaw/pkg/client"
+	"k8s.io/apimachinery/pkg/api/meta"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/types"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+type Client = client.Client
+
+type dryRunClient struct {
+	inner Client
+}
+
+func (c *dryRunClient) Create(ctx context.Context, obj ctrlclient.Object, opts ...ctrlclient.CreateOption) error {
+	return c.inner.Create(ctx, obj, append(opts, ctrlclient.DryRunAll)...)
+}
+
+func (c *dryRunClient) Update(ctx context.Context, obj ctrlclient.Object, opts ...ctrlclient.UpdateOption) error {
+	return c.inner.Update(ctx, obj, append(opts, ctrlclient.DryRunAll)...)
+}
+
+func (c *dryRunClient) Delete(ctx context.Context, obj ctrlclient.Object, opts ...ctrlclient.DeleteOption) error {
+	return c.inner.Delete(ctx, obj, append(opts, ctrlclient.DryRunAll)...)
+}
+
+func (c *dryRunClient) Get(ctx context.Context, key types.NamespacedName, obj ctrlclient.Object, opts ...ctrlclient.GetOption) error {
+	return c.inner.Get(ctx, key, obj, opts...)
+}
+
+func (c *dryRunClient) IsObjectNamespaced(obj runtime.Object) (bool, error) {
+	return c.inner.IsObjectNamespaced(obj)
+}
+
+func (c *dryRunClient) List(ctx context.Context, list ctrlclient.ObjectList, opts ...ctrlclient.ListOption) error {
+	return c.inner.List(ctx, list, opts...)
+}
+
+func (c *dryRunClient) Patch(ctx context.Context, obj ctrlclient.Object, patch ctrlclient.Patch, opts ...ctrlclient.PatchOption) error {
+	return c.inner.Patch(ctx, obj, patch, append(opts, ctrlclient.DryRunAll)...)
+}
+
+func (c *dryRunClient) RESTMapper() meta.RESTMapper {
+	return c.inner.RESTMapper()
+}
+
+func New(inner Client) Client {
+	return &dryRunClient{inner: inner}
+}

pkg/client/dryrun/dry_run.go

@@ -1,4 +1,4 @@
-package client
+package dryrun
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-func TestDryRun(t *testing.T) {
+func TestNew(t *testing.T) {
 	tests := []struct {
 		name  string
 		inner Client
@@ -28,7 +28,7 @@ func TestDryRun(t *testing.T) {
 	}}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := DryRun(tt.inner)
+			got := New(tt.inner)
 			assert.Equal(t, tt.want, got)
 		})
 	}

pkg/client/dry_run_test.go renamed to pkg/client/dryrun/dry_run_test.go

@@ -1,4 +1,4 @@
-package client
+package simple
 
 import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth" // package needed for auth providers like GCP

pkg/client/patch.go

@@ -0,0 +1,12 @@
+package simple
+
+import (
+	"github.com/kyverno/chainsaw/pkg/client"
+	"k8s.io/client-go/rest"
+	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func New(cfg *rest.Config) (client.Client, error) {
+	var opts ctrlclient.Options
+	return ctrlclient.New(cfg, opts)
+}

pkg/client/patch_test.go

@@ -1,4 +1,4 @@
-package client
+package simple
 
 import (
 	"testing"

pkg/client/auth.go renamed to pkg/client/simple/auth.go

@@ -1,10 +1,13 @@
 package client
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/kyverno/pkg/ext/output/color"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -34,3 +37,20 @@ func ColouredName(key ctrlclient.ObjectKey, color *color.Color) string {
 	}
 	return name
 }
+
+func PatchObject(actual, expected runtime.Object) (runtime.Object, error) {
+	if actual == nil || expected == nil {
+		return nil, errors.New("actual and expected objects must not be nil")
+	}
+	actualMeta, err := meta.Accessor(actual)
+	if err != nil {
+		return nil, err
+	}
+	copy := expected.DeepCopyObject()
+	expectedMeta, err := meta.Accessor(copy)
+	if err != nil {
+		return nil, err
+	}
+	expectedMeta.SetResourceVersion(actualMeta.GetResourceVersion())
+	return copy, nil
+}