fix(lambda): resolves static index pages.

outofcoffee · Oct 1, 2023 · b44f434 · b44f434
1 parent 6a4567f
commit b44f434
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 1 deletion.
diff --git a/adapter/awslambda/src/main/java/io/gatehill/imposter/awslambda/impl/LambdaServerFactory.kt b/adapter/awslambda/src/main/java/io/gatehill/imposter/awslambda/impl/LambdaServerFactory.kt
@@ -96,7 +96,7 @@ class LambdaServerFactory @Inject constructor(
                     path = path.removePrefix(routePath.removeSuffix("*"))
                 }
             }
-            if (path.endsWith('/')) {
+            if (path.endsWith('/') || path.isEmpty()) {
                 path += indexFile
             }
             logger.debug("Serving static resource: $path")

diff --git a/adapter/awslambda/src/test/java/io/gatehill/imposter/awslambda/HandlerTest.kt b/adapter/awslambda/src/test/java/io/gatehill/imposter/awslambda/HandlerTest.kt
@@ -123,6 +123,16 @@ class HandlerTest : AbstractHandlerTest() {
         assertThat(responseEvent.body, containsString(".example"))
     }
 
+    @ParameterizedTest
+    @Event(value = "simple/requests_v1/request_static_index.json", type = APIGatewayProxyRequestEvent::class)
+    fun `should load static index file`(event: APIGatewayProxyRequestEvent) {
+        val responseEvent = handler!!.handleRequest(event, context!!)
+
+        assertNotNull(responseEvent, "Response event should be returned")
+        assertEquals(200, responseEvent.statusCode)
+        assertThat(responseEvent.body, containsString("<!doctype html>"))
+    }
+
     @ParameterizedTest
     @Event(value = "simple/requests_v1/request_status.json", type = APIGatewayProxyRequestEvent::class)
     fun `should fetch version from status endpoint`(event: APIGatewayProxyRequestEvent) {

diff --git a/adapter/awslambda/src/test/java/io/gatehill/imposter/awslambda/HandlerV2Test.kt b/adapter/awslambda/src/test/java/io/gatehill/imposter/awslambda/HandlerV2Test.kt
@@ -123,6 +123,16 @@ class HandlerV2Test : AbstractHandlerTest() {
         assertThat(responseEvent.body, containsString(".example"))
     }
 
+    @ParameterizedTest
+    @Event(value = "simple/requests_v2/request_static_index.json", type = APIGatewayV2HTTPEvent::class)
+    fun `should load static index file`(event: APIGatewayV2HTTPEvent) {
+        val responseEvent = handler!!.handleRequest(event, context!!)
+
+        assertNotNull(responseEvent, "Response event should be returned")
+        assertEquals(200, responseEvent.statusCode)
+        assertThat(responseEvent.body, containsString("<!doctype html>"))
+    }
+
     @ParameterizedTest
     @Event(value = "simple/requests_v2/request_status.json", type = APIGatewayV2HTTPEvent::class)
     fun `should fetch version from status endpoint`(event: APIGatewayV2HTTPEvent) {

diff --git a/adapter/awslambda/src/test/resources/simple/config/imposter-config.yaml b/adapter/awslambda/src/test/resources/simple/config/imposter-config.yaml
@@ -12,3 +12,7 @@ resources:
   - path: /assets/*
     response:
       dir: assets
+
+  - path: /www/*
+    response:
+      dir: www
diff --git a/adapter/awslambda/src/test/resources/simple/config/www/index.html b/adapter/awslambda/src/test/resources/simple/config/www/index.html
@@ -0,0 +1,52 @@
+<!--
+  ~ Copyright (c) 2023.
+  ~
+  ~ This file is part of Imposter.
+  ~
+  ~ "Commons Clause" License Condition v1.0
+  ~
+  ~ The Software is provided to you by the Licensor under the License, as
+  ~ defined below, subject to the following condition.
+  ~
+  ~ Without limiting other conditions in the License, the grant of rights
+  ~ under the License will not include, and the License does not grant to
+  ~ you, the right to Sell the Software.
+  ~
+  ~ For purposes of the foregoing, "Sell" means practicing any or all of
+  ~ the rights granted to you under the License to provide to third parties,
+  ~ for a fee or other consideration (including without limitation fees for
+  ~ hosting or consulting/support services related to the Software), a
+  ~ product or service whose value derives, entirely or substantially, from
+  ~ the functionality of the Software. Any license notice or attribution
+  ~ required by the License must also include this Commons Clause License
+  ~ Condition notice.
+  ~
+  ~ Software: Imposter
+  ~
+  ~ License: GNU Lesser General Public License version 3
+  ~
+  ~ Licensor: Peter Cornish
+  ~
+  ~ Imposter is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Lesser General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ Imposter is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with Imposter.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
+<!doctype html>
+<html lang="en">
+<head>
+    <title>Example</title>
+</head>
+<body>
+Hello world
+</body>
+</html>
diff --git a/adapter/awslambda/src/test/resources/simple/requests_v1/request_static_index.json b/adapter/awslambda/src/test/resources/simple/requests_v1/request_static_index.json
@@ -0,0 +1,9 @@
+{
+  "path": "/www/",
+  "httpMethod":  "GET",
+  "headers": {},
+  "queryStringParameters": {},
+  "pathParameters": {},
+  "body": null,
+  "isBase64Encoded": false
+}
diff --git a/adapter/awslambda/src/test/resources/simple/requests_v2/request_static_index.json b/adapter/awslambda/src/test/resources/simple/requests_v2/request_static_index.json
@@ -0,0 +1,13 @@
+{
+  "headers": {},
+  "queryStringParameters": {},
+  "pathParameters": {},
+  "body": null,
+  "isBase64Encoded": false,
+  "requestContext": {
+    "http": {
+      "path": "/www/",
+      "method":  "GET"
+    }
+  }
+}