Fixed unit test 'TestCreate' and added other test

Author: adshin21

pkg/cluster/cluster.go

@@ -33,6 +33,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
+	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/rest"
@@ -432,7 +433,6 @@ func (c *Cluster) Create() (err error) {
 		c.logger.Errorf("could not list resources: %v", err)
 	}
 
-
 	if err := c.updatePITRResources(PitrStateLabelValueFinished); err != nil {
 		return fmt.Errorf("could not update pitr resources: %v", err)
 	}
@@ -453,6 +453,10 @@ func (c *Cluster) updatePITRResources(state string) error {
 
 	data, _ := json.Marshal(patchPayload)
 	if _, err := c.KubeClient.ConfigMaps(cmNamespace).Patch(context.TODO(), cmName, types.MergePatchType, data, metav1.PatchOptions{}, ""); err != nil {
+		// If ConfigMap doesn't exist, this is a normal cluster creation (not a restore-in-place)
+		if k8serrors.IsNotFound(err) {
+			return nil
+		}
 		c.logger.Errorf("restore-in-place: error updating config map label to state: %v", err)
 		return err
 	}

pkg/cluster/cluster_test.go

@@ -24,7 +24,9 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
+	k8stesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
 )
 
@@ -94,6 +96,7 @@ func TestCreate(t *testing.T) {
 	clusterNamespace := "test"
 
 	client := k8sutil.KubernetesClient{
+		ConfigMapsGetter:             clientSet.CoreV1(),
 		DeploymentsGetter:            clientSet.AppsV1(),
 		CronJobsGetter:               clientSet.BatchV1(),
 		EndpointsGetter:              clientSet.CoreV1(),
@@ -2202,3 +2205,120 @@ func TestGetSwitchoverSchedule(t *testing.T) {
 		})
 	}
 }
+
+func TestUpdatePITRResources(t *testing.T) {
+	clusterName := "test-cluster"
+	clusterNamespace := "default"
+
+	tests := []struct {
+		name          string
+		state         string
+		cmExists      bool
+		patchFails    bool
+		expectedErr   bool
+		expectedLabel string
+	}{
+		{
+			"successful patch - update label to finished",
+			PitrStateLabelValueFinished,
+			true,
+			false,
+			false,
+			PitrStateLabelValueFinished,
+		},
+		{
+			"successful patch - update label to in-progress",
+			PitrStateLabelValueInProgress,
+			true,
+			false,
+			false,
+			PitrStateLabelValueInProgress,
+		},
+		{
+			"config map does not exist - no error",
+			PitrStateLabelValueFinished,
+			false,
+			false,
+			false,
+			"",
+		},
+		{
+			"patch fails with non-NotFound error",
+			PitrStateLabelValueFinished,
+			true,
+			true,
+			true,
+			"",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			clientSet := fake.NewSimpleClientset()
+			acidClientSet := fakeacidv1.NewSimpleClientset()
+
+			if tt.cmExists {
+				cmName := fmt.Sprintf(PitrConfigMapNameTemplate, clusterName)
+				cm := &v1.ConfigMap{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      cmName,
+						Namespace: clusterNamespace,
+						Labels: map[string]string{
+							PitrStateLabelKey: PitrStateLabelValuePending,
+						},
+					},
+				}
+				_, err := clientSet.CoreV1().ConfigMaps(clusterNamespace).Create(context.TODO(), cm, metav1.CreateOptions{})
+				if err != nil {
+					t.Fatalf("could not create configmap: %v", err)
+				}
+			}
+
+			if tt.patchFails {
+				clientSet.PrependReactor("patch", "configmaps", func(action k8stesting.Action) (handled bool, ret runtime.Object, err error) {
+					return true, nil, fmt.Errorf("synthetic patch error")
+				})
+			}
+
+			client := k8sutil.KubernetesClient{
+				ConfigMapsGetter:  clientSet.CoreV1(),
+				PostgresqlsGetter: acidClientSet.AcidV1(),
+			}
+
+			pg := acidv1.Postgresql{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      clusterName,
+					Namespace: clusterNamespace,
+				},
+			}
+
+			cluster := New(
+				Config{
+					OpConfig: config.Config{
+						PodManagementPolicy: "ordered_ready",
+					},
+				}, client, pg, logger, eventRecorder)
+
+			err := cluster.updatePITRResources(tt.state)
+
+			if err != nil {
+				if !tt.expectedErr {
+					t.Fatalf("unexpected error: %v", err)
+				}
+			} else if tt.expectedErr {
+				t.Fatalf("expected error, but got none")
+			}
+
+			if tt.cmExists && !tt.patchFails && tt.expectedLabel != "" {
+				cmName := fmt.Sprintf(PitrConfigMapNameTemplate, clusterName)
+				updatedCm, err := clientSet.CoreV1().ConfigMaps(clusterNamespace).Get(context.TODO(), cmName, metav1.GetOptions{})
+				if err != nil {
+					t.Fatalf("could not get configmap: %v", err)
+				}
+				if updatedCm.Labels[PitrStateLabelKey] != tt.expectedLabel {
+					t.Errorf("expected label %q but got %q", tt.expectedLabel, updatedCm.Labels[PitrStateLabelKey])
+				}
+			}
+		})
+	}
+}