Register Kopia additional args #2858
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bathina2
force-pushed
the
register_kopia_additional_flags
branch
2 times, most recently
from
4e28125
to
18795af
Compare
miquella
reviewed
May 7, 2024
| @@ -39,7 +40,7 @@ type ConnectServerArgs struct { | |||
|
|
|||
| // ConnectServer creates a new `kopia repository connect server...` command. | |||
| func ConnectServer(args ConnectServerArgs) (*safecli.Builder, error) { | |||
There was a problem hiding this comment.
Perhaps we could rename this argument rather than aliasing the import?
| @@ -20,6 +20,7 @@ import ( | |||
| "github.com/kanisterio/safecli" | |||
| "gopkg.in/check.v1" | |||
|
|
|||
| cliArgs "github.com/kanisterio/kanister/pkg/kopia/cli/args" | |||
There was a problem hiding this comment.
Perhaps we shouldn't alias this import either?
kidgilson
approved these changes
May 8, 2024
pkg/kopia/cli/args/ephemeral_args.go
Outdated
| a.args[key] = value | ||
| } | ||
|
|
||
| func (a *Args) AppendToCmd(cmd *logsafe.Cmd) { |
There was a problem hiding this comment.
Suggested change
| func (a *Args) AppendToCmd(cmd *logsafe.Cmd) { | |
| func (a *Args) AppendToCmd(cmd logsafe.Cmd) logsafe.Cmd { |
pkg/kopia/cli/args/ephemeral_args.go
Outdated
|
|
||
| func (a *Args) AppendToCmd(cmd *logsafe.Cmd) { | ||
| for k, v := range a.args { | ||
| *cmd = cmd.AppendLoggableKV(k, v) |
There was a problem hiding this comment.
Suggested change
| *cmd = cmd.AppendLoggableKV(k, v) | |
| cmd = cmd.AppendLoggableKV(k, v) |
Add return cmd
pkg/kopia/command/repository.go
Outdated
| } | ||
|
|
||
| args.RepositoryCreate.AppendToCmd(&command) |
There was a problem hiding this comment.
Change to reflect new method.
pkg/kopia/command/repository.go
Outdated
|
|
||
| args = args.AppendRedactedKV(serverCertFingerprint, cmdArgs.Fingerprint) | ||
| args.RepositoryConnectServer.AppendToCmd(&command) |
There was a problem hiding this comment.
Change to reflect new method.
pkg/kopia/command/repository_test.go
Outdated
Comment on lines
192
to
194
| // else { | ||
| // defer func() { args.RepositoryCreate = flags }() | ||
| // } |
pkg/kopia/command/server.go
Outdated
|
|
||
| return stringSliceCommand(args) | ||
| args.UserAddSet.AppendToCmd(&command) |
There was a problem hiding this comment.
Changes to reflect new method.
pkg/kopia/command/server.go
Outdated
|
|
||
| return stringSliceCommand(args) | ||
| args.UserAddSet.AppendToCmd(&command) |
There was a problem hiding this comment.
Changes to reflect new method.
pkg/kopia/repository/client_test.go
Outdated
| @@ -0,0 +1,25 @@ | |||
| package repository | |||
There was a problem hiding this comment.
Suggested change
| package repository | |
| package repository_test |
bathina2
force-pushed
the
register_kopia_additional_flags
branch
from
fd709ce
to
bd332b2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change Overview
This PR adds the ability to register additional Kopia arguments for the following kopia commands-
kopia repo createkopia repo connect serverkopia user addkopia user setOnce registered all subsequent calls to these command will use the additional arguments.
Pull request type
Please check the type of change your PR introduces:
Issues
Test Plan