cleanup

Author: antonpirker

tests/integrations/aws_lambda/client.py

@@ -1,10 +1,7 @@
 import boto3
 import docker
 import json
-import os
-import platform
 import pytest
-import socket
 import subprocess
 import tempfile
 import time
@@ -21,24 +18,6 @@
 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")
@@ -55,7 +34,7 @@ def test_environment():
 
     # Create local AWS SAM stack
     app = App()
-    stack = LocalLambdaStack(app, "LocalLambdaStack", host=_get_host_ip())
+    stack = LocalLambdaStack(app, "LocalLambdaStack")
 
     # Write SAM template to file
     template = app.synth().get_stack_by_name("LocalLambdaStack").template

tests/integrations/aws_lambda/test_aws_lambda.py

@@ -5,6 +5,8 @@
 import sys
 import time
 import threading
+import socket
+import platform
 
 from aws_cdk import (
     CfnResource,
@@ -24,19 +26,35 @@
 PYTHON_VERSION = f"python{sys.version_info.major}.{sys.version_info.minor}"
 
 
+def get_host_ip():
+    """
+    Returns the IP address of the host we are running on.
+    """
+    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
+
+
 class LocalLambdaStack(Stack):
     """
     Uses the AWS CDK to create a local SAM stack containing Lambda functions.
     """
 
     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
-
+        print("[LocalLambdaStack] Creating local SAM Lambda Stack")
         super().__init__(scope, construct_id, **kwargs)
-        print(
-            "[LocalLambdaStack] Creating local SAM Lambda Stack (Sentry DSN: %s)" % dsn
-        )
 
         # Override the template synthesis
         self.template_options.template_format_version = "2010-09-09"
@@ -64,6 +82,9 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
             },
         )
 
+        dsn = f"http://123@{get_host_ip()}:9999/0"  # noqa: E231
+        print("[LocalLambdaStack] Using Sentry DSN: %s" % dsn)
+
         print(
             "[LocalLambdaStack] Add all Lambda functions defined in "
             "/tests/integrations/aws_lambda/lambda_functions/ to the SAM stack"