Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Remove legacy-api and no-grpc flags from kopia commands" #2849

Merged
merged 1 commit into from
Apr 26, 2024
Merged

Revert "Remove legacy-api and no-grpc flags from kopia commands" #2849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/kopia/cli/internal/opts/opts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ func ReadOnly(enabled bool) command.Applier {
return command.NewOption("--readonly", enabled)
}

// GRPC creates a new gRPC option.
func GRPC(enabled bool) command.Applier {
return command.NewToggleOption("--grpc", "--no-grpc", enabled)
}

// CheckForUpdates creates a new check for updates option.
func CheckForUpdates(enabled bool) command.Applier {
return command.NewToggleOption("--check-for-updates", "--no-check-for-updates", enabled)
Expand Down
5 changes: 5 additions & 0 deletions pkg/kopia/cli/internal/opts/opts_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ var _ = check.Suite(&test.ArgumentSuite{Cmd: "cmd", Arguments: []test.ArgumentTe
Argument: command.NewArguments(opts.ReadOnly(true), opts.ReadOnly(false)),
ExpectedCLI: []string{"cmd", "--readonly"},
},
{
Name: "GRPC",
Argument: command.NewArguments(opts.GRPC(true), opts.GRPC(false)),
ExpectedCLI: []string{"cmd", "--grpc", "--no-grpc"},
},
{
Name: "CheckForUpdates",
Argument: command.NewArguments(opts.CheckForUpdates(true), opts.CheckForUpdates(false)),
Expand Down
1 change: 1 addition & 0 deletions pkg/kopia/cli/repository/repository_connect_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ func ConnectServer(args ConnectServerArgs) (*safecli.Builder, error) {
opts.Common(args.Common),
cmdRepository, subcmdConnect, subcmdServer,
opts.CheckForUpdates(false),
opts.GRPC(false),
optReadOnly(args.ReadOnly),
opts.Cache(args.Cache),
optHostname(args.Hostname),
Expand Down
1 change: 1 addition & 0 deletions pkg/kopia/cli/repository/repository_connect_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ var _ = check.Suite(test.NewCommandSuite([]test.CommandTest{
"connect",
"server",
"--no-check-for-updates",
"--no-grpc",
"--readonly",
"--cache-directory=/tmp/cache.dir",
"--content-cache-size-limit-mb=0",
Expand Down
2 changes: 2 additions & 0 deletions pkg/kopia/command/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,12 @@ const (
filterFlag = "--filter"
globalFlag = "--global"
jsonFlag = "--json"
legacyAPIFlag = "--legacy-api"
logDirectoryFlag = "--log-dir"
logLevelFlag = "--log-level"
LogLevelError = "error"
LogLevelInfo = "info"
noGrpcFlag = "--no-grpc"
parallelFlag = "--parallel"
passwordFlag = "--password"
progressUpdateIntervalFlag = "--progress-update-interval"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kopia/command/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func RepositoryConnectServerCommand(cmdArgs RepositoryServerCommandArgs) []strin
ConfigFilePath: cmdArgs.ConfigFilePath,
LogDirectory: cmdArgs.LogDirectory,
})
args = args.AppendLoggable(repositorySubCommand, connectSubCommand, serverSubCommand, noCheckForUpdatesFlag)
args = args.AppendLoggable(repositorySubCommand, connectSubCommand, serverSubCommand, noCheckForUpdatesFlag, noGrpcFlag)

if cmdArgs.ReadOnly {
args = args.AppendLoggable(readOnlyFlag)
Expand Down
1 change: 1 addition & 0 deletions pkg/kopia/command/repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ func (s *RepositoryUtilsSuite) TestRepositoryConnectServerUtil(c *check.C) {
"connect",
"server",
"--no-check-for-updates",
"--no-grpc",
"--readonly",
"--cache-directory=/tmp/cache.dir",
"--content-cache-size-limit-mb=0",
Expand Down
4 changes: 4 additions & 0 deletions pkg/kopia/command/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ func ServerStart(cmdArgs ServerStartCommandArgs) []string {
args = args.AppendLoggableKV(serverControlUsernameFlag, cmdArgs.ServerUsername)
args = args.AppendRedactedKV(serverControlPasswordFlag, cmdArgs.ServerPassword)

// TODO: Remove when GRPC support is added
args = args.AppendLoggable(noGrpcFlag)
args = args.AppendLoggable(legacyAPIFlag)

if cmdArgs.EnablePprof {
args = args.AppendLoggable(enablePprof)
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/kopia/command/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (kServer *KopiaServerTestSuite) TestServerCommands(c *C) {
}
return ServerStart(args)
},
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password --enable-pprof --metrics-listen-addr=a-server-address:51516 > /dev/null 2>&1 &",
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password --no-grpc --legacy-api --enable-pprof --metrics-listen-addr=a-server-address:51516 > /dev/null 2>&1 &",
},
{
f: func() []string {
Expand All @@ -67,7 +67,7 @@ func (kServer *KopiaServerTestSuite) TestServerCommands(c *C) {
}
return ServerStart(args)
},
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password > /dev/null 2>&1 &",
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password --no-grpc --legacy-api > /dev/null 2>&1 &",
},
{
f: func() []string {
Expand All @@ -83,7 +83,7 @@ func (kServer *KopiaServerTestSuite) TestServerCommands(c *C) {
}
return ServerStart(args)
},
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password",
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --tls-generate-cert --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password --no-grpc --legacy-api",
},
{
f: func() []string {
Expand All @@ -99,7 +99,7 @@ func (kServer *KopiaServerTestSuite) TestServerCommands(c *C) {
}
return ServerStart(args)
},
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password > /dev/null 2>&1 &",
expectedLog: "bash -o errexit -c kopia --log-level=error --config-file=path/kopia.config --log-dir=cache/log server start --address=a-server-address --tls-cert-file=/path/to/cert/tls.crt --tls-key-file=/path/to/key/tls.key --server-username=a-username@a-hostname --server-password=a-user-password --server-control-username=a-username@a-hostname --server-control-password=a-user-password --no-grpc --legacy-api > /dev/null 2>&1 &",
},
{
f: func() []string {
Expand Down