Merge pull request #1321 from SUSE/add-pp-healthcheck

Portal proxy healthcheck
cloudfoundry · Oct 24, 2017 · cc9a6c0 · cc9a6c0
2 parents 654b9d3 + ea1ba63
commit cc9a6c0
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/components/app-core/backend/setup_console.go b/components/app-core/backend/setup_console.go
@@ -234,22 +234,31 @@ func (p *portalProxy) SetupMiddleware(setupMiddleware *setupMiddleware) echo.Mid
 
 			setupRequestRegex := "/v1/setup$"
 			setupUpdateRequestRegex := "/v1/setup/update$"
+			versionRequestRegex := "/v1/version$"
+			backendRequestRegex := "/v1/"
 
 			if inCFMode {
 				setupRequestRegex = fmt.Sprintf("^/pp%s", setupRequestRegex)
 				setupUpdateRequestRegex = fmt.Sprintf("^/pp%s", setupUpdateRequestRegex)
+				versionRequestRegex = fmt.Sprintf("^/pp%s", versionRequestRegex)
+				backendRequestRegex = fmt.Sprintf("^/pp%s", backendRequestRegex)
 			}
 
 			isSetupRequest, _ = regexp.MatchString(setupRequestRegex, requestURLPath)
 			if !isSetupRequest {
-				isSetupRequest, _ = regexp.MatchString("/v1/setup/update$", requestURLPath)
+				isSetupRequest, _ = regexp.MatchString(setupUpdateRequestRegex, requestURLPath)
 			}
 			if isSetupRequest {
 				return h(c)
 			}
 
+			isVersionRequest, _ := regexp.MatchString(versionRequestRegex, requestURLPath)
+
+			if isVersionRequest {
+				return h(c)
+			}
 			// Request is not a setup request, refuse backend requests and allow all others
-			isBackendRequest, _ := regexp.MatchString("/v1/", requestURLPath)
+			isBackendRequest, _ := regexp.MatchString(backendRequestRegex, requestURLPath)
 
 			if !isBackendRequest {
 				return h(c)