Merge pull request #59 from uselagoon/check-prune-fix

uselagoon · Jul 11, 2022 · 94d83e6 · 94d83e6
2 parents 203cbc2 + 70df671
commit 94d83e6
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 3 deletions.
diff --git a/internal/generator/backups.go b/internal/generator/backups.go
@@ -69,7 +69,7 @@ func generateBackupValues(
 	if flagCheckSchedule == "enabled" {
 		buildValues.Backup.CheckSchedule = "@weekly-random"
 	} else {
-		buildValues.Backup.CheckSchedule, err = helpers.ConvertCrontab(buildValues.Namespace, flagCheckSchedule)
+		buildValues.Backup.CheckSchedule, err = helpers.ConvertCrontab(buildValues.Namespace, defaultCheckSchedule)
 		if err != nil {
 			return fmt.Errorf("Unable to convert crontab for default check schedule: %v", err)
 		}
@@ -78,7 +78,7 @@ func generateBackupValues(
 	if flagPruneSchedule == "enabled" {
 		buildValues.Backup.PruneSchedule = "@weekly-random"
 	} else {
-		buildValues.Backup.PruneSchedule, err = helpers.ConvertCrontab(buildValues.Namespace, flagPruneSchedule)
+		buildValues.Backup.PruneSchedule, err = helpers.ConvertCrontab(buildValues.Namespace, defaultPruneSchedule)
 		if err != nil {
 			return fmt.Errorf("Unable to convert crontab for default prune schedule: %v", err)
 		}

diff --git a/internal/generator/backups_test.go b/internal/generator/backups_test.go
@@ -387,7 +387,7 @@ func Test_generateBackupValues(t *testing.T) {
 			},
 		},
 		{
-			name: "test11 - custom restore and backup configuration with endpoint and bucket",
+			name: "test12 - custom restore and backup configuration with endpoint and bucket",
 			args: args{
 				buildValues: &BuildValues{
 					BuildType:       "branch",
@@ -430,6 +430,68 @@ func Test_generateBackupValues(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "test13 - K8UP_WEEKLY_RANDOM_FEATURE_FLAG enabled",
+			args: args{
+				buildValues: &BuildValues{
+					BuildType:       "branch",
+					EnvironmentType: "development",
+					Namespace:       "example-com-main",
+				},
+				lYAML:           &lagoon.YAML{},
+				mergedVariables: []lagoon.EnvironmentVariable{},
+			},
+			vars: []helpers.EnvironmentVariable{
+				{Name: "K8UP_WEEKLY_RANDOM_FEATURE_FLAG", Value: "enabled"},
+			},
+			want: &BuildValues{
+				BuildType:       "branch",
+				EnvironmentType: "development",
+				Namespace:       "example-com-main",
+				Backup: BackupConfiguration{
+					BackupSchedule: "31 1 * * *",
+					CheckSchedule:  "@weekly-random",
+					PruneSchedule:  "@weekly-random",
+					PruneRetention: PruneRetention{
+						Hourly:  0,
+						Daily:   7,
+						Weekly:  6,
+						Monthly: 1,
+					},
+				},
+			},
+		},
+		{
+			name: "test14 - K8UP_WEEKLY_RANDOM_FEATURE_FLAG set but not enabled/valid",
+			args: args{
+				buildValues: &BuildValues{
+					BuildType:       "branch",
+					EnvironmentType: "development",
+					Namespace:       "example-com-main",
+				},
+				lYAML:           &lagoon.YAML{},
+				mergedVariables: []lagoon.EnvironmentVariable{},
+			},
+			vars: []helpers.EnvironmentVariable{
+				{Name: "K8UP_WEEKLY_RANDOM_FEATURE_FLAG", Value: "jkhk"},
+			},
+			want: &BuildValues{
+				BuildType:       "branch",
+				EnvironmentType: "development",
+				Namespace:       "example-com-main",
+				Backup: BackupConfiguration{
+					BackupSchedule: "31 1 * * *",
+					CheckSchedule:  "31 4 * * 0",
+					PruneSchedule:  "31 4 * * 0",
+					PruneRetention: PruneRetention{
+						Hourly:  0,
+						Daily:   7,
+						Weekly:  6,
+						Monthly: 1,
+					},
+				},
+			},
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {