X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/5d5af52a33ec8b10a9af6afd50141db3923441ec..16f704326f44fd1e5e5e60b936c9b5895d6a6ff8:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index de72e747f3..dc70d968e2 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -125,6 +125,7 @@ func (s *ServerRequiredSuite) TestResponseViaHeader(c *C) {
 	req, err := http.NewRequest("POST",
 		"http://"+listener.Addr().String()+"/",
 		strings.NewReader("TestViaHeader"))
+	c.Assert(err, Equals, nil)
 	req.Header.Add("Authorization", "OAuth2 "+arvadostest.ActiveToken)
 	resp, err := (&http.Client{}).Do(req)
 	c.Assert(err, Equals, nil)
@@ -161,6 +162,33 @@ func (s *ServerRequiredSuite) TestLoopDetection(c *C) {
 	c.Check(err, ErrorMatches, `.*loop detected.*`)
 }
 
+func (s *ServerRequiredSuite) TestStorageClassesHeader(c *C) {
+	kc := runProxy(c, nil, false)
+	defer closeListener()
+
+	// Set up fake keepstore to record request headers
+	var hdr http.Header
+	ts := httptest.NewServer(http.HandlerFunc(
+		func(w http.ResponseWriter, r *http.Request) {
+			hdr = r.Header
+			http.Error(w, "Error", http.StatusInternalServerError)
+		}))
+	defer ts.Close()
+
+	// Point keepproxy router's keepclient to the fake keepstore
+	sr := map[string]string{
+		TestProxyUUID: ts.URL,
+	}
+	router.(*proxyHandler).KeepClient.SetServiceRoots(sr, sr, sr)
+
+	// Set up client to ask for storage classes to keepproxy
+	kc.StorageClasses = []string{"secure"}
+	content := []byte("Very important data")
+	_, _, err := kc.PutB(content)
+	c.Check(err, NotNil)
+	c.Check(hdr.Get("X-Keep-Storage-Classes"), Equals, "secure")
+}
+
 func (s *ServerRequiredSuite) TestDesiredReplicas(c *C) {
 	kc := runProxy(c, nil, false)
 	defer closeListener()
@@ -294,6 +322,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		reader, blocklen, _, err := kc.Get(hash2)
 		c.Assert(err, Equals, nil)
 		all, err := ioutil.ReadAll(reader)
+		c.Check(err, IsNil)
 		c.Check(all, DeepEquals, []byte("foo"))
 		c.Check(blocklen, Equals, int64(3))
 		c.Log("Finished Get (expected success)")
@@ -313,6 +342,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		reader, blocklen, _, err := kc.Get("d41d8cd98f00b204e9800998ecf8427e")
 		c.Assert(err, Equals, nil)
 		all, err := ioutil.ReadAll(reader)
+		c.Check(err, IsNil)
 		c.Check(all, DeepEquals, []byte(""))
 		c.Check(blocklen, Equals, int64(0))
 		c.Log("Finished Get zero block")
@@ -405,12 +435,14 @@ func (s *ServerRequiredSuite) TestCorsHeaders(c *C) {
 		req, err := http.NewRequest("OPTIONS",
 			fmt.Sprintf("http://%s/%x+3", listener.Addr().String(), md5.Sum([]byte("foo"))),
 			nil)
+		c.Assert(err, IsNil)
 		req.Header.Add("Access-Control-Request-Method", "PUT")
 		req.Header.Add("Access-Control-Request-Headers", "Authorization, X-Keep-Desired-Replicas")
 		resp, err := client.Do(req)
 		c.Check(err, Equals, nil)
 		c.Check(resp.StatusCode, Equals, 200)
 		body, err := ioutil.ReadAll(resp.Body)
+		c.Check(err, IsNil)
 		c.Check(string(body), Equals, "")
 		c.Check(resp.Header.Get("Access-Control-Allow-Methods"), Equals, "GET, HEAD, POST, PUT, OPTIONS")
 		c.Check(resp.Header.Get("Access-Control-Allow-Origin"), Equals, "*")
@@ -434,6 +466,7 @@ func (s *ServerRequiredSuite) TestPostWithoutHash(c *C) {
 		req, err := http.NewRequest("POST",
 			"http://"+listener.Addr().String()+"/",
 			strings.NewReader("qux"))
+		c.Check(err, IsNil)
 		req.Header.Add("Authorization", "OAuth2 "+arvadostest.ActiveToken)
 		req.Header.Add("Content-Type", "application/octet-stream")
 		resp, err := client.Do(req)
@@ -481,14 +514,15 @@ func (s *ServerRequiredSuite) TestGetIndex(c *C) {
 	c.Check(err, Equals, nil)
 
 	reader, blocklen, _, err := kc.Get(hash)
-	c.Assert(err, Equals, nil)
+	c.Assert(err, IsNil)
 	c.Check(blocklen, Equals, int64(10))
 	all, err := ioutil.ReadAll(reader)
+	c.Assert(err, IsNil)
 	c.Check(all, DeepEquals, data)
 
 	// Put some more blocks
-	_, rep, err = kc.PutB([]byte("some-more-index-data"))
-	c.Check(err, Equals, nil)
+	_, _, err = kc.PutB([]byte("some-more-index-data"))
+	c.Check(err, IsNil)
 
 	kc.Arvados.ApiToken = arvadostest.DataManagerToken
 
@@ -580,30 +614,29 @@ func (s *ServerRequiredSuite) TestPutAskGetInvalidToken(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestAskGetKeepProxyConnectionError(c *C) {
-	arv, err := arvadosclient.MakeArvadosClient()
-	c.Assert(err, Equals, nil)
+	kc := runProxy(c, nil, false)
+	defer closeListener()
 
-	// keepclient with no such keep server
-	kc := keepclient.New(arv)
+	// Point keepproxy at a non-existent keepstore
 	locals := map[string]string{
 		TestProxyUUID: "http://localhost:12345",
 	}
-	kc.SetServiceRoots(locals, nil, nil)
+	router.(*proxyHandler).KeepClient.SetServiceRoots(locals, nil, nil)
 
-	// Ask should result in temporary connection refused error
+	// Ask should result in temporary bad gateway error
 	hash := fmt.Sprintf("%x", md5.Sum([]byte("foo")))
-	_, _, err = kc.Ask(hash)
+	_, _, err := kc.Ask(hash)
 	c.Check(err, NotNil)
 	errNotFound, _ := err.(*keepclient.ErrNotFound)
 	c.Check(errNotFound.Temporary(), Equals, true)
-	c.Assert(err, ErrorMatches, ".*connection refused.*")
+	c.Assert(err, ErrorMatches, ".*HTTP 502.*")
 
-	// Get should result in temporary connection refused error
+	// Get should result in temporary bad gateway error
 	_, _, _, err = kc.Get(hash)
 	c.Check(err, NotNil)
 	errNotFound, _ = err.(*keepclient.ErrNotFound)
 	c.Check(errNotFound.Temporary(), Equals, true)
-	c.Assert(err, ErrorMatches, ".*connection refused.*")
+	c.Assert(err, ErrorMatches, ".*HTTP 502.*")
 }
 
 func (s *NoKeepServerSuite) TestAskGetNoKeepServerError(c *C) {