X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/acb1d98cdfa6e33bfd3e1bb7510b78a4fd9384e2..2f66d4cc05e9442a9bb69969744d0750a02a1ed4:/services/keep-web/server_test.go

diff --git a/services/keep-web/server_test.go b/services/keep-web/server_test.go
index 12596b16bb..bca7ff49fa 100644
--- a/services/keep-web/server_test.go
+++ b/services/keep-web/server_test.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"bytes"
 	"crypto/md5"
 	"encoding/json"
 	"fmt"
@@ -16,14 +17,13 @@ import (
 	"os/exec"
 	"strings"
 	"testing"
-	"time"
 
-	"git.curoverse.com/arvados.git/lib/config"
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
-	log "github.com/sirupsen/logrus"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/keepclient"
 	check "gopkg.in/check.v1"
 )
 
@@ -342,12 +342,8 @@ func (s *IntegrationSuite) TestMetrics(c *check.C) {
 	c.Assert(err, check.IsNil)
 	c.Check(resp.StatusCode, check.Equals, http.StatusOK)
 	type summary struct {
-		SampleCount string  `json:"sample_count"`
-		SampleSum   float64 `json:"sample_sum"`
-		Quantile    []struct {
-			Quantile float64
-			Value    float64
-		}
+		SampleCount string
+		SampleSum   float64
 	}
 	type counter struct {
 		Value int64
@@ -423,66 +419,6 @@ func (s *IntegrationSuite) SetUpSuite(c *check.C) {
 	kc.PutB([]byte("waz"))
 }
 
-func (s *UnitSuite) TestLegacyConfig(c *check.C) {
-	content := []byte(`
-{
-	"Client": {
-		"Scheme": "",
-		"APIHost": "example.com",
-		"AuthToken": "abcdefg",
-	},
-	"Listen": ":80",
-	"AnonymousTokens": [
-		"anonusertoken"
-	],
-	"AttachmentOnlyHost": "download.example.com",
-	"TrustAllContent": true,
-	"Cache": {
-		"TTL": "1m",
-		"UUIDTTL": "1s",
-		"MaxCollectionEntries": 42,
-		"MaxCollectionBytes": 1234567890,
-		"MaxPermissionEntries": 100,
-		"MaxUUIDEntries": 100
-	},
-	"ManagementToken": "xyzzy"
-}
-`)
-	tmpfile, err := ioutil.TempFile("", "example")
-	if err != nil {
-		c.Error(err)
-	}
-	defer os.Remove(tmpfile.Name())
-
-	if _, err := tmpfile.Write(content); err != nil {
-		c.Error(err)
-	}
-	if err := tmpfile.Close(); err != nil {
-		c.Error(err)
-	}
-	cfg := configure(log.New(), []string{"keep-web", "-config", tmpfile.Name()})
-	c.Check(cfg, check.NotNil)
-	c.Check(cfg.cluster, check.NotNil)
-
-	c.Check(cfg.cluster.Services.Controller.ExternalURL, check.Equals, arvados.URL{Scheme: "https", Host: "example.com"})
-	c.Check(cfg.cluster.SystemRootToken, check.Equals, "abcdefg")
-
-	c.Check(cfg.cluster.Collections.WebDAVCache.TTL, check.Equals, arvados.Duration(60*time.Second))
-	c.Check(cfg.cluster.Collections.WebDAVCache.UUIDTTL, check.Equals, arvados.Duration(time.Second))
-	c.Check(cfg.cluster.Collections.WebDAVCache.MaxCollectionEntries, check.Equals, 42)
-	c.Check(cfg.cluster.Collections.WebDAVCache.MaxCollectionBytes, check.Equals, int64(1234567890))
-	c.Check(cfg.cluster.Collections.WebDAVCache.MaxPermissionEntries, check.Equals, 100)
-	c.Check(cfg.cluster.Collections.WebDAVCache.MaxUUIDEntries, check.Equals, 100)
-
-	c.Check(cfg.cluster.Services.WebDAVDownload.ExternalURL, check.Equals, arvados.URL{Host: "download.example.com"})
-	c.Check(cfg.cluster.Services.WebDAVDownload.InternalURLs[arvados.URL{Host: ":80"}], check.NotNil)
-	c.Check(cfg.cluster.Services.WebDAV.InternalURLs[arvados.URL{Host: ":80"}], check.NotNil)
-
-	c.Check(cfg.cluster.Collections.TrustAllContent, check.Equals, true)
-	c.Check(cfg.cluster.Users.AnonymousUserToken, check.Equals, "anonusertoken")
-	c.Check(cfg.cluster.ManagementToken, check.Equals, "xyzzy")
-}
-
 func (s *IntegrationSuite) TearDownSuite(c *check.C) {
 	arvadostest.StopKeep(2)
 	arvadostest.StopAPI()
@@ -490,9 +426,11 @@ func (s *IntegrationSuite) TearDownSuite(c *check.C) {
 
 func (s *IntegrationSuite) SetUpTest(c *check.C) {
 	arvadostest.ResetEnv()
-	ldr := config.NewLoader(nil, nil)
-	arvCfg, err := ldr.LoadDefaults()
-	cfg := DefaultConfig(arvCfg)
+	ldr := config.NewLoader(bytes.NewBufferString("Clusters: {zzzzz: {}}"), ctxlog.TestLogger(c))
+	ldr.Path = "-"
+	arvCfg, err := ldr.Load()
+	c.Check(err, check.IsNil)
+	cfg := newConfig(arvCfg)
 	c.Assert(err, check.IsNil)
 	cfg.Client = arvados.Client{
 		APIHost:  testAPIHost,