fix: event.resource in catch-all route gets + changed to * (#1524)

src/events/http/lambda-events/LambdaProxyIntegrationEvent.js

@@ -146,7 +146,10 @@ export default class LambdaProxyIntegrationEvent {
     const httpMethod = method.toUpperCase()
     const requestTime = formatToClfTime(received)
     const requestTimeEpoch = received
-    const resource = this.#routeKey || route.path.replace(`/${this.#stage}`, '')
+    // NOTE replace * added by generateHapiPath util so api gateway event is accurate
+    const resource =
+      this.#routeKey ||
+      route.path.replace(`/${this.#stage}`, '').replace('*', '+')
 
     return {
       body,

tests/endToEnd/starRoutesRestApi/src/handler.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const { stringify } = JSON
+
+exports.hello = async (event) => {
+  return {
+    body: stringify({
+      path: event.path,
+      resource: event.resource,
+    }),
+    statusCode: 200,
+  }
+}

tests/endToEnd/starRoutesRestApi/src/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "commonjs"
+}

tests/endToEnd/starRoutesRestApi/src/serverless.yml

@@ -0,0 +1,22 @@
+service: uncategorized-tests
+
+configValidationMode: error
+
+plugins:
+  - ../../../../
+
+provider:
+  memorySize: 128
+  name: aws
+  region: us-east-1 # default
+  runtime: nodejs16.x
+  stage: dev
+  versionFunctions: false
+
+functions:
+  hello:
+    events:
+      - http:
+          method: any
+          path: /{proxy+}
+    handler: handler.hello

tests/endToEnd/starRoutesRestApi/starRoutesRestApi.test.js

@@ -0,0 +1,27 @@
+import assert from 'node:assert'
+import { dirname, resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { BASE_URL } from '../../config.js'
+import { setup, teardown } from '../../_testHelpers/index.js'
+
+const __dirname = dirname(fileURLToPath(import.meta.url))
+
+describe('star routes', function desc() {
+  beforeEach(() =>
+    setup({
+      servicePath: resolve(__dirname, 'src'),
+    }),
+  )
+
+  afterEach(() => teardown())
+
+  describe('when a catch all route is used in a rest api', () => {
+    it('it should return a payload', async () => {
+      const url = new URL('/dev/hello', BASE_URL)
+      const response = await fetch(url)
+      const json = await response.json()
+
+      assert.deepEqual(json, { path: '/hello', resource: '/{proxy+}' })
+    })
+  })
+})

tests/endToEnd/trailingSlash/trailingSlash.test.js

@@ -24,7 +24,7 @@ describe('noStripTrailingSlashInUrl option', function desc() {
 
       assert.deepEqual(json, {
         path: '/echo/something/',
-        resource: '/echo/{any*}',
+        resource: '/echo/{any+}',
       })
     })
   })