Merge pull request #1030 from collabsoft-net/master

fix greedy path for proxy
dherault · Jun 29, 2020 · 7485bf3 · 7485bf3
2 parents 8d10387 + 8128fda
commit 7485bf3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/events/http/HttpServer.js b/src/events/http/HttpServer.js
@@ -909,26 +909,24 @@ export default class HttpServer {
     serverlessLog('Routes defined in resources:')
 
     Object.entries(resourceRoutes).forEach(([methodId, resourceRoutesObj]) => {
-      const {
-        isProxy,
-        method,
-        path,
-        pathResource,
-        proxyUri,
-      } = resourceRoutesObj
+      const { isProxy, method, pathResource, proxyUri } = resourceRoutesObj
 
       if (!isProxy) {
         serverlessLog(
           `WARNING: Only HTTP_PROXY is supported. Path '${pathResource}' is ignored.`,
         )
         return
       }
-      if (!path) {
+      if (!pathResource) {
         serverlessLog(`WARNING: Could not resolve path for '${methodId}'.`)
         return
       }
 
-      const hapiPath = generateHapiPath(path, this.#options, this.#serverless)
+      const hapiPath = generateHapiPath(
+        pathResource,
+        this.#options,
+        this.#serverless,
+      )
       const proxyUriOverwrite = resourceRoutesOptions[methodId] || {}
       const proxyUriInUse = proxyUriOverwrite.Uri || proxyUri
 

diff --git a/src/events/http/parseResources.js b/src/events/http/parseResources.js
@@ -145,10 +145,6 @@ function getIntegrationObj(methodObj) {
   return methodObj.Properties.Integration
 }
 
-function templatePathToHapiPath(path) {
-  return path.replace('+', '')
-}
-
 function constructHapiInterface(pathObjects, methodObjects, methodId) {
   // returns all info necessary so that routes can be added in index.js
   const methodObj = methodObjects[methodId]
@@ -163,16 +159,13 @@ function constructHapiInterface(pathObjects, methodObjects, methodId) {
     return {}
   }
 
-  const path = templatePathToHapiPath(pathResource)
-
   if (Integration.Type === APIGATEWAY_INTEGRATION_TYPE_HTTP_PROXY) {
     proxyUri = Integration.Uri
   }
 
   return {
     isProxy: !!proxyUri,
     method,
-    path,
     pathResource,
     proxyUri,
   }

diff --git a/src/utils/generateHapiPath.js b/src/utils/generateHapiPath.js
@@ -4,7 +4,7 @@ export default function generateHapiPath(path = '', options, serverless) {
 
   if (!options.noPrependStageInUrl) {
     const stage = options.stage || serverless.service.provider.stage
-    // prepend stage to path
+    // prepend the stage to path
     hapiPath = `/${stage}${hapiPath}`
   }