backupdest: remove IncludeManifest arg in FindAllIncrementalPaths

Epic: none

Release note: none

Author: msbutler

pkg/backup/backupdest/backup_destination.go

@@ -228,7 +228,7 @@ func ResolveDest(
 	defer rootStore.Close()
 	priors, err := FindAllIncrementalPaths(
 		ctx, execCfg, incrementalStore, rootStore,
-		chosenSuffix, OmitManifest, len(dest.IncrementalStorage) > 0,
+		chosenSuffix, len(dest.IncrementalStorage) > 0,
 	)
 	if err != nil {
 		return ResolvedDestination{}, errors.Wrap(err, "adjusting backup destination to append new layer to existing backup")

pkg/backup/backupdest/incrementals.go

@@ -86,15 +86,14 @@ func FindAllIncrementalPaths(
 	incStore cloud.ExternalStorage,
 	rootStore cloud.ExternalStorage,
 	subdir string,
-	includeManifest bool,
 	customIncLocation bool,
 ) ([]string, error) {
 	ctx, sp := tracing.ChildSpan(ctx, "backupdest.FindAllIncrementalPaths")
 	defer sp.Finish()
 
 	// Backup indexes do not support custom incremental locations.
 	if customIncLocation || !ReadBackupIndexEnabled.Get(&execCfg.Settings.SV) {
-		return LegacyFindPriorBackups(ctx, incStore, includeManifest)
+		return LegacyFindPriorBackups(ctx, incStore, OmitManifest)
 	}
 
 	indexes, err := ListIndexes(ctx, rootStore, subdir)
@@ -105,25 +104,15 @@ func FindAllIncrementalPaths(
 	// backup chain, we can assume the index is complete. So either an index has
 	// been written for every backup in the chain, or there are no indexes at all.
 	if len(indexes) == 0 {
-		return LegacyFindPriorBackups(ctx, incStore, includeManifest)
+		return LegacyFindPriorBackups(ctx, incStore, OmitManifest)
 	}
 
-	paths, err := util.MapE(
+	return util.MapE(
 		indexes[1:], // We skip the full backup
 		func(indexFilename string) (string, error) {
 			return parseBackupFilePathFromIndexFileName(subdir, indexFilename)
 		},
 	)
-	if err != nil {
-		return nil, err
-	}
-
-	if includeManifest {
-		paths = util.Map(paths, func(p string) string {
-			return path.Join(p, backupbase.DeprecatedBackupManifestName)
-		})
-	}
-	return paths, nil
 }
 
 // LegacyFindPriorBackups finds "appended" incremental backups via the legacy
@@ -194,7 +183,7 @@ func backupsFromLocation(
 	defer incStore.Close()
 
 	return FindAllIncrementalPaths(
-		ctx, execCfg, incStore, rootStore, subdir, false /* includeManifest */, customIncLocation,
+		ctx, execCfg, incStore, rootStore, subdir, customIncLocation,
 	)
 }
 

pkg/backup/backupdest/incrementals_test.go

@@ -243,7 +243,7 @@ func TestFindAllIncrementalPaths(t *testing.T) {
 
 			incs, err := backupdest.FindAllIncrementalPaths(
 				ctx, &execCfg, incStore, store,
-				targetSubdir, false /* includeManifest */, false, /* customIncLocation */
+				targetSubdir, false, /* customIncLocation */
 			)
 			require.NoError(t, err)
 			require.Len(t, incs, len(targetChain)-1)
@@ -324,7 +324,7 @@ func TestFindAllIncrementalPathsFallbackLogic(t *testing.T) {
 
 		incs, err := backupdest.FindAllIncrementalPaths(
 			ctx, &execCfg, stores.inc, stores.root,
-			subdir, false /* includeManifest */, false, /* customIncLocation */
+			subdir, false, /* customIncLocation */
 		)
 		require.NoError(t, err)
 		require.Len(t, incs, numBackups-1)
@@ -348,7 +348,7 @@ func TestFindAllIncrementalPathsFallbackLogic(t *testing.T) {
 
 		incs, err := backupdest.FindAllIncrementalPaths(
 			ctx, &execCfg, stores.customInc, stores.root,
-			subdir, false /* includeManifest */, true, /* customIncLocation */
+			subdir, true, /* customIncLocation */
 		)
 		require.NoError(t, err)
 		require.Len(t, incs, numBackups-1)
@@ -390,14 +390,14 @@ func TestFindAllIncrementalPathsFallbackLogic(t *testing.T) {
 		// List from both default and custom incremental locations.
 		incs, err := backupdest.FindAllIncrementalPaths(
 			ctx, &execCfg, stores.inc, stores.root,
-			subdir, false /* includeManifest */, false, /* customIncLocation */
+			subdir, false, /* customIncLocation */
 		)
 		require.NoError(t, err)
 		require.Len(t, incs, numDefaultIncs)
 
 		incs, err = backupdest.FindAllIncrementalPaths(
 			ctx, &execCfg, stores.customInc, stores.root,
-			subdir, false /* includeManifest */, true, /* customIncLocation */
+			subdir, true, /* customIncLocation */
 		)
 		require.NoError(t, err)
 		require.Len(t, incs, numCustomIncs)