X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ea6f25f0dde5c750eacea29662c19149c7800134..4a264f6333b34ecc364d2a6f9e18c7f3e35a076d:/services/keepstore/command.go diff --git a/services/keepstore/command.go b/services/keepstore/command.go index 0927b18704..2a426936ed 100644 --- a/services/keepstore/command.go +++ b/services/keepstore/command.go @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 -package main +package keepstore import ( "context" @@ -30,10 +30,6 @@ var ( Command = service.Command(arvados.ServiceNameKeepstore, newHandlerOrErrorHandler) ) -func main() { - os.Exit(runCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr)) -} - func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int { args, ok := convertKeepstoreFlagsToServiceFlags(args, ctxlog.FromContext(context.Background())) if !ok { @@ -72,8 +68,8 @@ func convertKeepstoreFlagsToServiceFlags(args []string, lgr logrus.FieldLogger) flags.String("s3-bucket-volume", "", "Volumes.*.DriverParameters.Bucket") flags.String("s3-region", "", "Volumes.*.DriverParameters.Region") flags.String("s3-endpoint", "", "Volumes.*.DriverParameters.Endpoint") - flags.String("s3-access-key-file", "", "Volumes.*.DriverParameters.AccessKey") - flags.String("s3-secret-key-file", "", "Volumes.*.DriverParameters.SecretKey") + flags.String("s3-access-key-file", "", "Volumes.*.DriverParameters.AccessKeyID") + flags.String("s3-secret-key-file", "", "Volumes.*.DriverParameters.SecretAccessKey") flags.String("s3-race-window", "", "Volumes.*.DriverParameters.RaceWindow") flags.String("s3-replication", "", "Volumes.*.Replication") flags.String("s3-unsafe-delete", "", "Volumes.*.DriverParameters.UnsafeDelete")