Use proper plural names for XRDs (#27)

Fixes #25

Author: undera

Contributing.md

@@ -2,7 +2,11 @@
 
 ## Finding What to Contribute
 
-[Roadmap](Roadmap.md) document contains some notes and ideas on what can be done to improve the project. Those may be not very clear, that's how OSS ideas start. Raise the question in Slack about particular item that attracked your attention to get more explanation.
+[Roadmap](Roadmap.md) document contains some notes and ideas on what can be done to improve the project. Those may be not very clear, that's how OSS ideas start.
+
+Another good source of small tasks is to search through code for `TODO` and `FIXME` comments.
+
+Raise the question in Slack about particular item that attracked your attention to get more explanation.
 
 ## Setting Up For Local Development
 
@@ -12,4 +16,6 @@ First you need to build frontend (the API backend won't compile without that). T
 
 To build API backend, run `go build -o bin/komoplane .` in the project root.
 
-For frontend development, start API backend with command `bin/komoplane`, then run `npm run dev` inside `pkg/frontend`. Open the suggested URL in your browser.
+For frontend development, start API backend with command `bin/komoplane`, then run `npm run dev` inside `pkg/frontend`. Open the suggested URL in your browser.
+
+You can then restart/debug backend without restarting frontend.

examples/issue25.yaml

@@ -0,0 +1,25 @@
+---
+apiVersion: apiextensions.crossplane.io/v1
+kind: CompositeResourceDefinition
+metadata:
+  name: aks.foo.com
+spec:
+  group: foo.com
+  names:
+    kind: Aks
+    listKind: AksList
+    plural: aks
+    singular: aks
+  versions:
+    - name: v1alpha1
+      served: true
+      referenceable: true
+      schema:
+        openAPIV3Schema:
+          type: object
+---
+apiVersion: foo.com/v1alpha1
+kind: Aks # Direct XR-style
+metadata:
+  name: reproduce-issue-25
+spec: {}

pkg/backend/controller.go

@@ -509,11 +509,12 @@ func (c *Controller) GetComposite(ec echo.Context) error {
 
 		// composition ref
 		compRef := xr.GetCompositionReference()
-		compRef.SetGroupVersionKind(v13.CompositionGroupVersionKind)
-
-		comp := uxres.New()
-		_ = c.getDynamicResource(compRef, comp)
-		xr.Object["composition"] = comp
+		if compRef != nil {
+			compRef.SetGroupVersionKind(v13.CompositionGroupVersionKind)
+			comp := uxres.New()
+			_ = c.getDynamicResource(compRef, comp)
+			xr.Object["composition"] = comp
+		}
 
 		// MR refs
 		MRs := []*ManagedUnstructured{}
@@ -558,7 +559,7 @@ func NewController(ctx context.Context, cfg *rest.Config, ns string, version str
 		ExtV1:  ext,
 		Events: evt,
 		apiExt: apiExt,
-		CRDs:   crossplane.NewCRDsClient(cfg),
+		CRDs:   crossplane.NewCRDsClient(cfg, ext),
 		StatusInfo: StatusInfo{
 			CurVer: version,
 		},

pkg/backend/crossplane/crds.go

@@ -3,6 +3,8 @@ package crossplane
 import (
 	"context"
 	"github.com/crossplane/crossplane-runtime/pkg/resource"
+	"github.com/komodorio/komoplane/pkg/backend/utils"
+	log "github.com/sirupsen/logrus"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -16,7 +18,8 @@ type CRDInterface interface {
 }
 
 type crdClient struct {
-	cfg *rest.Config
+	cfg   *rest.Config
+	ExtV1 *ExtensionsV1Client
 }
 
 func (c *crdClient) Get(ctx context.Context, result resource.Object, ref *v1.ObjectReference) error {
@@ -27,6 +30,11 @@ func (c *crdClient) Get(ctx context.Context, result resource.Object, ref *v1.Obj
 	config.NegotiatedSerializer = scheme.Codecs.WithoutConversion()
 	config.UserAgent = rest.DefaultKubernetesUserAgent()
 
+	plural, err := c.getPluralKind(ctx, ref)
+	if err != nil {
+		return err
+	}
+
 	client, err := rest.RESTClientFor(&config)
 	if err != nil {
 		return err
@@ -35,7 +43,7 @@ func (c *crdClient) Get(ctx context.Context, result resource.Object, ref *v1.Obj
 	err = client.
 		Get().
 		NamespaceIfScoped(ref.Namespace, ref.Namespace != "").Name(ref.Name).
-		Resource(ref.Kind + "s"). // TODO: better way to pluralize?
+		Resource(plural).
 		Do(ctx).
 		Into(result)
 
@@ -64,8 +72,25 @@ func (c *crdClient) List(ctx context.Context, gvk schema.GroupVersionKind) (*uns
 	return &result, err
 }
 
-func NewCRDsClient(cfg *rest.Config) CRDInterface {
+func (c *crdClient) getPluralKind(ctx context.Context, ref *v1.ObjectReference) (string, error) {
+	xrds, err := c.ExtV1.XRDs().List(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	for _, xrd := range xrds.Items {
+		if xrd.Spec.Names.Kind == ref.Kind && xrd.Spec.Group == ref.GroupVersionKind().Group {
+			return xrd.Spec.Names.Plural, nil
+		}
+	}
+
+	log.Debugf("Could not find plural for kind '%s', defaulted to -s suffix", ref.Kind)
+	return utils.Plural(ref.Kind), nil // poor man's fallback
+}
+
+func NewCRDsClient(cfg *rest.Config, ext *ExtensionsV1Client) CRDInterface {
 	return &crdClient{
-		cfg: cfg,
+		cfg:   cfg,
+		ExtV1: ext,
 	}
 }

pkg/frontend/src/components/CompositeResourcesList.tsx

@@ -18,16 +18,16 @@ type ItemProps = {
 
 function ListItem({item, onItemClick}: ItemProps) {
     return (
-        <Grid item xs={12} md={12} key={item.metadata.name} onClick={() => {
+        <Grid item xs={12} md={12} key={item.apiVersion + item.kind + item.metadata.name} onClick={() => {
             onItemClick(item)
         }}>
             <Card variant="outlined" className="cursor-pointer">
                 <CardContent>
                     <Typography variant="h6">{item.metadata.name}</Typography>
                     <Typography variant="body1">Kind: {item.kind}</Typography>
                     <Typography variant="body1">Group: {item.apiVersion}</Typography>
-                    <Typography variant="body1">Composition: {item.spec.compositionRef.name}</Typography>
-                    <Typography variant="body1">Composed resources: {item.spec.resourceRefs.length}</Typography>
+                    <Typography variant="body1">Composition: {item.spec.compositionRef?.name}</Typography>
+                    <Typography variant="body1">Composed resources: {item.spec.resourceRefs?.length}</Typography>
                     <ReadySynced status={item.status}></ReadySynced>
                 </CardContent>
             </Card>

pkg/frontend/src/components/graph/data.ts

@@ -30,7 +30,7 @@ export class GraphData {
             id: (++this.id).toString(),
             type: ntype,
             data: {
-                label: res.metadata.name,
+                label: res?.metadata.name,
                 status: status[0],
                 statusMsg: status[1],
                 main: isMain,
@@ -79,6 +79,10 @@ export class GraphData {
 
     private getStatus(res: K8sResource): [NodeStatus, string] {
         logger.log("get status from", res)
+        if (!res) {
+            return [NodeStatus.NotFound, "Not Specified"]
+        }
+
         const problems: { [key: string]: string } = {}
 
         res.status?.conditions?.forEach((element) => {