change behaviour of hosted domain (#353)

serverless · Jan 16, 2018 · 34492df · 34492df
1 parent 16e6c79
commit 34492df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/router/router.go b/router/router.go
@@ -498,12 +498,7 @@ func extractPath(host, path string) string {
 	rxp, _ := regexp.Compile(hostedDomain)
 	if rxp.MatchString(host) {
 		subdomain := strings.Split(host, ".")[0]
-		segments := strings.Split(subdomain, "---")
-		extracted = ""
-		for i := len(segments) - 1; i >= 0; i-- {
-			extracted += "/" + segments[i]
-		}
-		extracted += path
+		extracted = "/" + subdomain + path
 	}
 	return extracted
 }

diff --git a/router/router_test.go b/router/router_test.go
@@ -145,11 +145,11 @@ func TestRouterServeHTTP_ExtractPathFromHostedDomain(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 	target := mock.NewMockTargeter(ctrl)
-	target.EXPECT().HTTPBackingFunction(http.MethodGet, "/name/app/dev/test").Return(nil, pathtree.Params{}, &cors.CORS{}).MaxTimes(1)
+	target.EXPECT().HTTPBackingFunction(http.MethodGet, "/custom/test").Return(nil, pathtree.Params{}, &cors.CORS{}).MaxTimes(1)
 	target.EXPECT().SubscribersOfEvent("/", event.SystemEventReceivedType).Return([]functions.FunctionID{}).MaxTimes(1)
 	router := testrouter(target)
 
-	req, _ := http.NewRequest(http.MethodGet, "https://dev---app---name.slsgateway.com/test", nil)
+	req, _ := http.NewRequest(http.MethodGet, "https://custom.slsgateway.com/test", nil)
 	recorder := httptest.NewRecorder()
 	router.ServeHTTP(recorder, req)