2960: Remove unused code.

refs #2960

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/services/keepstore/command.go b/services/keepstore/command.go
index d01b30c907fcee9da5215bc442e0d8462954ef3e..9f14c13384e4f6045fc70d103ba3ada8a808c6b2 100644 (file)
--- a/services/keepstore/command.go
+++ b/services/keepstore/command.go
@@ -7,100 +7,16 @@ package keepstore
 import (
        "context"
        "errors"
-       "flag"
-       "io"
 
-       "git.arvados.org/arvados.git/lib/cmd"
-       "git.arvados.org/arvados.git/lib/config"
        "git.arvados.org/arvados.git/lib/service"
        "git.arvados.org/arvados.git/sdk/go/arvados"
-       "git.arvados.org/arvados.git/sdk/go/ctxlog"
        "github.com/prometheus/client_golang/prometheus"
-       "github.com/sirupsen/logrus"
 )
 
 var (
        Command = service.Command(arvados.ServiceNameKeepstore, newHandlerOrErrorHandler)
 )
 
-func runCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
-       args, ok, code := convertKeepstoreFlagsToServiceFlags(prog, args, ctxlog.FromContext(context.Background()), stderr)
-       if !ok {
-               return code
-       }
-       return Command.RunCommand(prog, args, stdin, stdout, stderr)
-}
-
-// Parse keepstore command line flags, and return equivalent
-// service.Command flags. If the second return value ("ok") is false,
-// the program should exit, and the third return value is a suitable
-// exit code.
-func convertKeepstoreFlagsToServiceFlags(prog string, args []string, lgr logrus.FieldLogger, stderr io.Writer) ([]string, bool, int) {
-       flags := flag.NewFlagSet("", flag.ContinueOnError)
-       flags.String("listen", "", "Services.Keepstore.InternalURLs")
-       flags.Int("max-buffers", 0, "API.MaxKeepBlobBuffers")
-       flags.Int("max-requests", 0, "API.MaxConcurrentRequests")
-       flags.Bool("never-delete", false, "Collections.BlobTrash")
-       flags.Bool("enforce-permissions", false, "Collections.BlobSigning")
-       flags.String("permission-key-file", "", "Collections.BlobSigningKey")
-       flags.String("blob-signing-key-file", "", "Collections.BlobSigningKey")
-       flags.String("data-manager-token-file", "", "SystemRootToken")
-       flags.Int("permission-ttl", 0, "Collections.BlobSigningTTL")
-       flags.Int("blob-signature-ttl", 0, "Collections.BlobSigningTTL")
-       flags.String("trash-lifetime", "", "Collections.BlobTrashLifetime")
-       flags.Bool("serialize", false, "Volumes.*.DriverParameters.Serialize")
-       flags.Bool("readonly", false, "Volumes.*.ReadOnly")
-       flags.String("pid", "", "-")
-       flags.String("trash-check-interval", "", "Collections.BlobTrashCheckInterval")
-
-       flags.String("azure-storage-container-volume", "", "Volumes.*.Driver")
-       flags.String("azure-storage-account-name", "", "Volumes.*.DriverParameters.StorageAccountName")
-       flags.String("azure-storage-account-key-file", "", "Volumes.*.DriverParameters.StorageAccountKey")
-       flags.String("azure-storage-replication", "", "Volumes.*.Replication")
-       flags.String("azure-max-get-bytes", "", "Volumes.*.DriverParameters.MaxDataReadSize")
-
-       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.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")
-
-       flags.String("volume", "", "Volumes")
-
-       flags.Bool("version", false, "")
-       flags.String("config", "", "")
-       flags.String("legacy-keepstore-config", "", "")
-
-       if ok, code := cmd.ParseFlags(flags, prog, args, "", stderr); !ok {
-               return nil, false, code
-       }
-
-       args = nil
-       ok := true
-       flags.Visit(func(f *flag.Flag) {
-               if f.Name == "config" || f.Name == "legacy-keepstore-config" || f.Name == "version" {
-                       args = append(args, "-"+f.Name, f.Value.String())
-               } else if f.Usage == "-" {
-                       ok = false
-                       lgr.Errorf("command line flag -%s is no longer supported", f.Name)
-               } else {
-                       ok = false
-                       lgr.Errorf("command line flag -%s is no longer supported -- use Clusters.*.%s in cluster config file instead", f.Name, f.Usage)
-               }
-       })
-       if !ok {
-               return nil, false, 2
-       }
-
-       flags = flag.NewFlagSet("", flag.ContinueOnError)
-       loader := config.NewLoader(nil, lgr)
-       loader.SetupFlags(flags)
-       return loader.MungeLegacyConfigArgs(lgr, args, "-legacy-keepstore-config"), true, 0
-}
-
 func newHandlerOrErrorHandler(ctx context.Context, cluster *arvados.Cluster, token string, reg *prometheus.Registry) service.Handler {
        serviceURL, ok := service.URLFromContext(ctx)
        if !ok {

diff --git a/services/keepstore/command_test.go b/services/keepstore/command_test.go
index bbfae52f69e1feb2a4b109e7eedd1a16da984023..942c01a7798f97e70b0998994baba5b0bb2d1705 100644 (file)
--- a/services/keepstore/command_test.go
+++ b/services/keepstore/command_test.go
@@ -23,7 +23,7 @@ func (*CommandSuite) TestLegacyConfigPath(c *check.C) {
        defer os.Remove(tmp.Name())
        tmp.Write([]byte("Listen: \"1.2.3.4.5:invalidport\"\n"))
        tmp.Close()
-       exited := runCommand("keepstore", []string{"-config", tmp.Name()}, &stdin, &stdout, &stderr)
+       exited := Command.RunCommand("keepstore", []string{"-config", tmp.Name()}, &stdin, &stdout, &stderr)
        c.Check(exited, check.Equals, 1)
        c.Check(stderr.String(), check.Matches, `(?ms).*unable to migrate Listen value.*`)
 }