Make it work in CI and locally

Author: antonpirker

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -1,6 +1,8 @@
 import boto3
 import docker
 import json
+import os
+import platform
 import pytest
 import socket
 import subprocess
@@ -15,29 +17,45 @@
 from .utils import LocalLambdaStack, SentryServerForTesting, SAM_PORT
 
 
+DOCKER_NETWORK_NAME = "lambda-test-network"
 SAM_TEMPLATE_FILE = "sam.template.yaml"
 
 
+def _get_host_ip():
+    if os.environ.get("GITHUB_ACTIONS"):
+        # Running in GitHub Actions
+        hostname = socket.gethostname()
+        host = socket.gethostbyname(hostname)
+    else:
+        # Running locally
+        if platform.system() in ["Darwin", "Windows"]:
+            # Windows or MacOS
+            host = "host.docker.internal"
+        else:
+            # Linux
+            hostname = socket.gethostname()
+            host = socket.gethostbyname(hostname)
+
+    return host
+
+
 @pytest.fixture(scope="session", autouse=True)
 def test_environment():
     print("[test_environment fixture] Setting up AWS Lambda test infrastructure")
 
     # Create a Docker network
     docker_client = docker.from_env()
-    network = docker_client.networks.create("lambda-test-network", driver="bridge")
+    docker_client.networks.prune()
+    docker_client.networks.create(DOCKER_NETWORK_NAME, driver="bridge")
 
     # Start Sentry server
     server = SentryServerForTesting()
     server.start()
     time.sleep(1)  # Give it a moment to start up
 
-    # Get the host IP address
-    hostname = socket.gethostname()
-    host_ip = socket.gethostbyname(hostname)
-
     # Create local AWS SAM stack
     app = App()
-    stack = LocalLambdaStack(app, "LocalLambdaStack", host=host_ip)
+    stack = LocalLambdaStack(app, "LocalLambdaStack", host=_get_host_ip())
 
     # Write SAM template to file
     template = app.synth().get_stack_by_name("LocalLambdaStack").template
@@ -61,7 +79,7 @@ def test_environment():
             "--warm-containers",
             "EAGER",
             "--docker-network",
-            "lambda-test-network",
+            DOCKER_NETWORK_NAME,
         ],
         stdout=debug_log,
         stderr=debug_log,

tests/integrations/aws_lambda/utils.py

@@ -31,9 +31,12 @@ class LocalLambdaStack(Stack):
 
     def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
         host = kwargs.pop("host", "host-not-specified")
+        dsn = f"http://123@{host}:9999/0"  # noqa: E231
 
         super().__init__(scope, construct_id, **kwargs)
-        print("[LocalLambdaStack] Creating local SAM Lambda Stack: %s" % self)
+        print(
+            "[LocalLambdaStack] Creating local SAM Lambda Stack (Sentry DSN: %s)" % dsn
+        )
 
         # Override the template synthesis
         self.template_options.template_format_version = "2010-09-09"
@@ -85,7 +88,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     ],  # Add layer containing the Sentry SDK to function.
                     "Environment": {
                         "Variables": {
-                            "SENTRY_DSN": f"http://123@{host}:9999/0",
+                            "SENTRY_DSN": dsn,
                             "SENTRY_INITIAL_HANDLER": "index.handler",
                             "SENTRY_TRACES_SAMPLE_RATE": "1.0",
                         }
@@ -109,7 +112,7 @@ def wait_for_stack(cls, timeout=30, port=SAM_PORT):
         while True:
             if time.time() - start_time > timeout:
                 raise TimeoutError(
-                    "SAM failed to start within %s seconds. (Maybe Docker is not running?)"
+                    "AWS SAM failed to start within %s seconds. (Maybe Docker is not running?)"
                     % timeout
                 )
 
@@ -173,7 +176,9 @@ def run_server(self):
         uvicorn.run(self.app, host=self.host, port=self.port, log_level=self.log_level)
 
     def start(self):
-        print("[SentryServerForTesting] Starting server on %s:%s" % (self.host, self.port))
+        print(
+            "[SentryServerForTesting] Starting server on %s:%s" % (self.host, self.port)
+        )
         server_thread = threading.Thread(target=self.run_server, daemon=True)
         server_thread.start()