larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add hidden CLI flag to open repo at point in time

Browse Source 
Wire up the CLI side of passing in a point in time. Mostly this is so
that we can test this functionality.
This commit is contained in:
Ashlie Martinez 2023-06-20 15:56:14 -07:00
parent a0ebe13565
commit 653a79bde9
8 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/backup/exchange.go
View File

@ -95,7 +95,7 @@ func addExchangeCommands(cmd *cobra.Command) *cobra.Command {
c, fs = utils.AddCommand(cmd, exchangeListCmd())
fs.SortFlags = false
utils.AddBackupIDFlag(c, false)
utils.AddDetailsAndRestoreFlags(c, false)
addFailedItemsFN(c)
addSkippedItemsFN(c)
addRecoveredErrorsFN(c)
@ -111,7 +111,7 @@ func addExchangeCommands(cmd *cobra.Command) *cobra.Command {
// Flags addition ordering should follow the order we want them to appear in help and docs:
// More generic (ex: --user) and more frequently used flags take precedence.
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddExchangeDetailsAndRestoreFlags(c)
case deleteCommand:

4
src/cli/backup/onedrive.go
View File

@ -78,7 +78,7 @@ func addOneDriveCommands(cmd *cobra.Command) *cobra.Command {
c, fs = utils.AddCommand(cmd, oneDriveListCmd())
fs.SortFlags = false
utils.AddBackupIDFlag(c, false)
utils.AddDetailsAndRestoreFlags(c, false)
addFailedItemsFN(c)
addSkippedItemsFN(c)
addRecoveredErrorsFN(c)
@ -91,7 +91,7 @@ func addOneDriveCommands(cmd *cobra.Command) *cobra.Command {
c.Example = oneDriveServiceCommandDetailsExamples
options.AddSkipReduceFlag(c)
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddOneDriveDetailsAndRestoreFlags(c)
case deleteCommand:

4
src/cli/backup/sharepoint.go
View File

@ -94,7 +94,7 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
c, fs = utils.AddCommand(cmd, sharePointListCmd())
fs.SortFlags = false
utils.AddBackupIDFlag(c, false)
utils.AddDetailsAndRestoreFlags(c, false)
addFailedItemsFN(c)
addSkippedItemsFN(c)
addRecoveredErrorsFN(c)
@ -107,7 +107,7 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
c.Example = sharePointServiceCommandDetailsExamples
options.AddSkipReduceFlag(c)
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddSharePointDetailsAndRestoreFlags(c)
case deleteCommand:

15
src/cli/options/options.go
View File

@ -23,6 +23,8 @@ func Control() control.Options {
opt.ToggleFeatures.DisableConcurrencyLimiter = disableConcurrencyLimiterFV
opt.Parallelism.ItemFetch = fetchParallelismFV
opt.Repo.ViewTimestamp = viewTimestampFV.Get()
return opt
}
@ -40,6 +42,7 @@ const (
DisableIncrementalsFN = "disable-incrementals"
EnableImmutableIDFN = "enable-immutable-id"
DisableConcurrencyLimiterFN = "disable-concurrency-limiter"
ViewTimestampFN = "point-in-time"
)
var (
@ -48,6 +51,7 @@ var (
noStatsFV bool
restorePermissionsFV bool
skipReduceFV bool
viewTimestampFV timestamp
)
// AddGlobalOperationFlags adds the global operations flag set.
@ -90,6 +94,17 @@ func AddFetchParallelismFlag(cmd *cobra.Command) {
cobra.CheckErr(fs.MarkHidden(FetchParallelismFN))
}
// AddViewTimestampFlag adds a hidden flag that allows callers to pass a
// timestamp to view the corso repo at if immutable backups are enabled.
func AddViewTimestampFlag(cmd *cobra.Command) {
fs := cmd.Flags()
fs.Var(
&viewTimestampFV,
ViewTimestampFN,
"View the repository at a previous datetime by passing an RFC3339 timestamp")
cobra.CheckErr(fs.MarkHidden(ViewTimestampFN))
}
// ---------------------------------------------------------------------------
// Feature Flags
// ---------------------------------------------------------------------------

2
src/cli/restore/exchange.go
View File

@ -32,7 +32,7 @@ func addExchangeCommands(cmd *cobra.Command) *cobra.Command {
// general flags
fs.SortFlags = false
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddExchangeDetailsAndRestoreFlags(c)
options.AddFailFastFlag(c)
}

2
src/cli/restore/onedrive.go
View File

@ -31,7 +31,7 @@ func addOneDriveCommands(cmd *cobra.Command) *cobra.Command {
// More generic (ex: --user) and more frequently used flags take precedence.
fs.SortFlags = false
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddOneDriveDetailsAndRestoreFlags(c)
// restore permissions

2
src/cli/restore/sharepoint.go
View File

@ -31,7 +31,7 @@ func addSharePointCommands(cmd *cobra.Command) *cobra.Command {
// More generic (ex: --site) and more frequently used flags take precedence.
fs.SortFlags = false
utils.AddBackupIDFlag(c, true)
utils.AddDetailsAndRestoreFlags(c, true)
utils.AddSharePointDetailsAndRestoreFlags(c)
options.AddRestorePermissionsFlag(c)

6
src/cli/utils/flags.go
View File

@ -8,6 +8,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/alcionai/corso/src/cli/options"
"github.com/alcionai/corso/src/internal/common/dttm"
"github.com/alcionai/corso/src/pkg/control/repository"
"github.com/alcionai/corso/src/pkg/path"
@ -84,6 +85,11 @@ func AddBackupIDFlag(cmd *cobra.Command, require bool) {
}
}
func AddDetailsAndRestoreFlags(cmd *cobra.Command, require bool) {
AddBackupIDFlag(cmd, require)
options.AddViewTimestampFlag(cmd)
}
func AddDataFlag(cmd *cobra.Command, allowed []string, hide bool) {
var (
allowedMsg string