X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8e31910034627dedd7259dd1e45a60768108c1e1..273e436dbf8736869dde715e9bc04a20c169d63f:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index e87fa4afd0..aa32356806 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -13,15 +13,18 @@ import (
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
-	"os"
 	"strings"
 	"sync"
 	"testing"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"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"
+	log "github.com/sirupsen/logrus"
 
 	. "gopkg.in/check.v1"
 )
@@ -96,14 +99,23 @@ func (s *NoKeepServerSuite) TearDownSuite(c *C) {
 	arvadostest.StopAPI()
 }
 
-func runProxy(c *C, args []string, bogusClientToken bool) *keepclient.KeepClient {
-	args = append([]string{"keepproxy"}, args...)
-	os.Args = append(args, "-listen=:0")
+func runProxy(c *C, bogusClientToken bool) *keepclient.KeepClient {
+	cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
+	c.Assert(err, Equals, nil)
+	cluster, err := cfg.GetCluster("")
+	c.Assert(err, Equals, nil)
+
+	cluster.Services.Keepproxy.InternalURLs = map[arvados.URL]arvados.ServiceInstance{arvados.URL{Host: ":0"}: arvados.ServiceInstance{}}
+
 	listener = nil
-	go main()
+	go func() {
+		run(log.New(), cluster)
+		defer closeListener()
+	}()
 	waitForListener()
 
-	arv, err := arvadosclient.MakeArvadosClient()
+	client := arvados.NewClientFromEnv()
+	arv, err := arvadosclient.New(client)
 	c.Assert(err, Equals, nil)
 	if bogusClientToken {
 		arv.ApiToken = "bogus-token"
@@ -119,7 +131,7 @@ func runProxy(c *C, args []string, bogusClientToken bool) *keepclient.KeepClient
 }
 
 func (s *ServerRequiredSuite) TestResponseViaHeader(c *C) {
-	runProxy(c, nil, false)
+	runProxy(c, false)
 	defer closeListener()
 
 	req, err := http.NewRequest("POST",
@@ -130,6 +142,7 @@ func (s *ServerRequiredSuite) TestResponseViaHeader(c *C) {
 	resp, err := (&http.Client{}).Do(req)
 	c.Assert(err, Equals, nil)
 	c.Check(resp.Header.Get("Via"), Equals, "HTTP/1.1 keepproxy")
+	c.Assert(resp.StatusCode, Equals, http.StatusOK)
 	locator, err := ioutil.ReadAll(resp.Body)
 	c.Assert(err, Equals, nil)
 	resp.Body.Close()
@@ -145,7 +158,7 @@ func (s *ServerRequiredSuite) TestResponseViaHeader(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestLoopDetection(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	sr := map[string]string{
@@ -163,7 +176,7 @@ func (s *ServerRequiredSuite) TestLoopDetection(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestStorageClassesHeader(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	// Set up fake keepstore to record request headers
@@ -190,7 +203,7 @@ func (s *ServerRequiredSuite) TestStorageClassesHeader(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestDesiredReplicas(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	content := []byte("TestDesiredReplicas")
@@ -207,7 +220,7 @@ func (s *ServerRequiredSuite) TestDesiredReplicas(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	content := []byte("TestPutWrongContentLength")
@@ -218,7 +231,7 @@ func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
 	// fixes the invalid Content-Length header. In order to test
 	// our server behavior, we have to call the handler directly
 	// using an httptest.ResponseRecorder.
-	rtr := MakeRESTRouter(true, true, kc, 10*time.Second, "")
+	rtr := MakeRESTRouter(kc, 10*time.Second, "")
 
 	type testcase struct {
 		sendLength   string
@@ -246,7 +259,7 @@ func (s *ServerRequiredSuite) TestPutWrongContentLength(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestManyFailedPuts(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 	router.(*proxyHandler).timeout = time.Nanosecond
 
@@ -273,7 +286,7 @@ func (s *ServerRequiredSuite) TestManyFailedPuts(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
@@ -350,7 +363,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
-	kc := runProxy(c, nil, true)
+	kc := runProxy(c, true)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x+3", md5.Sum([]byte("bar")))
@@ -375,59 +388,8 @@ func (s *ServerRequiredSuite) TestPutAskGetForbidden(c *C) {
 
 }
 
-func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
-	kc := runProxy(c, []string{"-no-get"}, false)
-	defer closeListener()
-
-	hash := fmt.Sprintf("%x", md5.Sum([]byte("baz")))
-
-	{
-		_, _, err := kc.Ask(hash)
-		errNotFound, _ := err.(keepclient.ErrNotFound)
-		c.Check(errNotFound, NotNil)
-		c.Assert(err, ErrorMatches, `.*HTTP 405.*`)
-		c.Log("Ask 1")
-	}
-
-	{
-		hash2, rep, err := kc.PutB([]byte("baz"))
-		c.Check(hash2, Matches, fmt.Sprintf(`^%s\+3(\+.+)?$`, hash))
-		c.Check(rep, Equals, 2)
-		c.Check(err, Equals, nil)
-		c.Log("PutB")
-	}
-
-	{
-		blocklen, _, err := kc.Ask(hash)
-		errNotFound, _ := err.(keepclient.ErrNotFound)
-		c.Check(errNotFound, NotNil)
-		c.Assert(err, ErrorMatches, `.*HTTP 405.*`)
-		c.Check(blocklen, Equals, int64(0))
-		c.Log("Ask 2")
-	}
-
-	{
-		_, blocklen, _, err := kc.Get(hash)
-		errNotFound, _ := err.(keepclient.ErrNotFound)
-		c.Check(errNotFound, NotNil)
-		c.Assert(err, ErrorMatches, `.*HTTP 405.*`)
-		c.Check(blocklen, Equals, int64(0))
-		c.Log("Get")
-	}
-}
-
-func (s *ServerRequiredSuite) TestPutDisabled(c *C) {
-	kc := runProxy(c, []string{"-no-put"}, false)
-	defer closeListener()
-
-	hash2, rep, err := kc.PutB([]byte("quux"))
-	c.Check(hash2, Equals, "")
-	c.Check(rep, Equals, 0)
-	c.Check(err, FitsTypeOf, keepclient.InsufficientReplicasError(errors.New("")))
-}
-
 func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
-	runProxy(c, nil, false)
+	runProxy(c, false)
 	defer closeListener()
 
 	{
@@ -458,7 +420,7 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPostWithoutHash(c *C) {
-	runProxy(c, nil, false)
+	runProxy(c, false)
 	defer closeListener()
 
 	{
@@ -501,7 +463,7 @@ func (s *ServerRequiredSuite) TestStripHint(c *C) {
 //   With a valid but non-existing prefix (expect "\n")
 //   With an invalid prefix (expect error)
 func (s *ServerRequiredSuite) TestGetIndex(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	// Put "index-data" blocks
@@ -524,7 +486,7 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 	_, _, err = kc.PutB([]byte("some-more-index-data"))
 	c.Check(err, IsNil)
 
-	kc.Arvados.ApiToken = arvadostest.DataManagerToken
+	kc.Arvados.ApiToken = arvadostest.SystemRootToken
 
 	// Invoke GetIndex
 	for _, spec := range []struct {
@@ -564,7 +526,7 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestCollectionSharingToken(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 	hash, _, err := kc.PutB([]byte("shareddata"))
 	c.Check(err, IsNil)
@@ -577,7 +539,7 @@ func (s *ServerRequiredSuite) TestCollectionSharingToken(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	// Put a test block
@@ -614,10 +576,10 @@ func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
-	// Point keepproxy to a non-existant keepstore
+	// Point keepproxy at a non-existent keepstore
 	locals := map[string]string{
 		TestProxyUUID: "http://localhost:12345",
 	}
@@ -640,7 +602,7 @@ func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
 }
 
 func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
@@ -663,10 +625,10 @@ func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPing(c *C) {
-	kc := runProxy(c, nil, false)
+	kc := runProxy(c, false)
 	defer closeListener()
 
-	rtr := MakeRESTRouter(true, true, kc, 10*time.Second, arvadostest.ManagementToken)
+	rtr := MakeRESTRouter(kc, 10*time.Second, arvadostest.ManagementToken)
 
 	req, err := http.NewRequest("GET",
 		"http://"+listener.Addr().String()+"/_health/ping",