Start of the work to have a flexible scheme

api/checks/api.go

@@ -166,7 +166,7 @@ func (s checksAPIImpl) CreateWPTCheckSuite(appID, installationID int64, sha stri
 
 func (s checksAPIImpl) GetWPTRepoAppInstallationIDs() (appID, installationID int64) {
 	// Production
-	if s.GetHostname() == "wpt.fyi" {
+	if s.GetOrigin().Hostname() == "wpt.fyi" {
 		return wptfyiCheckAppID, wptRepoInstallationID
 	}
 	// Default to staging

api/checks/update.go

@@ -189,9 +189,9 @@ func getDiffSummary(aeAPI shared.AppEngineAPI, diffAPI shared.DiffAPI, suite sha
 	}
 
 	diffURL := diffAPI.GetDiffURL(baseRun, headRun, &diffFilter)
-	host := aeAPI.GetHostname()
+	origin := aeAPI.GetOrigin()
 	checkState := summaries.CheckState{
-		HostName:   host,
+		HostName:   origin.Host,
 		TestRun:    &headRun,
 		Product:    checkProduct,
 		HeadSHA:    headRun.FullRevisionHash,
@@ -231,7 +231,7 @@ func getDiffSummary(aeAPI shared.AppEngineAPI, diffAPI shared.DiffAPI, suite sha
 	resultsComparison := summaries.ResultsComparison{
 		BaseRun: baseRun,
 		HeadRun: headRun,
-		HostURL: fmt.Sprintf("https://%s/", host),
+		HostURL: origin.Host,
 		DiffURL: diffURL.String(),
 	}
 	if headRun.LabelsSet().Contains(shared.PRHeadLabel) {

api/checks/update_test.go

@@ -31,7 +31,8 @@ func TestGetDiffSummary_Regressed(t *testing.T) {
 			aeAPI.EXPECT().Context().AnyTimes().Return(context.Background())
 			aeAPI.EXPECT().IsFeatureEnabled(onlyChangesAsRegressionsFeature).Return(enabled)
 			aeAPI.EXPECT().IsFeatureEnabled(failChecksOnRegressionFeature).Return(false)
-			aeAPI.EXPECT().GetHostname()
+			origin, _ := url.Parse("https://some-origin.com")
+			aeAPI.EXPECT().GetOrigin().Return(origin)
 			diffAPI := sharedtest.NewMockDiffAPI(mockCtrl)
 			diffAPI.EXPECT().GetRunsDiff(before, after, sharedtest.SameDiffFilter("ADC"), gomock.Any()).Return(runDiff, nil)
 			if enabled {
@@ -49,6 +50,7 @@ func TestGetDiffSummary_Regressed(t *testing.T) {
 			_, ok := summary.(summaries.Regressed)
 			assert.True(t, ok)
 			assert.Equal(t, suite.PRNumbers, summary.GetCheckState().PRNumbers)
+			assert.Equal(t, "some-origin.com", summary.GetCheckState().HostName)
 		})
 	}
 	testSummary(false)
@@ -68,7 +70,10 @@ func TestGetDiffSummary_Completed(t *testing.T) {
 	aeAPI.EXPECT().Context().AnyTimes().Return(context.Background())
 	aeAPI.EXPECT().IsFeatureEnabled(onlyChangesAsRegressionsFeature).Return(false)
 	aeAPI.EXPECT().IsFeatureEnabled(failChecksOnRegressionFeature).Return(false)
-	aeAPI.EXPECT().GetHostname()
+	aeAPI.EXPECT().GetOrigin().Return(&url.URL{
+		Scheme: "https",
+		Host:   "example.com",
+	})
 	diffAPI := sharedtest.NewMockDiffAPI(mockCtrl)
 	diffAPI.EXPECT().GetRunsDiff(before, after, gomock.Any(), gomock.Any()).Return(runDiff, nil)
 	diffURL, _ := url.Parse("https://wpt.fyi/results?diff")
@@ -83,6 +88,7 @@ func TestGetDiffSummary_Completed(t *testing.T) {
 	_, ok := summary.(summaries.Completed)
 	assert.True(t, ok)
 	assert.Equal(t, suite.PRNumbers, summary.GetCheckState().PRNumbers)
+	assert.Equal(t, "example.com", summary.GetCheckState().HostName)
 }
 
 func getBeforeAndAfterRuns() (before, after shared.TestRun) {

api/receiver/client/client.go

@@ -11,6 +11,7 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
+	"path"
 	"strings"
 	"time"
 
@@ -67,8 +68,10 @@ func (c client) CreateRun(
 		payload.Add("labels", strings.Join(labels, ","))
 	}
 	// Ensure we call back to this appengine version instance.
-	host := c.aeAPI.GetVersionedHostname()
-	payload.Add("callback_url", fmt.Sprintf("https://%s/api/results/create", host))
+	u := c.aeAPI.GetVersionedOrigin()
+	u.Path = path.Join(u.Path, "/api/results/create")
+
+	payload.Add("callback_url", u.String())
 
 	uploadURL := c.aeAPI.GetResultsUploadURL()
 	req, err := http.NewRequest("POST", uploadURL.String(), strings.NewReader(payload.Encode()))

api/receiver/client/client_test.go

@@ -29,6 +29,7 @@ func TestCreateRun(t *testing.T) {
 		assert.Nil(t, r.ParseForm())
 		assert.Equal(t, []string{"https://wpt.fyi/results.json.gz"}, r.PostForm["result_url"])
 		assert.Equal(t, []string{"https://wpt.fyi/screenshots.db.gz"}, r.PostForm["screenshot_url"])
+		assert.Equal(t, []string{"http://localhost:8080/api/results/create"}, r.PostForm["callback_url"])
 		assert.Equal(t, "foo,bar", r.PostForm.Get("labels"))
 		w.Write([]byte("OK"))
 		visited = true
@@ -41,7 +42,9 @@ func TestCreateRun(t *testing.T) {
 	defer mockC.Finish()
 	aeAPI := sharedtest.NewMockAppEngineAPI(mockC)
 	gomock.InOrder(
-		aeAPI.EXPECT().GetVersionedHostname().Return("localhost:8080"),
+		aeAPI.EXPECT().GetVersionedOrigin().Return(&url.URL{
+			Scheme: "http",
+			Host:   "localhost:8080"}),
 		aeAPI.EXPECT().GetResultsUploadURL().Return(serverURL),
 		aeAPI.EXPECT().GetHTTPClientWithTimeout(UploadTimeout).Return(server.Client()),
 	)

api/screenshot/cache.go

@@ -63,7 +63,7 @@ func uploadScreenshotHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	bucketName := "wptd-screenshots-staging"
-	if aeAPI.GetHostname() == "wpt.fyi" {
+	if aeAPI.GetOrigin().Hostname() == "wpt.fyi" {
 		bucketName = "wptd-screenshots"
 	}
 	bucket := gcs.Bucket(bucketName)

api/screenshot_redirect_handler.go

@@ -26,7 +26,7 @@ func apiScreenshotRedirectHandler(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	aeAPI := shared.NewAppEngineAPI(ctx)
 	bucket := "wptd-screenshots-staging"
-	if aeAPI.GetHostname() == "wpt.fyi" {
+	if aeAPI.GetOrigin().Hostname() == "wpt.fyi" {
 		bucket = "wptd-screenshots"
 	}
 	url := fmt.Sprintf("https://storage.googleapis.com/%s/%s.png", bucket, shot)

api/taskcluster/webhook_test.go

@@ -34,6 +34,16 @@ func strPtr(s string) *string {
 	return &s
 }
 
+func testOrigin() *url.URL {
+	// Because these tests call the function multiple times, we need to use
+	// DoAndReturn and pass this function for the mock assertion.
+	// Without it, it will append the path to the same pointer
+	u := new(url.URL)
+	u.Scheme = "http"
+	u.Host = "localhost:8080"
+	return u
+}
+
 func TestShouldProcessStatus_states(t *testing.T) {
 	status := tc.StatusEventPayload{}
 	status.State = strPtr("success")
@@ -250,6 +260,8 @@ func TestCreateAllRuns_success(t *testing.T) {
 	var requested uint32
 	requested = 0
 	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Nil(t, r.ParseForm())
+		assert.Equal(t, []string{"http://localhost:8080/api/results/create"}, r.PostForm["callback_url"])
 		atomic.AddUint32(&requested, 1)
 		w.Write([]byte("OK"))
 	}
@@ -261,7 +273,8 @@ func TestCreateAllRuns_success(t *testing.T) {
 	mockC := gomock.NewController(t)
 	defer mockC.Finish()
 	aeAPI := sharedtest.NewMockAppEngineAPI(mockC)
-	aeAPI.EXPECT().GetVersionedHostname().AnyTimes().Return("localhost:8080")
+
+	aeAPI.EXPECT().GetVersionedOrigin().MinTimes(1).DoAndReturn(testOrigin)
 	aeAPI.EXPECT().GetHTTPClientWithTimeout(uc.UploadTimeout).AnyTimes().Return(server.Client())
 	aeAPI.EXPECT().GetResultsUploadURL().AnyTimes().Return(serverURL)
 
@@ -308,6 +321,8 @@ func TestCreateAllRuns_one_error(t *testing.T) {
 	var requested uint32
 	requested = 0
 	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Nil(t, r.ParseForm())
+		assert.Equal(t, []string{"http://localhost:8080/api/results/create"}, r.PostForm["callback_url"])
 		if atomic.CompareAndSwapUint32(&requested, 0, 1) {
 			w.Write([]byte("OK"))
 		} else if atomic.CompareAndSwapUint32(&requested, 1, 2) {
@@ -324,7 +339,7 @@ func TestCreateAllRuns_one_error(t *testing.T) {
 	sha := "abcdef1234abcdef1234abcdef1234abcdef1234"
 
 	aeAPI := sharedtest.NewMockAppEngineAPI(mockC)
-	aeAPI.EXPECT().GetVersionedHostname().MinTimes(1).Return("localhost:8080")
+	aeAPI.EXPECT().GetVersionedOrigin().MinTimes(1).DoAndReturn(testOrigin)
 	aeAPI.EXPECT().GetHTTPClientWithTimeout(uc.UploadTimeout).Times(2).Return(server.Client())
 	serverURL, _ := url.Parse(server.URL)
 	aeAPI.EXPECT().GetResultsUploadURL().AnyTimes().Return(serverURL)
@@ -349,6 +364,8 @@ func TestCreateAllRuns_one_error(t *testing.T) {
 
 func TestCreateAllRuns_all_errors(t *testing.T) {
 	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Nil(t, r.ParseForm())
+		assert.Equal(t, []string{"http://localhost:8080/api/results/create"}, r.PostForm["callback_url"])
 		time.Sleep(time.Second * 2)
 	}
 	server := httptest.NewServer(http.HandlerFunc(handler))
@@ -359,7 +376,7 @@ func TestCreateAllRuns_all_errors(t *testing.T) {
 	sha := "abcdef1234abcdef1234abcdef1234abcdef1234"
 
 	aeAPI := sharedtest.NewMockAppEngineAPI(mockC)
-	aeAPI.EXPECT().GetVersionedHostname().MinTimes(1).Return("localhost:8080")
+	aeAPI.EXPECT().GetVersionedOrigin().MinTimes(1).DoAndReturn(testOrigin)
 	// Give a very short timeout (instead of the asked 1min) to make tests faster.
 	aeAPI.EXPECT().GetHTTPClientWithTimeout(uc.UploadTimeout).MinTimes(1).Return(&http.Client{Timeout: time.Microsecond})
 	serverURL, _ := url.Parse(server.URL)
@@ -383,6 +400,8 @@ func TestCreateAllRuns_all_errors(t *testing.T) {
 
 func TestCreateAllRuns_pr_labels_exclude_master(t *testing.T) {
 	handler := func(w http.ResponseWriter, r *http.Request) {
+		assert.Nil(t, r.ParseForm())
+		assert.Equal(t, []string{"http://localhost:8080/api/results/create"}, r.PostForm["callback_url"])
 		// We should not see a master label here, even though we
 		// specify one in the call to tc.CreateAllRuns.
 		defer r.Body.Close()
@@ -398,7 +417,7 @@ func TestCreateAllRuns_pr_labels_exclude_master(t *testing.T) {
 	mockC := gomock.NewController(t)
 	defer mockC.Finish()
 	aeAPI := sharedtest.NewMockAppEngineAPI(mockC)
-	aeAPI.EXPECT().GetVersionedHostname().AnyTimes().Return("localhost:8080")
+	aeAPI.EXPECT().GetVersionedOrigin().AnyTimes().DoAndReturn(testOrigin)
 	aeAPI.EXPECT().GetHTTPClientWithTimeout(uc.UploadTimeout).AnyTimes().Return(server.Client())
 	aeAPI.EXPECT().GetResultsUploadURL().AnyTimes().Return(serverURL)