test: fix race (#2)

Author: raffis

.github/workflows/pr-build.yaml

@@ -102,4 +102,5 @@ jobs:
         run: |
           kubectl -n k8sgrowthbook-system get pods
           kubectl -n k8sgrowthbook-system logs deploy/k8sgrowthbook-controller
+          kubectl -n k8sgrowthbook-system logs verify
           kubectl -n k8sgrowthbook-system get growthbookinstance -o yaml

api/v1beta1/growthbookclient_types.go

@@ -17,8 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"fmt"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -40,7 +38,7 @@ type GrowthbookClientSpec struct {
 // GetID returns the client ID which is the resource name if not overwritten by spec.ID
 func (c *GrowthbookClient) GetID() string {
 	if c.Spec.ID == "" {
-		return fmt.Sprintf("%s-%s", c.Name, c.Namespace)
+		return c.Name
 	}
 
 	return c.Spec.ID

api/v1beta1/growthbookfeature_types.go

@@ -17,8 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"fmt"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,7 +43,7 @@ var (
 // GetID returns the feature ID which is the resource name if not overwritten by spec.ID
 func (f *GrowthbookFeature) GetID() string {
 	if f.Spec.ID == "" {
-		return fmt.Sprintf("%s-%s", f.Name, f.Namespace)
+		return f.Name
 	}
 
 	return f.Spec.ID

api/v1beta1/growthbookorganization_types.go

@@ -17,8 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"fmt"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -44,7 +42,7 @@ type GrowthbookOrganizationUser struct {
 // GetID returns the organization ID which is the resource name if not overwritten by spec.ID
 func (o *GrowthbookOrganization) GetID() string {
 	if o.Spec.ID == "" {
-		return fmt.Sprintf("%s-%s", o.Name, o.Namespace)
+		return o.Name
 	}
 
 	return o.Spec.ID

api/v1beta1/growthbookuser_types.go

@@ -17,8 +17,6 @@ limitations under the License.
 package v1beta1
 
 import (
-	"fmt"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -35,7 +33,7 @@ type GrowthbookUserSpec struct {
 // GetID returns the organization ID which is the resource name if not overwritten by spec.ID
 func (u *GrowthbookUser) GetID() string {
 	if u.Spec.ID == "" {
-		return fmt.Sprintf("%s-%s", u.Name, u.Namespace)
+		return u.Name
 	}
 
 	return u.Spec.ID

config/tests/base/verify.yaml

@@ -14,7 +14,7 @@ spec:
     - /bin/sh
     - "-c"
     - |
-      curl --fail -vvv http://growthbook-api/api/features/sdk-token | grep '{"status":200,"features":{"feature-a-k8sgrowthbook-system":{"defaultValue":true},"feature-b-k8sgrowthbook-system":{"defaultValue":false}}'
+      curl --fail -vvv http://growthbook-api/api/features/sdk-token | grep '{"status":200,"features":{"feature-b":{"defaultValue":true},"feature-a":{"defaultValue":false}}\|{"status":200,"features":{"feature-a":{"defaultValue":true},"feature-b":{"defaultValue":false}}'
     resources: {}
     securityContext:
       allowPrivilegeEscalation: false
@@ -24,7 +24,3 @@ spec:
       runAsUser: 1000
     terminationMessagePath: /dev/termination-log
     terminationMessagePolicy: File
-  dnsPolicy: ClusterFirst
-  enableServiceLinks: true
-  nodeName: rageta-control-plane
-  preemptionPolicy: PreemptLowerPriority

go.mod

@@ -10,6 +10,7 @@ require (
 	github.com/spf13/viper v1.15.0
 	go.mongodb.org/mongo-driver v1.11.7
 	golang.org/x/crypto v0.1.0
+	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1
 	k8s.io/api v0.26.3
 	k8s.io/apimachinery v0.26.3
 	k8s.io/client-go v0.26.3

go.sum

@@ -374,6 +374,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
+golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

internal/controllers/instance_controller.go

@@ -27,6 +27,7 @@ import (
 	"github.com/go-logr/logr"
 	"go.mongodb.org/mongo-driver/mongo"
 	"go.mongodb.org/mongo-driver/mongo/options"
+	"golang.org/x/exp/slices"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -302,12 +303,12 @@ func (r *GrowthbookInstanceReconciler) Reconcile(ctx context.Context, req ctrl.R
 }
 
 func (r *GrowthbookInstanceReconciler) reconcile(ctx context.Context, instance v1beta1.GrowthbookInstance, logger logr.Logger) (v1beta1.GrowthbookInstance, error) {
-	msg := "reconcile instance progressing"
+	/*msg := "reconcile instance progressing"
 	r.Recorder.Event(&instance, "Normal", "info", msg)
 	instance = v1beta1.GrowthbookInstanceNotReady(instance, v1beta1.ProgressingReason, msg)
 	if err := r.patchStatus(ctx, &instance); err != nil {
 		return instance, err
-	}
+	}*/
 
 	var err error
 	var usr, pw string
@@ -363,11 +364,7 @@ func (r *GrowthbookInstanceReconciler) reconcileOrganizations(ctx context.Contex
 	}
 
 	for _, org := range orgs.Items {
-		instance.Status.SubResourceCatalog = append(instance.Status.SubResourceCatalog, v1beta1.ResourceReference{
-			Kind:       org.Kind,
-			Name:       org.Name,
-			APIVersion: org.APIVersion,
-		})
+		instance = updateResourceCatalog(instance, &org)
 	}
 
 	for _, org := range orgs.Items {
@@ -423,11 +420,7 @@ func (r *GrowthbookInstanceReconciler) reconcileFeatures(ctx context.Context, in
 	}
 
 	for _, feature := range features.Items {
-		instance.Status.SubResourceCatalog = append(instance.Status.SubResourceCatalog, v1beta1.ResourceReference{
-			Kind:       feature.Kind,
-			Name:       feature.Name,
-			APIVersion: feature.APIVersion,
-		})
+		instance = updateResourceCatalog(instance, &feature)
 	}
 
 	for _, feature := range features.Items {
@@ -459,11 +452,7 @@ func (r *GrowthbookInstanceReconciler) reconcileUsers(ctx context.Context, insta
 	}
 
 	for _, user := range users.Items {
-		instance.Status.SubResourceCatalog = append(instance.Status.SubResourceCatalog, v1beta1.ResourceReference{
-			Kind:       user.Kind,
-			Name:       user.Name,
-			APIVersion: user.APIVersion,
-		})
+		instance = updateResourceCatalog(instance, &user)
 	}
 
 	for _, user := range users.Items {
@@ -510,11 +499,7 @@ func (r *GrowthbookInstanceReconciler) reconcileClients(ctx context.Context, ins
 	}
 
 	for _, client := range clients.Items {
-		instance.Status.SubResourceCatalog = append(instance.Status.SubResourceCatalog, v1beta1.ResourceReference{
-			Kind:       client.Kind,
-			Name:       client.Name,
-			APIVersion: client.APIVersion,
-		})
+		instance = updateResourceCatalog(instance, &client)
 	}
 
 	for _, client := range clients.Items {
@@ -579,6 +564,20 @@ func (r *GrowthbookInstanceReconciler) getClientToken(ctx context.Context, clien
 	}
 }
 
+func updateResourceCatalog(instance v1beta1.GrowthbookInstance, resource client.Object) v1beta1.GrowthbookInstance {
+	resRef := v1beta1.ResourceReference{
+		Kind:       resource.GetObjectKind().GroupVersionKind().Kind,
+		Name:       resource.GetName(),
+		APIVersion: fmt.Sprintf("%s/%s", resource.GetObjectKind().GroupVersionKind().Group, resource.GetObjectKind().GroupVersionKind().Version),
+	}
+
+	if !slices.Contains(instance.Status.SubResourceCatalog, resRef) {
+		instance.Status.SubResourceCatalog = append(instance.Status.SubResourceCatalog, resRef)
+	}
+
+	return instance
+}
+
 func (r *GrowthbookInstanceReconciler) getUsernamePassword(ctx context.Context, instance v1beta1.GrowthbookInstance, secretReference *v1beta1.SecretReference) (string, string, error) {
 	if secretReference == nil {
 		return "", "", errors.New("no secret reference provided")