[ARVADOS] updated: 1.3.0-317-gfb6840e9d
Git user
git at public.curoverse.com
Wed Feb 13 13:52:08 EST 2019
Summary of changes:
lib/dispatchcloud/test/stub_driver.go | 6 +++---
vendor/vendor.json | 6 ------
2 files changed, 3 insertions(+), 9 deletions(-)
via fb6840e9dc571044026e8d3d78079aed3bace897 (commit)
from 503aeeb11f4aec1a80c51d7a659e083d6a0dcf3c (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 fb6840e9dc571044026e8d3d78079aed3bace897
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date: Wed Feb 13 13:51:18 2019 -0500
14745: Updates StubDriver to match driver interface and updates vendor.json
StubDriver InstanceSet was previously using mapstructure to decode DriverParameters into a StubInstanceSet, which doesn't make sense, but mapstructure would just return nil instead of an error.
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <eric.biagiotti at gmail.com>
diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index a2231673f..d90a20c39 100644
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -6,6 +6,7 @@ package test
import (
"crypto/rand"
+ "encoding/json"
"errors"
"fmt"
"io"
@@ -17,7 +18,6 @@ import (
"git.curoverse.com/arvados.git/lib/cloud"
"git.curoverse.com/arvados.git/sdk/go/arvados"
- "github.com/mitchellh/mapstructure"
"github.com/sirupsen/logrus"
"golang.org/x/crypto/ssh"
)
@@ -55,7 +55,7 @@ type StubDriver struct {
}
// InstanceSet returns a new *StubInstanceSet.
-func (sd *StubDriver) InstanceSet(params map[string]interface{}, id cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) {
+func (sd *StubDriver) InstanceSet(params json.RawMessage, id cloud.InstanceSetID, logger logrus.FieldLogger) (cloud.InstanceSet, error) {
if sd.holdCloudOps == nil {
sd.holdCloudOps = make(chan bool)
}
@@ -64,7 +64,7 @@ func (sd *StubDriver) InstanceSet(params map[string]interface{}, id cloud.Instan
servers: map[cloud.InstanceID]*StubVM{},
}
sd.instanceSets = append(sd.instanceSets, &sis)
- return &sis, mapstructure.Decode(params, &sis)
+ return &sis, nil
}
// InstanceSets returns all instances that have been created by the
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 1b24804b0..db69f9fa4 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -391,12 +391,6 @@
"revisionTime": "2016-12-03T19:45:07Z"
},
{
- "checksumSHA1": "ewGq4nGalpCQOHcmBTdAEQx1wW0=",
- "path": "github.com/mitchellh/mapstructure",
- "revision": "bb74f1db0675b241733089d5a1faa5dd8b0ef57b",
- "revisionTime": "2018-05-11T14:21:26Z"
- },
- {
"checksumSHA1": "OFNit1Qx2DdWhotfREKodDNUwCM=",
"path": "github.com/opencontainers/go-digest",
"revision": "279bed98673dd5bef374d3b6e4b09e2af76183bf",
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list