X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2f659c39c923d90f1cceb73c123d661687c3a41e..2c61bf045e35d8971412880031412c4f1a9660f6:/sdk/go/arvados/config_test.go

diff --git a/sdk/go/arvados/config_test.go b/sdk/go/arvados/config_test.go
index b984cb5669..58f4b961bb 100644
--- a/sdk/go/arvados/config_test.go
+++ b/sdk/go/arvados/config_test.go
@@ -5,6 +5,8 @@
 package arvados
 
 import (
+	"encoding/json"
+
 	"github.com/ghodss/yaml"
 	check "gopkg.in/check.v1"
 )
@@ -13,7 +15,7 @@ var _ = check.Suite(&ConfigSuite{})
 
 type ConfigSuite struct{}
 
-func (s *ConfigSuite) TestInstanceTypesAsArray(c *check.C) {
+func (s *ConfigSuite) TestStringSetAsArray(c *check.C) {
 	var cluster Cluster
 	yaml.Unmarshal([]byte(`
 API:
@@ -23,13 +25,6 @@ API:
 	c.Check(ok, check.Equals, true)
 }
 
-func (s *ConfigSuite) TestStringSetAsArray(c *check.C) {
-	var cluster Cluster
-	yaml.Unmarshal([]byte("InstanceTypes:\n- Name: foo\n"), &cluster)
-	c.Check(len(cluster.InstanceTypes), check.Equals, 1)
-	c.Check(cluster.InstanceTypes["foo"].Name, check.Equals, "foo")
-}
-
 func (s *ConfigSuite) TestInstanceTypesAsHash(c *check.C) {
 	var cluster Cluster
 	yaml.Unmarshal([]byte("InstanceTypes:\n  foo:\n    ProviderType: bar\n"), &cluster)
@@ -40,8 +35,39 @@ func (s *ConfigSuite) TestInstanceTypesAsHash(c *check.C) {
 
 func (s *ConfigSuite) TestInstanceTypeSize(c *check.C) {
 	var it InstanceType
-	err := yaml.Unmarshal([]byte("Name: foo\nScratch: 4GB\nRAM: 4GiB\n"), &it)
+	err := yaml.Unmarshal([]byte("Name: foo\nIncludedScratch: 4GB\nRAM: 4GiB\n"), &it)
 	c.Check(err, check.IsNil)
-	c.Check(int64(it.Scratch), check.Equals, int64(4000000000))
+	c.Check(int64(it.IncludedScratch), check.Equals, int64(4000000000))
 	c.Check(int64(it.RAM), check.Equals, int64(4294967296))
 }
+
+func (s *ConfigSuite) TestInstanceTypeFixup(c *check.C) {
+	for _, confdata := range []string{
+		// Current format: map of entries
+		`{foo4: {IncludedScratch: 4GB}, foo8: {ProviderType: foo_8, AddedScratch: 8GB}}`,
+	} {
+		c.Log(confdata)
+		var itm InstanceTypeMap
+		err := yaml.Unmarshal([]byte(confdata), &itm)
+		c.Check(err, check.IsNil)
+
+		c.Check(itm["foo4"].Name, check.Equals, "foo4")
+		c.Check(itm["foo4"].ProviderType, check.Equals, "foo4")
+		c.Check(itm["foo4"].Scratch, check.Equals, ByteSize(4000000000))
+		c.Check(itm["foo4"].AddedScratch, check.Equals, ByteSize(0))
+		c.Check(itm["foo4"].IncludedScratch, check.Equals, ByteSize(4000000000))
+
+		c.Check(itm["foo8"].Name, check.Equals, "foo8")
+		c.Check(itm["foo8"].ProviderType, check.Equals, "foo_8")
+		c.Check(itm["foo8"].Scratch, check.Equals, ByteSize(8000000000))
+		c.Check(itm["foo8"].AddedScratch, check.Equals, ByteSize(8000000000))
+		c.Check(itm["foo8"].IncludedScratch, check.Equals, ByteSize(0))
+	}
+}
+
+func (s *ConfigSuite) TestURLTrailingSlash(c *check.C) {
+	var a, b map[URL]bool
+	json.Unmarshal([]byte(`{"https://foo.example": true}`), &a)
+	json.Unmarshal([]byte(`{"https://foo.example/": true}`), &b)
+	c.Check(a, check.DeepEquals, b)
+}