minor fixes in wiremock extension

Author: whummer

localstack-wiremock/Makefile

@@ -40,7 +40,9 @@ test:		    ## Run integration tests (requires LocalStack running with the Extens
 
 sample:		    ## Deploy sample app
 	bin/create-stubs.sh
-	(cd sample-app; tflocal init; tflocal apply)
+	(cd sample-app; tflocal init; tflocal apply -auto-approve)
+	apiId=$$(awslocal apigateway get-rest-apis | jq -r '.items[0].id'); \
+	    curl -k https://$$apiId.execute-api.us-east-1.localhost.localstack.cloud/dev/time-off
 
 clean-dist: clean
 	rm -rf dist/

localstack-wiremock/localstack_wiremock/utils/docker.py

@@ -4,10 +4,6 @@
 from typing import Callable
 import requests
 
-from localstack_wiremock.utils.h2_proxy import (
-    apply_http2_patches_for_grpc_support,
-    ProxyRequestMatcher,
-)
 from localstack.utils.docker_utils import DOCKER_CLIENT
 from localstack.extensions.api import Extension, http
 from localstack.http import Request
@@ -24,7 +20,7 @@
 # TODO: merge utils with code in TypeDB extension over time ...
 
 
-class ProxiedDockerContainerExtension(Extension, ProxyRequestMatcher):
+class ProxiedDockerContainerExtension(Extension):
     name: str
     """Name of this extension"""
     image_name: str
@@ -80,12 +76,6 @@ def update_gateway_routes(self, router: http.Router[http.RouteHandler]):
             resource = WithHost(self.host, [resource])
         router.add(resource)
 
-        # apply patches to serve HTTP/2 requests
-        for port in self.http2_ports or []:
-            apply_http2_patches_for_grpc_support(
-                get_addressable_container_host(), port, self
-            )
-
     def on_platform_shutdown(self):
         self._remove_container()
 
@@ -127,7 +117,9 @@ def start_container(self) -> None:
 
         def _ping_endpoint():
             # TODO: allow defining a custom healthcheck endpoint ...
-            response = requests.get(f"http://{container_host}:{main_port}/")
+            response = requests.get(
+                f"http://{container_host}:{main_port}/__admin/health"
+            )
             assert response.ok
 
         try:

localstack-wiremock/pyproject.toml

@@ -14,9 +14,7 @@ authors = [
 keywords = ["LocalStack", "WireMock"]
 classifiers = []
 dependencies = [
-    "httpx",
-    "h2",
-    "priority",
+    "priority"
 ]
 
 [project.urls]
@@ -35,4 +33,4 @@ dev = [
 ]
 
 [project.entry-points."localstack.extensions"]
-localstack_wiremock = "localstack_wiremock.extension:WireMockExtension"
+localstack-wiremock = "localstack_wiremock.extension:WireMockExtension"

localstack-wiremock/sample-app/main.tf

@@ -33,8 +33,8 @@ resource "null_resource" "package_lambda" {
     command = <<-EOT
       rm -rf "${path.module}/build"
       mkdir -p "${path.module}/build"
-      pip install --system -r "${path.module}/src/requirements.txt" -t "${path.module}/build"
       cp "${path.module}/src/handler.py" "${path.module}/build/"
+      pip install -r "${path.module}/src/requirements.txt" -t "${path.module}/build"
     EOT
     interpreter = ["/bin/bash", "-c"]
   }

localstack-wiremock/sample-app/src/handler.py

@@ -8,7 +8,7 @@ def get_time_off(event, context):
     and returns a transformed JSON response.
     """
     try:
-        # The mock API endpoint URL
+        # Define the mock API endpoint URL (hardcoding `host.docker.internal` for now)
         # url = "http://wiremock.localhost.localstack.cloud:8080/company/time-offs/534813865"
         url = "http://host.docker.internal:8080/company/time-offs/534813865"