feat: bump unstructured-runtime to v0.0.9 and add pluralizer integration on getter (#14)

Author: matteogastaldello

go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	github.com/gobuffalo/flect v1.0.2
-	github.com/krateoplatformops/unstructured-runtime v0.0.5
+	github.com/krateoplatformops/unstructured-runtime v0.0.9
 	github.com/lucasepe/httplib v0.2.2
 	github.com/pb33f/libopenapi v0.16.8
 	github.com/rs/zerolog v1.32.0

go.sum

@@ -90,8 +90,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/krateoplatformops/unstructured-runtime v0.0.5 h1:SkVq2Vsn2hxrUQHTm2kzMpEMBJQ6dX/phcRWY2N8OFY=
-github.com/krateoplatformops/unstructured-runtime v0.0.5/go.mod h1:dPFgw3ZWKwmwSXduFWhq4aPf2Q8Kb2SoUlEXE0/Y+Q8=
+github.com/krateoplatformops/unstructured-runtime v0.0.9 h1:sjo7hQ3ubTbaJgHOheYCeZN9cS6+VsFJn24j19wjr/w=
+github.com/krateoplatformops/unstructured-runtime v0.0.9/go.mod h1:B2QCsbn9XvgSdIj+Q4JMDYt7juHskkJ5ItGg3qBmJFo=
 github.com/lucasepe/httplib v0.2.2 h1:Ns9CVumtlVcG6W3kwhOT8bG6Sr9/nOo0DYg00444ywI=
 github.com/lucasepe/httplib v0.2.2/go.mod h1:Elmrrzp7dQoKSldJhK5lcwH8nNn98ohrwg8nZgkJAn0=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=

internal/tools/restclient/getter.go

@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gobuffalo/flect"
 	restclient "github.com/krateoplatformops/rest-dynamic-controller/internal/client"
 	"github.com/krateoplatformops/rest-dynamic-controller/internal/text"
+	"github.com/krateoplatformops/unstructured-runtime/pkg/pluralizer"
 	unstructuredtools "github.com/krateoplatformops/unstructured-runtime/pkg/tools/unstructured"
 	"github.com/lucasepe/httplib"
 
@@ -84,13 +84,14 @@ func Static(chart string) Getter {
 	return staticGetter{chartName: chart}
 }
 
-func Dynamic(cfg *rest.Config) (Getter, error) {
+func Dynamic(cfg *rest.Config, pluralizer pluralizer.PluralizerInterface) (Getter, error) {
 	dyn, err := dynamic.NewForConfig(cfg)
 	if err != nil {
 		return nil, err
 	}
 
 	return &dynamicGetter{
+		pluralizer:    pluralizer,
 		dynamicClient: dyn,
 	}, nil
 }
@@ -111,19 +112,15 @@ var _ Getter = (*dynamicGetter)(nil)
 
 type dynamicGetter struct {
 	dynamicClient dynamic.Interface
+	pluralizer    pluralizer.PluralizerInterface
 }
 
 func (g *dynamicGetter) Get(un *unstructured.Unstructured) (*Info, error) {
-	gvr, err := unstructuredtools.GVR(un)
+	gvr, err := g.pluralizer.GVKtoGVR(un.GroupVersionKind())
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error getting GVR for '%v' in namespace: %s", un.GetKind(), un.GetNamespace())
 	}
 
-	// sel, err := selectorForGroup(gvr)
-	// if err != nil {
-	// 	return nil, err
-	// }
-
 	gvrForDefinitions := schema.GroupVersionResource{
 		Group:    "swaggergen.krateo.io",
 		Version:  "v1alpha1",
@@ -134,7 +131,7 @@ func (g *dynamicGetter) Get(un *unstructured.Unstructured) (*Info, error) {
 		Namespace(un.GetNamespace()).
 		List(context.Background(), metav1.ListOptions{})
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error getting definitions for '%v' in namespace: %s - %w", gvr.String(), un.GetNamespace(), err)
 	}
 	if len(all.Items) == 0 {
 		return nil, fmt.Errorf("no definitions found for '%v' in namespace: %s", gvr, un.GetNamespace())
@@ -240,17 +237,22 @@ func (g *dynamicGetter) getAuth(un *unstructured.Unstructured) (httplib.AuthMeth
 		}
 	}
 
-	gvrForAuthentication := schema.GroupVersionResource{
-		Group:    gvr.Group,
-		Version:  "v1alpha1",
-		Resource: strings.ToLower(flect.Pluralize(fmt.Sprintf("%sAuth", text.ToGolangName(authType.String())))),
+	gvkForAuthentication := schema.GroupVersionKind{
+		Group:   gvr.Group,
+		Version: "v1alpha1",
+		Kind:    fmt.Sprintf("%sAuth", text.ToGolangName(authType.String())),
+	}
+
+	gvrForAuthentication, err := g.pluralizer.GVKtoGVR(gvkForAuthentication)
+	if err != nil {
+		return nil, fmt.Errorf("error getting GVR for '%v' in namespace: %s", gvkForAuthentication.Kind, un.GetNamespace())
 	}
 
 	auth, err := g.dynamicClient.Resource(gvrForAuthentication).
 		Namespace(un.GetNamespace()).
 		Get(context.Background(), authRef, metav1.GetOptions{})
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("error getting authentication for '%v' in namespace: %s - %w", gvr, un.GetNamespace(), err)
 	}
 
 	return parseAuthentication(auth, authType, g.dynamicClient)

main.go

@@ -91,8 +91,9 @@ func main() {
 
 	var handler controller.ExternalClient
 
+	pluralizer := pluralizer.New(urlplurals, http.DefaultClient)
 	var swg getter.Getter
-	swg, err = getter.Dynamic(cfg)
+	swg, err = getter.Dynamic(cfg, pluralizer)
 	if err != nil {
 		log.Debug("Creating chart url info getter.", "error", err)
 	}
@@ -105,8 +106,6 @@ func main() {
 		WithValues("resource", *resourceName).
 		Info("Starting.", "serviceName", serviceName)
 
-	pluralizer := pluralizer.New(urlplurals, http.DefaultClient)
-
 	handler = restResources.NewHandler(cfg, log, swg, *pluralizer)
 
 	controller := genctrl.New(genctrl.Options{