From e2889938fac675d57eb989ec3a282c4eefd4f97f Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 18 Mar 2024 13:57:23 -0700 Subject: [PATCH] Add legacy-api flag to kopia server start command (#2746) Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> --- pkg/kopia/command/const.go | 1 + pkg/kopia/command/server.go | 1 + pkg/kopia/command/server_test.go | 8 ++++---- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/kopia/command/const.go b/pkg/kopia/command/const.go index 9e8f0e2eb3..125e871975 100644 --- a/pkg/kopia/command/const.go +++ b/pkg/kopia/command/const.go @@ -39,6 +39,7 @@ const ( filterFlag = "--filter" globalFlag = "--global" jsonFlag = "--json" + legacyAPIFlag = "--legacy-api" logDirectoryFlag = "--log-dir" logLevelFlag = "--log-level" LogLevelError = "error" diff --git a/pkg/kopia/command/server.go b/pkg/kopia/command/server.go index 07be9dd5aa..6beaabaf5f 100644 --- a/pkg/kopia/command/server.go +++ b/pkg/kopia/command/server.go @@ -47,6 +47,7 @@ func ServerStart(cmdArgs ServerStartCommandArgs) []string { // TODO: Remove when GRPC support is added args = args.AppendLoggable(noGrpcFlag) + args = args.AppendLoggable(legacyAPIFlag) if cmdArgs.EnablePprof { args = args.AppendLoggable(enablePprof) diff --git a/pkg/kopia/command/server_test.go b/pkg/kopia/command/server_test.go index 45025aa92b..b6881cae91 100644 --- a/pkg/kopia/command/server_test.go +++ b/pkg/kopia/command/server_test.go @@ -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 --no-grpc --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 { @@ -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 --no-grpc > /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 { @@ -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 --no-grpc", + 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 { @@ -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 --no-grpc > /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 {