Summary of changes:
lib/dispatchcloud/dispatcher.go | 2 +-
lib/dispatchcloud/dispatcher_test.go | 2 +-
sdk/go/arvados/config.go | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
via b56e2857bfa4f7d2094546ffa3407cede877fed1 (commit)
from 4f2aab840085126c11308553860888ce231c2a15 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit b56e2857bfa4f7d2094546ffa3407cede877fed1
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Tue Feb 12 11:25:56 2019 -0500
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 <tclegg at veritasgenetics.com>
diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index 3e3f5ee19..2d73afcd2 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 674cacd56..22e3425b6 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 1154f922b..5491200cb 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
-----------------------------------------------------------------------
hooks/post-receive
--