fix: missing integrations (#4)

Author: matteogastaldello

go.mod

@@ -8,7 +8,6 @@ require (
 	github.com/lucasepe/httplib v0.2.2
 	github.com/pb33f/libopenapi v0.16.8
 	github.com/rs/zerolog v1.32.0
-	github.com/stretchr/testify v1.9.0
 	k8s.io/apimachinery v0.31.1
 	k8s.io/client-go v0.31.1
 	sigs.k8s.io/controller-runtime v0.19.1
@@ -42,7 +41,6 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/twmb/murmur3 v1.1.8 // indirect
 	github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect

internal/composition/composition.go

@@ -15,10 +15,11 @@ import (
 	"github.com/krateoplatformops/unstructured-runtime/pkg/controller"
 	"github.com/krateoplatformops/unstructured-runtime/pkg/logging"
 	"github.com/krateoplatformops/unstructured-runtime/pkg/meta"
+	"github.com/krateoplatformops/unstructured-runtime/pkg/pluralizer"
 	"github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured/condition"
 	"github.com/lucasepe/httplib"
 
-	"github.com/krateoplatformops/rest-dynamic-controller/internal/tools"
+	"github.com/krateoplatformops/unstructured-runtime/pkg/tools"
 	unstructuredtools "github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -29,7 +30,7 @@ import (
 
 var _ controller.ExternalClient = (*handler)(nil)
 
-func NewHandler(cfg *rest.Config, log logging.Logger, swg getter.Getter) controller.ExternalClient {
+func NewHandler(cfg *rest.Config, log logging.Logger, swg getter.Getter, pluralizer pluralizer.Pluralizer) controller.ExternalClient {
 	dyn, err := dynamic.NewForConfig(cfg)
 	if err != nil {
 		log.Debug("Creating dynamic client", "error", err)
@@ -41,6 +42,7 @@ func NewHandler(cfg *rest.Config, log logging.Logger, swg getter.Getter) control
 	}
 
 	return &handler{
+		pluralizer:        pluralizer,
 		logger:            log,
 		dynamicClient:     dyn,
 		discoveryClient:   dis,
@@ -49,6 +51,7 @@ func NewHandler(cfg *rest.Config, log logging.Logger, swg getter.Getter) control
 }
 
 type handler struct {
+	pluralizer        pluralizer.Pluralizer
 	logger            logging.Logger
 	dynamicClient     dynamic.Interface
 	discoveryClient   *discovery.DiscoveryClient
@@ -74,10 +77,14 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c
 		log.Debug("Swagger info is nil")
 		return controller.ExternalObservation{}, fmt.Errorf("swagger info is nil")
 	}
-	tools.Update(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: h.discoveryClient,
-		DynamicClient:   h.dynamicClient,
+	mg, err = tools.Update(ctx, mg, tools.UpdateOptions{
+		Pluralizer:    h.pluralizer,
+		DynamicClient: h.dynamicClient,
 	})
+	if err != nil {
+		log.Debug("Updating CR", "error", err)
+		return controller.ExternalObservation{}, err
+	}
 
 	cli, err := restclient.BuildClient(clientInfo.URL)
 	if err != nil {
@@ -143,13 +150,16 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c
 				log.Debug("Setting condition", "error", err)
 				return controller.ExternalObservation{}, err
 			}
+
+			_, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+				Pluralizer:    h.pluralizer,
+				DynamicClient: h.dynamicClient,
+			})
+
 			return controller.ExternalObservation{
-					ResourceExists:   true,
-					ResourceUpToDate: true,
-				}, tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-					DiscoveryClient: h.discoveryClient,
-					DynamicClient:   h.dynamicClient,
-				})
+				ResourceExists:   true,
+				ResourceUpToDate: true,
+			}, err
 		}
 		if err != nil {
 			log.Debug("Building API call", "error", err)
@@ -178,9 +188,9 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c
 			return controller.ExternalObservation{}, err
 		}
 
-		err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-			DiscoveryClient: h.discoveryClient,
-			DynamicClient:   h.dynamicClient,
+		mg, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+			Pluralizer:    h.pluralizer,
+			DynamicClient: h.dynamicClient,
 		})
 		if err != nil {
 			log.Debug("Updating status", "error", err)
@@ -208,9 +218,9 @@ func (h *handler) Observe(ctx context.Context, mg *unstructured.Unstructured) (c
 		log.Debug("Setting condition", "error", err)
 		return controller.ExternalObservation{}, err
 	}
-	err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: h.discoveryClient,
-		DynamicClient:   h.dynamicClient,
+	mg, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+		Pluralizer:    h.pluralizer,
+		DynamicClient: h.dynamicClient,
 	})
 	if err != nil {
 		log.Debug("Updating status", "error", err)
@@ -281,9 +291,10 @@ func (h *handler) Create(ctx context.Context, mg *unstructured.Unstructured) err
 		return err
 	}
 
-	err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: h.discoveryClient,
-		DynamicClient:   h.dynamicClient,
+	_, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+
+		Pluralizer:    h.pluralizer,
+		DynamicClient: h.dynamicClient,
 	})
 	if err != nil {
 		log.Debug("Updating status", "error", err)
@@ -356,18 +367,18 @@ func (h *handler) Update(ctx context.Context, mg *unstructured.Unstructured) err
 		return err
 	}
 
-	err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: h.discoveryClient,
-		DynamicClient:   h.dynamicClient,
+	mg, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+		Pluralizer:    h.pluralizer,
+		DynamicClient: h.dynamicClient,
 	})
 	if err != nil {
 		log.Debug("Updating status", "error", err)
 		return err
 	}
 
-	err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: h.discoveryClient,
-		DynamicClient:   h.dynamicClient,
+	mg, err = tools.UpdateStatus(ctx, mg, tools.UpdateOptions{
+		Pluralizer:    h.pluralizer,
+		DynamicClient: h.dynamicClient,
 	})
 	if err != nil {
 		log.Debug("Updating status", "error", err)
@@ -419,7 +430,7 @@ func (h *handler) Delete(ctx context.Context, mg *unstructured.Unstructured) err
 	apiCall, callInfo, err := APICallBuilder(cli, clientInfo, apiaction.Delete)
 	if apiCall == nil {
 		log.Debug("API call not found", "action", apiaction.Delete)
-		return removeFinalizersAndUpdate(ctx, log, h.discoveryClient, h.dynamicClient, mg)
+		return removeFinalizersAndUpdate(ctx, log, h.pluralizer, h.dynamicClient, mg)
 	}
 	if err != nil {
 		log.Debug("Building API call", "error", err)
@@ -444,5 +455,5 @@ func (h *handler) Delete(ctx context.Context, mg *unstructured.Unstructured) err
 		return err
 	}
 
-	return removeFinalizersAndUpdate(ctx, log, h.discoveryClient, h.dynamicClient, mg)
+	return removeFinalizersAndUpdate(ctx, log, h.pluralizer, h.dynamicClient, mg)
 }

internal/composition/support.go

@@ -9,14 +9,14 @@ import (
 
 	restclient "github.com/krateoplatformops/rest-dynamic-controller/internal/client"
 	"github.com/krateoplatformops/rest-dynamic-controller/internal/text"
-	"github.com/krateoplatformops/rest-dynamic-controller/internal/tools"
 	"github.com/krateoplatformops/rest-dynamic-controller/internal/tools/apiaction"
 	getter "github.com/krateoplatformops/rest-dynamic-controller/internal/tools/restclient"
 	"github.com/krateoplatformops/unstructured-runtime/pkg/logging"
+	"github.com/krateoplatformops/unstructured-runtime/pkg/pluralizer"
+	"github.com/krateoplatformops/unstructured-runtime/pkg/tools"
 	unstructuredtools "github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured"
 	"github.com/rs/zerolog/log"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/dynamic"
 )
 
@@ -257,11 +257,11 @@ func compareAny(a any, b any) bool {
 	}
 }
 
-func removeFinalizersAndUpdate(ctx context.Context, log logging.Logger, discovery *discovery.DiscoveryClient, dynamic dynamic.Interface, mg *unstructured.Unstructured) error {
+func removeFinalizersAndUpdate(ctx context.Context, log logging.Logger, pluralizer pluralizer.Pluralizer, dynamic dynamic.Interface, mg *unstructured.Unstructured) error {
 	mg.SetFinalizers([]string{})
-	err := tools.Update(ctx, mg, tools.UpdateOptions{
-		DiscoveryClient: discovery,
-		DynamicClient:   dynamic,
+	_, err := tools.Update(ctx, mg, tools.UpdateOptions{
+		Pluralizer:    pluralizer,
+		DynamicClient: dynamic,
 	})
 	if err != nil {
 		log.Debug("Deleting finalizer", "error", err)

internal/tools/tools.go

@@ -96,18 +96,19 @@ func main() {
 	if err != nil {
 		log.Debug("Creating chart url info getter.", "error", err)
 	}
-	handler = restComposition.NewHandler(cfg, log, swg)
 
 	log.WithValues("build", Build).
 		WithValues("debug", *debug).
 		WithValues("resyncInterval", *resyncInterval).
 		WithValues("group", *resourceGroup).
 		WithValues("version", *resourceVersion).
 		WithValues("resource", *resourceName).
-		Info("Starting %s.", serviceName)
+		Info("Starting.", "serviceName", serviceName)
 
 	pluralizer := pluralizer.New(urlplurals, http.DefaultClient)
 
+	handler = restComposition.NewHandler(cfg, log, swg, *pluralizer)
+
 	controller := genctrl.New(genctrl.Options{
 		Discovery:      cachedDisc,
 		Client:         dyn,