Merge pull request #3784 from MichaelEischer/cleanup-migrate-check

migrate: Cleanup option to request repository check

cmd/restic/cmd_migrate.go

@@ -84,8 +84,7 @@ func applyMigrations(opts MigrateOptions, gopts GlobalOptions, repo restic.Repos
 					Warnf("check for migration %v failed, continuing anyway\n", m.Name())
 				}
 
-				repoCheckOpts := m.RepoCheckOptions()
-				if repoCheckOpts != nil {
+				if m.RepoCheck() {
 					Printf("checking repository integrity...\n")
 
 					checkOptions := CheckOptions{}

internal/migrations/interface.go

@@ -6,15 +6,12 @@ import (
 	"github.com/restic/restic/internal/restic"
 )
 
-type RepositoryCheckOptions struct {
-}
-
 // Migration implements a data migration.
 type Migration interface {
 	// Check returns true if the migration can be applied to a repo.
 	Check(context.Context, restic.Repository) (bool, error)
 
-	RepoCheckOptions() *RepositoryCheckOptions
+	RepoCheck() bool
 
 	// Apply runs the migration.
 	Apply(context.Context, restic.Repository) error

internal/migrations/s3_layout.go

@@ -37,8 +37,8 @@ func (m *S3Layout) Check(ctx context.Context, repo restic.Repository) (bool, err
 	return true, nil
 }
 
-func (m *S3Layout) RepoCheckOptions() *RepositoryCheckOptions {
-	return nil
+func (m *S3Layout) RepoCheck() bool {
+	return false
 }
 
 func retry(max int, fail func(err error), f func() error) error {

internal/migrations/upgrade_repo_v2.go

@@ -50,8 +50,8 @@ func (*UpgradeRepoV2) Check(ctx context.Context, repo restic.Repository) (bool,
 	return isV1, nil
 }
 
-func (*UpgradeRepoV2) RepoCheckOptions() *RepositoryCheckOptions {
-	return &RepositoryCheckOptions{}
+func (*UpgradeRepoV2) RepoCheck() bool {
+	return true
 }
 func (*UpgradeRepoV2) upgrade(ctx context.Context, repo restic.Repository) error {
 	h := restic.Handle{Type: restic.ConfigFile}