X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e231fef37079916d0dc6babf93d669d474598ced..365b9ca0ea4291d9864297593d185aeef66457ba:/lib/controller/server_test.go

diff --git a/lib/controller/server_test.go b/lib/controller/server_test.go
index ae89c3d7ea..b2b3365a20 100644
--- a/lib/controller/server_test.go
+++ b/lib/controller/server_test.go
@@ -5,13 +5,17 @@
 package controller
 
 import (
+	"context"
+	"net"
 	"net/http"
 	"os"
 	"path/filepath"
+	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/ctxlog"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"git.arvados.org/arvados.git/sdk/go/httpserver"
 	check "gopkg.in/check.v1"
 )
 
@@ -32,23 +36,25 @@ func integrationTestCluster() *arvados.Cluster {
 func newServerFromIntegrationTestEnv(c *check.C) *httpserver.Server {
 	log := ctxlog.TestLogger(c)
 
-	nodeProfile := arvados.NodeProfile{
-		Controller: arvados.SystemServiceInstance{Listen: ":"},
-		RailsAPI:   arvados.SystemServiceInstance{Listen: os.Getenv("ARVADOS_TEST_API_HOST"), TLS: true, Insecure: true},
-	}
 	handler := &Handler{Cluster: &arvados.Cluster{
 		ClusterID:  "zzzzz",
 		PostgreSQL: integrationTestCluster().PostgreSQL,
-		NodeProfiles: map[string]arvados.NodeProfile{
-			"*": nodeProfile,
-		},
-	}, NodeProfile: &nodeProfile}
+	}}
+	handler.Cluster.TLS.Insecure = true
+	handler.Cluster.Collections.BlobSigning = true
+	handler.Cluster.Collections.BlobSigningKey = arvadostest.BlobSigningKey
+	handler.Cluster.Collections.BlobSigningTTL = arvados.Duration(time.Hour * 24 * 14)
+	arvadostest.SetServiceURL(&handler.Cluster.Services.RailsAPI, "https://"+os.Getenv("ARVADOS_TEST_API_HOST"))
+	arvadostest.SetServiceURL(&handler.Cluster.Services.Controller, "http://localhost:/")
 
 	srv := &httpserver.Server{
 		Server: http.Server{
-			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(log, handler)),
+			BaseContext: func(net.Listener) context.Context {
+				return ctxlog.Context(context.Background(), log)
+			},
+			Handler: httpserver.AddRequestIDs(httpserver.LogRequests(handler)),
 		},
-		Addr: nodeProfile.Controller.Listen,
+		Addr: ":",
 	}
 	return srv
 }