rename field

Signed-off-by: Ashish Amarnath <ashisham@vmware.com>

pkg/controller/backup_controller_test.go

@@ -340,20 +340,20 @@ func TestProcessBackupCompletions(t *testing.T) {
 	timestamp := metav1.NewTime(now)
 
 	tests := []struct {
-		name                string
-		backup              *velerov1api.Backup
-		backupLocation      *velerov1api.BackupStorageLocation
-		defaultRestic       bool
-		expectedResult      *velerov1api.Backup
-		backupExists        bool
-		existenceCheckError error
+		name                   string
+		backup                 *velerov1api.Backup
+		backupLocation         *velerov1api.BackupStorageLocation
+		defaultVolumesToRestic bool
+		expectedResult         *velerov1api.Backup
+		backupExists           bool
+		existenceCheckError    error
 	}{
 		// Completed
 		{
-			name:           "backup with no backup location gets the default",
-			backup:         defaultBackup().Result(),
-			backupLocation: defaultBackupLocation,
-			defaultRestic:  true,
+			name:                   "backup with no backup location gets the default",
+			backup:                 defaultBackup().Result(),
+			backupLocation:         defaultBackupLocation,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -372,8 +372,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -386,10 +386,10 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:           "backup with a specific backup location keeps it",
-			backup:         defaultBackup().StorageLocation("alt-loc").Result(),
-			backupLocation: builder.ForBackupStorageLocation("velero", "alt-loc").Bucket("store-1").Result(),
-			defaultRestic:  false,
+			name:                   "backup with a specific backup location keeps it",
+			backup:                 defaultBackup().StorageLocation("alt-loc").Result(),
+			backupLocation:         builder.ForBackupStorageLocation("velero", "alt-loc").Bucket("store-1").Result(),
+			defaultVolumesToRestic: false,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -408,8 +408,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: "alt-loc",
-					DefaultRestic:   boolptr.False(),
+					StorageLocation:        "alt-loc",
+					DefaultVolumesToRestic: boolptr.False(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -428,7 +428,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 				Bucket("store-1").
 				AccessMode(velerov1api.BackupStorageLocationAccessModeReadWrite).
 				Result(),
-			defaultRestic: true,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -447,8 +447,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: "read-write",
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        "read-write",
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -461,10 +461,10 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:           "backup with a TTL has expiration set",
-			backup:         defaultBackup().TTL(10 * time.Minute).Result(),
-			backupLocation: defaultBackupLocation,
-			defaultRestic:  false,
+			name:                   "backup with a TTL has expiration set",
+			backup:                 defaultBackup().TTL(10 * time.Minute).Result(),
+			backupLocation:         defaultBackupLocation,
+			defaultVolumesToRestic: false,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -483,9 +483,9 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					TTL:             metav1.Duration{Duration: 10 * time.Minute},
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.False(),
+					TTL:                    metav1.Duration{Duration: 10 * time.Minute},
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.False(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -498,11 +498,11 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:           "backup without an existing backup will succeed",
-			backupExists:   false,
-			backup:         defaultBackup().Result(),
-			backupLocation: defaultBackupLocation,
-			defaultRestic:  true,
+			name:                   "backup without an existing backup will succeed",
+			backupExists:           false,
+			backup:                 defaultBackup().Result(),
+			backupLocation:         defaultBackupLocation,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -521,8 +521,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -535,12 +535,12 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:           "backup specifying a false value for 'DefaultRestic' keeps it",
+			name:           "backup specifying a false value for 'DefaultVolumesToRestic' keeps it",
 			backupExists:   false,
-			backup:         defaultBackup().DefaultRestic(false).Result(),
+			backup:         defaultBackup().DefaultVolumesToRestic(false).Result(),
 			backupLocation: defaultBackupLocation,
 			// value set in the controller is different from that specified in the backup
-			defaultRestic: true,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -559,8 +559,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.False(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.False(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -573,12 +573,12 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:           "backup specifying a true value for 'DefaultRestic' keeps it",
+			name:           "backup specifying a true value for 'DefaultVolumesToRestic' keeps it",
 			backupExists:   false,
-			backup:         defaultBackup().DefaultRestic(true).Result(),
+			backup:         defaultBackup().DefaultVolumesToRestic(true).Result(),
 			backupLocation: defaultBackupLocation,
 			// value set in the controller is different from that specified in the backup
-			defaultRestic: false,
+			defaultVolumesToRestic: false,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -597,8 +597,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseCompleted,
@@ -613,11 +613,11 @@ func TestProcessBackupCompletions(t *testing.T) {
 
 		// Failed
 		{
-			name:           "backup with existing backup will fail",
-			backupExists:   true,
-			backup:         defaultBackup().Result(),
-			backupLocation: defaultBackupLocation,
-			defaultRestic:  true,
+			name:                   "backup with existing backup will fail",
+			backupExists:           true,
+			backup:                 defaultBackup().Result(),
+			backupLocation:         defaultBackupLocation,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -636,8 +636,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseFailed,
@@ -650,11 +650,11 @@ func TestProcessBackupCompletions(t *testing.T) {
 			},
 		},
 		{
-			name:                "error when checking if backup exists will cause backup to fail",
-			backup:              defaultBackup().Result(),
-			existenceCheckError: errors.New("Backup already exists in object storage"),
-			backupLocation:      defaultBackupLocation,
-			defaultRestic:       true,
+			name:                   "error when checking if backup exists will cause backup to fail",
+			backup:                 defaultBackup().Result(),
+			existenceCheckError:    errors.New("Backup already exists in object storage"),
+			backupLocation:         defaultBackupLocation,
+			defaultVolumesToRestic: true,
 			expectedResult: &velerov1api.Backup{
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Backup",
@@ -673,8 +673,8 @@ func TestProcessBackupCompletions(t *testing.T) {
 					},
 				},
 				Spec: velerov1api.BackupSpec{
-					StorageLocation: defaultBackupLocation.Name,
-					DefaultRestic:   boolptr.True(),
+					StorageLocation:        defaultBackupLocation.Name,
+					DefaultVolumesToRestic: boolptr.True(),
 				},
 				Status: velerov1api.BackupStatus{
 					Phase:               velerov1api.BackupPhaseFailed,
@@ -725,7 +725,7 @@ func TestProcessBackupCompletions(t *testing.T) {
 				backupLocationLister:   sharedInformers.Velero().V1().BackupStorageLocations().Lister(),
 				snapshotLocationLister: sharedInformers.Velero().V1().VolumeSnapshotLocations().Lister(),
 				defaultBackupLocation:  defaultBackupLocation.Name,
-				defaultRestic:          test.defaultRestic,
+				defaultVolumesToRestic: test.defaultVolumesToRestic,
 				backupTracker:          NewBackupTracker(),
 				metrics:                metrics.NewServerMetrics(),
 				clock:                  clock.NewFakeClock(now),