make catalog-api name computation more robust

grimasta · Feb 4, 2016 · d872ed0 · d872ed0
1 parent d85f49b
commit d872ed0
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/ajaxCatalogLoadTest.php b/ajaxCatalogLoadTest.php
@@ -3,11 +3,8 @@
     $application = getenv("VCAP_APPLICATION");
     $application_json = json_decode($application, true);
     $applicationName = $application_json["name"];
-    if (substr($applicationName, -3) === "-ui") { // if suffixed with "-ui", remove trailing "-ui"
-        $catalogAppName = substr($applicationName, 0, -3)  . "-catalog-api";
-    } else {
-        $catalogAppName = $applicationName . "-catalog-api";
-    }
+    $catalogAppName = str_replace("ui-", "catalog-api-", $applicationName);
+    $catalogAppName = str_replace("-ui", "-catalog-api", $catalogAppName);
     $applicationURI = $application_json["application_uris"][0];
     $catalogHost=substr_replace($applicationURI, $catalogAppName, 0, strlen($applicationName));
     $catalogRoute = "http://" . $catalogHost;