Skip to content

Commit

Permalink
addressing nits
Browse files Browse the repository at this point in the history
  • Loading branch information
bathina2 committed May 8, 2024
1 parent 6f6979d commit fd709ce
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
5 changes: 3 additions & 2 deletions pkg/kopia/cli/args/ephemeral_args.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ func (a *Args) Set(key, value string) {
a.args[key] = value
}

func (a *Args) AppendToCmd(cmd *logsafe.Cmd) {
func (a *Args) AppendToCmd(cmd logsafe.Cmd) logsafe.Cmd {
for k, v := range a.args {
*cmd = cmd.AppendLoggableKV(k, v)
cmd = cmd.AppendLoggableKV(k, v)
}
return cmd
}

func (a *Args) CommandAppliers() []command.Applier {
Expand Down
4 changes: 2 additions & 2 deletions pkg/kopia/command/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func RepositoryCreateCommand(cmdArgs RepositoryCommandArgs) ([]string, error) {
command = command.AppendLoggableKV(retentionPeriodFlag, cmdArgs.RetentionPeriod.String())
}

args.RepositoryCreate.AppendToCmd(&command)
command = args.RepositoryCreate.AppendToCmd(command)

bsArgs, err := storage.KopiaStorageArgs(&storage.StorageCommandParams{
Location: cmdArgs.Location,
Expand Down Expand Up @@ -152,7 +152,7 @@ func RepositoryConnectServerCommand(cmdArgs RepositoryServerCommandArgs) []strin
}
command = command.AppendLoggableKV(urlFlag, cmdArgs.ServerURL)

args.RepositoryConnectServer.AppendToCmd(&command)
command = args.RepositoryConnectServer.AppendToCmd(command)

command = command.AppendRedactedKV(serverCertFingerprint, cmdArgs.Fingerprint)

Expand Down
3 changes: 0 additions & 3 deletions pkg/kopia/command/repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,6 @@ func (s *RepositoryUtilsSuite) TestRepositoryCreateUtil(c *check.C) {
args.RepositoryCreate.Set("--testflag", "testvalue")
defer func() { args.RepositoryCreate = flags }()
}
// else {
// defer func() { args.RepositoryCreate = flags }()
// }
cmd, err := RepositoryCreateCommand(tc.cmdArg)
c.Assert(err, tc.Checker)
if tc.Checker == check.IsNil {
Expand Down
4 changes: 2 additions & 2 deletions pkg/kopia/command/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ func ServerSetUser(cmdArgs ServerSetUserCommandArgs) []string {
command = command.AppendLoggable(serverSubCommand, userSubCommand, setSubCommand, cmdArgs.NewUsername)
command = command.AppendRedactedKV(userPasswordFlag, cmdArgs.UserPassword)

args.UserAddSet.AppendToCmd(&command)
command = args.UserAddSet.AppendToCmd(command)

return stringSliceCommand(command)
}
Expand All @@ -147,7 +147,7 @@ func ServerAddUser(cmdArgs ServerAddUserCommandArgs) []string {
command = command.AppendLoggable(serverSubCommand, userSubCommand, addSubCommand, cmdArgs.NewUsername)
command = command.AppendRedactedKV(userPasswordFlag, cmdArgs.UserPassword)

args.UserAddSet.AppendToCmd(&command)
command = args.UserAddSet.AppendToCmd(command)

return stringSliceCommand(command)
}
4 changes: 2 additions & 2 deletions pkg/kopia/repository/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
const (
defaultConnectMaxListCacheDuration time.Duration = time.Second * 600
kopiaGetRepoParametersError = "unable to get repository parameters"
pbkdf2Algorithm = "pbkdf2-sha256-600000"
Pbkdf2Algorithm = "pbkdf2-sha256-600000"
)

// ConnectToAPIServer connects to the Kopia API server running at the given address
Expand All @@ -57,7 +57,7 @@ func ConnectToAPIServer(
serverInfo := &repo.APIServerInfo{
BaseURL: serverAddress,
TrustedServerCertificateFingerprint: fingerprint,
LocalCacheKeyDerivationAlgorithm: pbkdf2Algorithm,
LocalCacheKeyDerivationAlgorithm: Pbkdf2Algorithm,
}

opts := &repo.ConnectOptions{
Expand Down
5 changes: 3 additions & 2 deletions pkg/kopia/repository/client_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package repository
package repository_test

import (
"testing"

"gopkg.in/check.v1"

"github.com/kanisterio/kanister/pkg/kopia/repository"
"github.com/kopia/kopia/repo"
)

Expand All @@ -17,7 +18,7 @@ var _ = check.Suite(&RepositoryClientSuite{})
func (s *RepositoryClientSuite) TestKopiaAllowedAlgorithms(c *check.C) {
pbkdf2Supported := false
for _, algorithm := range repo.SupportedLocalCacheKeyDerivationAlgorithms() {
if algorithm == pbkdf2Algorithm {
if algorithm == repository.Pbkdf2Algorithm {
pbkdf2Supported = true
}
}
Expand Down

0 comments on commit fd709ce

Please sign in to comment.