rebase and fix unit tests

Author: shubham-pampattiwar

controllers/registry_test.go

@@ -1938,7 +1938,7 @@ func Test_replaceCarriageReturn(t *testing.T) {
 		{
 			name: "Given secret data with carriage return, carriage return is replaced with new line",
 			args: args{
-				data: secretDataWithCarriageReturnInSecret,
+				data:   secretDataWithCarriageReturnInSecret,
 				logger: logr.FromContextOrDiscard(context.TODO()),
 			},
 			want: secretDataWithEqualInSecret,

controllers/velero_test.go

@@ -646,6 +646,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 							"app.kubernetes.io/managed-by": common.OADPOperator,
 							"app.kubernetes.io/component":  Server,
 							oadpv1alpha1.OadpOperatorLabel: "True",
+							"component":                    "velero",
 						},
 					},
 				},
@@ -693,6 +694,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 						"app.kubernetes.io/managed-by": common.OADPOperator,
 						"app.kubernetes.io/component":  Server,
 						oadpv1alpha1.OadpOperatorLabel: "True",
+						"component":                    "velero",
 					},
 				},
 				TypeMeta: metav1.TypeMeta{
@@ -707,6 +709,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 							"app.kubernetes.io/managed-by": common.OADPOperator,
 							"app.kubernetes.io/component":  Server,
 							oadpv1alpha1.OadpOperatorLabel: "True",
+							"component":                    "velero",
 						},
 					},
 					Replicas: pointer.Int32(1),
@@ -718,6 +721,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 								"app.kubernetes.io/managed-by": common.OADPOperator,
 								"app.kubernetes.io/component":  Server,
 								oadpv1alpha1.OadpOperatorLabel: "True",
+								"component":                    "velero",
 							},
 							Annotations: map[string]string{
 								"prometheus.io/scrape": "true",
@@ -841,6 +845,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 							"app.kubernetes.io/managed-by": common.OADPOperator,
 							"app.kubernetes.io/component":  Server,
 							oadpv1alpha1.OadpOperatorLabel: "True",
+							"component":                    "velero",
 						},
 					},
 				},
@@ -883,6 +888,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 						"app.kubernetes.io/managed-by": common.OADPOperator,
 						"app.kubernetes.io/component":  Server,
 						oadpv1alpha1.OadpOperatorLabel: "True",
+						"component":                    "velero",
 					},
 				},
 				TypeMeta: metav1.TypeMeta{
@@ -897,6 +903,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 							"app.kubernetes.io/managed-by": common.OADPOperator,
 							"app.kubernetes.io/component":  Server,
 							oadpv1alpha1.OadpOperatorLabel: "True",
+							"component":                    "velero",
 						},
 					},
 					Replicas: pointer.Int32(1),
@@ -908,6 +915,7 @@ func TestDPAReconciler_buildVeleroDeployment(t *testing.T) {
 								"app.kubernetes.io/managed-by": common.OADPOperator,
 								"app.kubernetes.io/component":  Server,
 								oadpv1alpha1.OadpOperatorLabel: "True",
+								"component":                    "velero",
 							},
 							Annotations: map[string]string{
 								"prometheus.io/scrape": "true",

tests/e2e/dpa_deployment_suite_test.go

@@ -23,11 +23,11 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 	bslConfig := Dpa.Spec.BackupLocations[0].Velero.Config
 
 	type InstallCase struct {
-		Name         string
-		BRestoreType BackupRestoreType
-		DpaSpec      *oadpv1alpha1.DataProtectionApplicationSpec
+		Name               string
+		BRestoreType       BackupRestoreType
+		DpaSpec            *oadpv1alpha1.DataProtectionApplicationSpec
 		TestCarriageReturn bool
-		WantError    bool
+		WantError          bool
 	}
 
 	genericTests := []TableEntry{
@@ -64,8 +64,8 @@ var _ = Describe("Configuration testing for DPA Custom Resource", func() {
 			WantError: false,
 		}, nil),
 		Entry("Default velero CR, test carriage return", InstallCase{
-			Name:         "default-cr",
-			BRestoreType: RESTIC,
+			Name:               "default-cr",
+			BRestoreType:       RESTIC,
 			TestCarriageReturn: true,
 			DpaSpec: &oadpv1alpha1.DataProtectionApplicationSpec{
 				Configuration: &oadpv1alpha1.ApplicationConfig{

tests/e2e/lib/dpa_helpers.go

@@ -148,7 +148,7 @@ func (v *DpaCustomResource) CreateOrUpdate(spec *oadpv1alpha1.DataProtectionAppl
 func (v *DpaCustomResource) CreateOrUpdateWithRetries(spec *oadpv1alpha1.DataProtectionApplicationSpec, retries int) error {
 	var (
 		err error
-		cr *oadpv1alpha1.DataProtectionApplication
+		cr  *oadpv1alpha1.DataProtectionApplication
 	)
 	for i := 0; i < retries; i++ {
 		if cr, err = v.Get(); apierrors.IsNotFound(err) {
@@ -159,9 +159,9 @@ func (v *DpaCustomResource) CreateOrUpdateWithRetries(spec *oadpv1alpha1.DataPro
 			return err
 		}
 		cr.Spec = *spec
-		if err = v.Client.Update(context.Background(), cr); err != nil{
+		if err = v.Client.Update(context.Background(), cr); err != nil {
 			if apierrors.IsConflict(err) && i < retries-1 {
-				log.Println("conflict detected during DPA CreateOrUpdate, retrying for ", retries - i - 1 , " more times")
+				log.Println("conflict detected during DPA CreateOrUpdate, retrying for ", retries-i-1, " more times")
 				time.Sleep(time.Second * 2)
 				continue
 			}