From eacb11a274b0b906f5daf480dd1997343960dec4 Mon Sep 17 00:00:00 2001
From: Felix Kunde <felix-kunde@gmx.de>
Date: Fri, 6 Nov 2020 12:19:42 +0100
Subject: [PATCH] add unit test for PVC resizing

---
 pkg/cluster/cluster.go      |   2 +-
 pkg/cluster/volumes.go      |   2 +-
 pkg/cluster/volumes_test.go | 111 ++++++++++++++++++++++++++++++++++++
 3 files changed, 113 insertions(+), 2 deletions(-)
 create mode 100644 pkg/cluster/volumes_test.go

diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
index 595919d19..20ee68dc3 100644
--- a/pkg/cluster/cluster.go
+++ b/pkg/cluster/cluster.go
@@ -140,7 +140,7 @@ func New(cfg Config, kubeClient k8sutil.KubernetesClient, pgSpec acidv1.Postgres
 			Secrets:   make(map[types.UID]*v1.Secret),
 			Services:  make(map[PostgresRole]*v1.Service),
 			Endpoints: make(map[PostgresRole]*v1.Endpoints)},
-		userSyncStrategy: users.DefaultUserSyncStrategy{password_encryption},
+		userSyncStrategy: users.DefaultUserSyncStrategy{PasswordEncryption: password_encryption},
 		deleteOptions:    metav1.DeleteOptions{PropagationPolicy: &deletePropagationPolicy},
 		podEventsQueue:   podEventsQueue,
 		KubeClient:       kubeClient,
diff --git a/pkg/cluster/volumes.go b/pkg/cluster/volumes.go
index d5c08c2e2..44b85663f 100644
--- a/pkg/cluster/volumes.go
+++ b/pkg/cluster/volumes.go
@@ -62,7 +62,7 @@ func (c *Cluster) resizeVolumeClaims(newVolume acidv1.Volume) error {
 	if err != nil {
 		return fmt.Errorf("could not parse volume size: %v", err)
 	}
-	_, newSize, err := c.listVolumesWithManifestSize(newVolume)
+	newSize := quantityToGigabyte(newQuantity)
 	for _, pvc := range pvcs {
 		volumeSize := quantityToGigabyte(pvc.Spec.Resources.Requests[v1.ResourceStorage])
 		if volumeSize >= newSize {
diff --git a/pkg/cluster/volumes_test.go b/pkg/cluster/volumes_test.go
new file mode 100644
index 000000000..1a1073603
--- /dev/null
+++ b/pkg/cluster/volumes_test.go
@@ -0,0 +1,111 @@
+package cluster
+
+import (
+	"testing"
+
+	"context"
+
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/stretchr/testify/assert"
+	acidv1 "github.com/zalando/postgres-operator/pkg/apis/acid.zalan.do/v1"
+	"github.com/zalando/postgres-operator/pkg/util/config"
+	"github.com/zalando/postgres-operator/pkg/util/k8sutil"
+	"k8s.io/client-go/kubernetes/fake"
+)
+
+func NewFakeKubernetesClient() (k8sutil.KubernetesClient, *fake.Clientset) {
+	clientSet := fake.NewSimpleClientset()
+
+	return k8sutil.KubernetesClient{
+		PersistentVolumeClaimsGetter: clientSet.CoreV1(),
+	}, clientSet
+}
+
+func TestResizeVolumeClaim(t *testing.T) {
+	testName := "test resizing of persistent volume claims"
+	client, _ := NewFakeKubernetesClient()
+	clusterName := "acid-test-cluster"
+	namespace := "default"
+	newVolumeSize := "2Gi"
+
+	// new cluster with pvc resize mode and configured labels
+	var cluster = New(
+		Config{
+			OpConfig: config.Config{
+				Resources: config.Resources{
+					ClusterLabels:    map[string]string{"application": "spilo"},
+					ClusterNameLabel: "cluster-name",
+				},
+				StorageResizeMode: "pvc",
+			},
+		}, client, acidv1.Postgresql{}, logger, eventRecorder)
+
+	// set metadata, so that labels will get correct values
+	cluster.Name = clusterName
+	cluster.Namespace = namespace
+	filterLabels := cluster.labelsSet(false)
+
+	// define and create PVCs for 1Gi volumes
+	parsedStorage, err := resource.ParseQuantity("1Gi")
+	assert.NoError(t, err)
+
+	pvcList := &v1.PersistentVolumeClaimList{
+		Items: []v1.PersistentVolumeClaim{
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "pgdata-" + clusterName + "-0",
+					Namespace: namespace,
+					Labels:    filterLabels,
+				},
+				Spec: v1.PersistentVolumeClaimSpec{
+					Resources: v1.ResourceRequirements{
+						Requests: v1.ResourceList{
+							v1.ResourceStorage: parsedStorage,
+						},
+					},
+				},
+			},
+			{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      "pgdata-" + clusterName + "-1",
+					Namespace: namespace,
+					Labels:    filterLabels,
+				},
+				Spec: v1.PersistentVolumeClaimSpec{
+					Resources: v1.ResourceRequirements{
+						Requests: v1.ResourceList{
+							v1.ResourceStorage: parsedStorage,
+						},
+					},
+				},
+			},
+		},
+	}
+
+	for _, pvc := range pvcList.Items {
+		cluster.KubeClient.PersistentVolumeClaims(namespace).Create(context.TODO(), &pvc, metav1.CreateOptions{})
+	}
+
+	// test resizing
+	cluster.resizeVolumeClaims(acidv1.Volume{Size: newVolumeSize})
+
+	pvcs, err := cluster.listPersistentVolumeClaims()
+	assert.NoError(t, err)
+
+	if len(pvcs) != len(pvcList.Items) {
+		t.Errorf("%s: could not find all PVCs, got %v, expected %v", testName, len(pvcs), len(pvcList.Items))
+	}
+
+	for _, pvc := range pvcs {
+		newStorageSize := quantityToGigabyte(pvc.Spec.Resources.Requests[v1.ResourceStorage])
+		expectedQuantity, err := resource.ParseQuantity(newVolumeSize)
+		assert.NoError(t, err)
+		expectedSize := quantityToGigabyte(expectedQuantity)
+		if newStorageSize != expectedSize {
+			t.Errorf("%s: resizing failed, got %v, expected %v", testName, newStorageSize, expectedSize)
+		}
+	}
+}