X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd4a811b896da640e5b8ddca7e515f19085932d4..1d460a17caf94ddc33610b39a0a11aec1d3905a2:/lib/controller/handler_test.go

diff --git a/lib/controller/handler_test.go b/lib/controller/handler_test.go
index ef6b9195f1..2911a4f031 100644
--- a/lib/controller/handler_test.go
+++ b/lib/controller/handler_test.go
@@ -26,13 +26,9 @@ import (
 	check "gopkg.in/check.v1"
 )
 
-var forceLegacyAPI14 bool
-
 // Gocheck boilerplate
 func Test(t *testing.T) {
-	for _, forceLegacyAPI14 = range []bool{false, true} {
-		check.TestingT(t)
-	}
+	check.TestingT(t)
 }
 
 var _ = check.Suite(&HandlerSuite{})
@@ -48,9 +44,8 @@ func (s *HandlerSuite) SetUpTest(c *check.C) {
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 	s.ctx = ctxlog.Context(s.ctx, ctxlog.New(os.Stderr, "json", "debug"))
 	s.cluster = &arvados.Cluster{
-		ClusterID:        "zzzzz",
-		PostgreSQL:       integrationTestCluster().PostgreSQL,
-		ForceLegacyAPI14: forceLegacyAPI14,
+		ClusterID:  "zzzzz",
+		PostgreSQL: integrationTestCluster().PostgreSQL,
 	}
 	s.cluster.API.RequestTimeout = arvados.Duration(5 * time.Minute)
 	s.cluster.TLS.Insecure = true
@@ -198,10 +193,6 @@ func (s *HandlerSuite) TestLogoutSSO(c *check.C) {
 }
 
 func (s *HandlerSuite) TestLogoutGoogle(c *check.C) {
-	if s.cluster.ForceLegacyAPI14 {
-		// Google login N/A
-		return
-	}
 	s.cluster.Login.Google.Enable = true
 	s.cluster.Login.Google.ClientID = "test"
 	req := httptest.NewRequest("GET", "https://0.0.0.0:1/logout?return_to=https://example.com/foo", nil)
@@ -294,6 +285,8 @@ func (s *HandlerSuite) CheckObjectType(c *check.C, url string, token string, ski
 	}
 	resp2, err := client.Get(s.cluster.Services.RailsAPI.ExternalURL.String() + url + "/?api_token=" + token)
 	c.Check(err, check.Equals, nil)
+	c.Assert(resp2.StatusCode, check.Equals, http.StatusOK,
+		check.Commentf("Wasn't able to get data from the RailsAPI at %q", url))
 	defer resp2.Body.Close()
 	db, err := ioutil.ReadAll(resp2.Body)
 	c.Check(err, check.Equals, nil)
@@ -334,7 +327,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		"api_clients/" + arvadostest.TrustedWorkbenchAPIClientUUID:     nil,
 		"api_client_authorizations/" + arvadostest.AdminTokenUUID:      nil,
 		"authorized_keys/" + arvadostest.AdminAuthorizedKeysUUID:       nil,
-		"collections/" + arvadostest.CollectionWithUniqueWordsUUID:     map[string]bool{"href": true},
+		"collections/" + arvadostest.CollectionWithUniqueWordsUUID:     {"href": true},
 		"containers/" + arvadostest.RunningContainerUUID:               nil,
 		"container_requests/" + arvadostest.QueuedContainerRequestUUID: nil,
 		"groups/" + arvadostest.AProjectUUID:                           nil,
@@ -343,7 +336,7 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		"logs/" + arvadostest.CrunchstatForRunningJobLogUUID:           nil,
 		"nodes/" + arvadostest.IdleNodeUUID:                            nil,
 		"repositories/" + arvadostest.ArvadosRepoUUID:                  nil,
-		"users/" + arvadostest.ActiveUserUUID:                          map[string]bool{"href": true},
+		"users/" + arvadostest.ActiveUserUUID:                          {"href": true},
 		"virtual_machines/" + arvadostest.TestVMUUID:                   nil,
 		"workflows/" + arvadostest.WorkflowWithDefinitionYAMLUUID:      nil,
 	}
@@ -351,3 +344,19 @@ func (s *HandlerSuite) TestGetObjects(c *check.C) {
 		s.CheckObjectType(c, "/arvados/v1/"+url, arvadostest.AdminToken, skippedFields)
 	}
 }
+
+func (s *HandlerSuite) TestRedactRailsAPIHostFromErrors(c *check.C) {
+	req := httptest.NewRequest("GET", "https://0.0.0.0:1/arvados/v1/collections/zzzzz-4zz18-abcdefghijklmno", nil)
+	req.Header.Set("Authorization", "Bearer "+arvadostest.ActiveToken)
+	resp := httptest.NewRecorder()
+	s.handler.ServeHTTP(resp, req)
+	c.Check(resp.Code, check.Equals, http.StatusNotFound)
+	var jresp struct {
+		Errors []string
+	}
+	c.Log(resp.Body.String())
+	c.Assert(json.NewDecoder(resp.Body).Decode(&jresp), check.IsNil)
+	c.Assert(jresp.Errors, check.HasLen, 1)
+	c.Check(jresp.Errors[0], check.Matches, `.*//railsapi\.internal/arvados/v1/collections/.*: 404 Not Found.*`)
+	c.Check(jresp.Errors[0], check.Not(check.Matches), `(?ms).*127.0.0.1.*`)
+}