From b56e2857bfa4f7d2094546ffa3407cede877fed1 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 12 Feb 2019 11:25:56 -0500 Subject: [PATCH] 14325: Fix PrivateKey config type. JSON decoder expects []byte fields to be base64-encoded, which we don't want here. refs #14325 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- lib/dispatchcloud/dispatcher.go | 2 +- lib/dispatchcloud/dispatcher_test.go | 2 +- sdk/go/arvados/config.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go index 3e3f5ee199..2d73afcd26 100644 --- a/lib/dispatchcloud/dispatcher.go +++ b/lib/dispatchcloud/dispatcher.go @@ -118,7 +118,7 @@ func (disp *dispatcher) initialize() { disp.stopped = make(chan struct{}) disp.logger = logrus.StandardLogger() - if key, err := ssh.ParsePrivateKey(disp.Cluster.Dispatch.PrivateKey); err != nil { + if key, err := ssh.ParsePrivateKey([]byte(disp.Cluster.Dispatch.PrivateKey)); err != nil { disp.logger.Fatalf("error parsing configured Dispatch.PrivateKey: %s", err) } else { disp.sshKey = key diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go index 674cacd566..22e3425b6d 100644 --- a/lib/dispatchcloud/dispatcher_test.go +++ b/lib/dispatchcloud/dispatcher_test.go @@ -51,7 +51,7 @@ func (s *DispatcherSuite) SetUpTest(c *check.C) { TimeoutShutdown: arvados.Duration(5 * time.Millisecond), }, Dispatch: arvados.Dispatch{ - PrivateKey: dispatchprivraw, + PrivateKey: string(dispatchprivraw), PollInterval: arvados.Duration(5 * time.Millisecond), ProbeInterval: arvados.Duration(5 * time.Millisecond), StaleLockTimeout: arvados.Duration(5 * time.Millisecond), diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go index 1154f922ba..5491200cb3 100644 --- a/sdk/go/arvados/config.go +++ b/sdk/go/arvados/config.go @@ -100,7 +100,7 @@ type InstanceType struct { type Dispatch struct { // PEM encoded SSH key (RSA, DSA, or ECDSA) able to log in to // cloud VMs. - PrivateKey []byte + PrivateKey string // Max time for workers to come up before abandoning stale // locks from previous run -- 2.39.5