WIP tests

vshn · Jan 25, 2024 · 42217dd · 42217dd
1 parent 929dab7
commit 42217dd
Show file tree

Hide file tree

Showing 6 changed files with 177 additions and 15 deletions.
diff --git a/pkg/comp-functions/functions/common/password_test.go b/pkg/comp-functions/functions/common/password_test.go
@@ -3,6 +3,7 @@ package common
 import (
 	"testing"
 
+	xkube "github.com/crossplane-contrib/provider-kubernetes/apis/object/v1alpha1"
 	"github.com/stretchr/testify/assert"
 	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
 	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest"
@@ -29,4 +30,11 @@ func TestAddCredentialsSecret(t *testing.T) {
 	assert.Len(t, secret.StringData, 2)
 	assert.NotEmpty(t, secret.StringData["mytest"])
 	assert.NotEmpty(t, secret.StringData["mypw"])
+
+	obj := &xkube.Object{}
+
+	assert.NoError(t, svc.GetDesiredComposedResourceByName(obj, res))
+	assert.NotEmpty(t, obj.Spec.ConnectionDetails)
+	assert.Len(t, obj.Spec.ConnectionDetails, 2)
+
 }
diff --git a/pkg/comp-functions/functions/common/release.go b/pkg/comp-functions/functions/common/release.go
@@ -16,9 +16,14 @@ import (
 // GetReleaseValues returns the parsed values from the given release.
 func GetReleaseValues(r *xhelmv1.Release) (map[string]interface{}, error) {
 	values := map[string]interface{}{}
+	if r == nil {
+		return values, nil
+	}
+
 	if r.Spec.ForProvider.Values.Raw == nil {
 		return values, nil
 	}
+
 	err := json.Unmarshal(r.Spec.ForProvider.Values.Raw, &values)
 	if err != nil {
 		return nil, fmt.Errorf("cannot unmarshal values from release: %v", err)
@@ -28,26 +33,12 @@ func GetReleaseValues(r *xhelmv1.Release) (map[string]interface{}, error) {
 
 // GetObservedReleaseValues returns the observed releaseValues for the given release name.
 func GetObservedReleaseValues(svc *runtime.ServiceRuntime, releaseName string) (map[string]interface{}, error) {
-	values := map[string]interface{}{}
-
 	r, err := getObservedRelease(svc, releaseName)
 	if err != nil {
 		return nil, fmt.Errorf("cannot get observed release: %w", err)
 	}
 
-	if r == nil {
-		return values, nil
-	}
-
-	if r.Spec.ForProvider.Values.Raw == nil {
-		return values, nil
-	}
-	err = json.Unmarshal(r.Spec.ForProvider.Values.Raw, &values)
-	if err != nil {
-		return nil, fmt.Errorf("cannot unmarshal values from release: %v", err)
-	}
-
-	return values, err
+	return GetReleaseValues(r)
 }
 
 func getObservedRelease(svc *runtime.ServiceRuntime, releaseName string) (*xhelmv1.Release, error) {

diff --git a/pkg/comp-functions/functions/common/release_test.go b/pkg/comp-functions/functions/common/release_test.go
@@ -0,0 +1,18 @@
+package common
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest"
+)
+
+func TestGetObservedReleaseValues(t *testing.T) {
+	svc := commontest.LoadRuntimeFromFile(t, "common/01_release.yaml")
+
+	values, err := GetObservedReleaseValues(svc, "release")
+	assert.NoError(t, err)
+
+	assert.NotEmpty(t, values)
+
+}
diff --git a/pkg/comp-functions/functions/vshnkeycloak/deploy_test.go b/pkg/comp-functions/functions/vshnkeycloak/deploy_test.go
@@ -0,0 +1,58 @@
+package vshnkeycloak
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	vshnv1 "github.com/vshn/appcat/v4/apis/vshn/v1"
+	"github.com/vshn/appcat/v4/pkg/comp-functions/functions/commontest"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func Test_addPostgreSQL(t *testing.T) {
+
+	svc := commontest.LoadRuntimeFromFile(t, "empty.yaml")
+
+	comp := &vshnv1.VSHNKeycloak{}
+
+	assert.NoError(t, addPostgreSQL(svc, comp))
+
+	pg := &vshnv1.XVSHNPostgreSQL{}
+
+	assert.NoError(t, svc.GetDesiredComposedResourceByName(pg, comp.GetName()+pgInstanceNameSuffix))
+
+	// Assert default values
+	assert.True(t, pg.Spec.Parameters.Backup.DeletionProtection)
+	assert.Equal(t, 1, pg.Spec.Parameters.Instances)
+	assert.Equal(t, 6, pg.Spec.Parameters.Backup.Retention)
+
+	// Assert default overrides
+	comp.Spec.Parameters.Service.PostgreSQLParameters = &vshnv1.VSHNPostgreSQLParameters{
+		Backup: vshnv1.VSHNPostgreSQLBackup{
+			DeletionProtection: false,
+			Retention:          1,
+		},
+		Instances: 2,
+	}
+
+	assert.NoError(t, addPostgreSQL(svc, comp))
+	assert.NoError(t, svc.GetDesiredComposedResourceByName(pg, comp.GetName()+pgInstanceNameSuffix))
+	assert.False(t, pg.Spec.Parameters.Backup.DeletionProtection)
+	assert.Equal(t, 2, pg.Spec.Parameters.Instances)
+	assert.Equal(t, 1, pg.Spec.Parameters.Backup.Retention)
+}
+
+func Test_addRelease(t *testing.T) {
+	svc := commontest.LoadRuntimeFromFile(t, "vshnkeycloak/01_default.yaml")
+
+	comp := &vshnv1.VSHNKeycloak{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "mycloak",
+			Namespace: "default",
+		},
+	}
+
+	assert.NoError(t, addRelease(context.TODO(), svc, comp, "mysecret"))
+
+}
diff --git a/test/functions/common/01_release.yaml b/test/functions/common/01_release.yaml
@@ -0,0 +1,71 @@
+desired:
+  resources:
+    namespace:
+      resource:
+        apiVersion: kubernetes.crossplane.io/v1alpha1
+        kind: Object
+        metadata:
+          name: pgsql-gc9x4-namespace
+          namespace: test
+        spec:
+          forProvider:
+            manifest:
+              apiVersion: v1
+              data: null
+              kind: Namespace
+              metadata:
+                name: myns
+input:
+  apiVersion: v1
+  data:
+    quotasEnabled: 'true'
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    labels:
+      name: xfn-config
+    name: xfn-config
+observed:
+  composite:
+    resource:
+      apiVersion: vshn.appcat.vshn.io/v1
+      kind: XVSHNPostgreSQL
+      metadata:
+        creationTimestamp: "2023-03-21T16:52:31Z"
+        finalizers:
+        - composite.apiextensions.crossplane.io
+        generateName: pgsql-
+        generation: 13
+        labels:
+          appuio.io/organization: vshn
+          crossplane.io/claim-name: pgsql
+          crossplane.io/claim-namespace: unit-test
+          crossplane.io/composite: pgsql-gc9x4
+        name: pgsql-gc9x4
+      spec:
+        parameters: null
+        writeConnectionSecretToRef: {}
+      status:
+        instanceNamespace: my-psql
+  resources:
+    release:
+      resource:
+        apiVersion: helm.crossplane.io/v1beta1
+        kind: Release
+        spec:
+          forProvider:
+            chart:
+              name: mariadb-galera
+              repository: https://charts.bitnami.com/bitnami
+            values:
+              fullnameOverride: mariadb
+              persistence:
+                size: 50Gi
+              replicasCount: 1
+              resources:
+                limits:
+                  cpu: 1
+                  memory: 1Gi
+                requests:
+                  cpu: 1
+                  memory: 1Gi
diff --git a/test/functions/vshnkeycloak/01_default.yaml b/test/functions/vshnkeycloak/01_default.yaml
@@ -0,0 +1,16 @@
+desired: {}
+input:
+  apiVersion: v1
+  kind: ConfigMap
+  metadata:
+    annotations: {}
+    labels:
+      name: xfn-config
+    name: xfn-config
+  deta:
+    defaultPlan: standard-1
+observed:
+  resources:
+    mycloak-pg:
+      connection_details:
+        foo: YmFyCg==