localstack-core 4.14.1.dev45__tar.gz → 4.14.1.dev47__tar.gz

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.14.1.dev45
+Version: 4.14.1.dev47
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/aws/connect.py

@@ -128,6 +128,13 @@ def get_service_endpoint() -> str | None:
     return localstack_config.internal_service_url()
 
 
+def try_replace_s3_vhost_url(endpoint_url: str) -> str:
+    if match := re.match(r"https?://(localhost(\.localstack\.cloud)?)(:[0-9]+)?$", endpoint_url):
+        return endpoint_url.replace(f"://{match.group(1)}", f"://{get_s3_hostname()}")
+
+    return endpoint_url
+
+
 #
 # Data transfer object
 #
@@ -518,12 +525,8 @@ class InternalClientFactory(ClientFactory):
             config = self._config.merge(config)
 
         endpoint_url = endpoint_url or self._endpoint or get_service_endpoint()
-        if (
-            endpoint_url
-            and service_name == "s3"
-            and re.match(r"https?://localhost(:[0-9]+)?", endpoint_url)
-        ):
-            endpoint_url = endpoint_url.replace("://localhost", f"://{get_s3_hostname()}")
+        if endpoint_url and service_name == "s3":
+            endpoint_url = try_replace_s3_vhost_url(endpoint_url)
 
         return self._get_client(
             service_name=service_name,
@@ -588,12 +591,8 @@ class ExternalClientFactory(ClientFactory):
             config = config.merge(Config(region_name=region_name))
 
         endpoint_url = endpoint_url or self._endpoint or get_service_endpoint()
-        if (
-            endpoint_url
-            and service_name == "s3"
-            and re.match(r"https?://localhost(:[0-9]+)?", endpoint_url)
-        ):
-            endpoint_url = endpoint_url.replace("://localhost", f"://{get_s3_hostname()}")
+        if endpoint_url and service_name == "s3":
+            endpoint_url = try_replace_s3_vhost_url(endpoint_url)
 
         # Prevent `PartialCredentialsError` when only access key ID is provided
         # The value of secret access key is insignificant and can be set to anything

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/testing/aws/util.py

@@ -10,7 +10,6 @@ from botocore.compat import HTTPHeaders
 from botocore.config import Config
 from botocore.exceptions import ClientError
 
-from localstack import config
 from localstack.aws.api import RequestContext
 from localstack.aws.connect import (
     ClientFactory,
@@ -102,7 +101,7 @@ def create_client_with_keys(
         aws_secret_access_key=keys["SecretAccessKey"],
         aws_session_token=keys.get("SessionToken"),
         config=client_config,
-        endpoint_url=config.internal_service_url() if not is_aws_cloud() else None,
+        endpoint_url=TEST_AWS_ENDPOINT_URL if not is_aws_cloud() else None,
     )
 
 

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/testing/config.py

@@ -1,5 +1,6 @@
 import os
 
+from localstack import config
 from localstack.config import is_env_true
 from localstack.constants import DEFAULT_AWS_ACCOUNT_ID
 
@@ -10,7 +11,7 @@ TEST_AWS_ACCOUNT_ID = os.getenv("TEST_AWS_ACCOUNT_ID") or DEFAULT_AWS_ACCOUNT_ID
 TEST_AWS_ACCESS_KEY_ID = os.getenv("TEST_AWS_ACCESS_KEY_ID") or "test"
 TEST_AWS_SECRET_ACCESS_KEY = os.getenv("TEST_AWS_SECRET_ACCESS_KEY") or "test"
 TEST_AWS_REGION_NAME = os.getenv("TEST_AWS_REGION_NAME") or "us-east-1"
-TEST_AWS_ENDPOINT_URL = os.getenv("TEST_AWS_ENDPOINT_URL")
+TEST_AWS_ENDPOINT_URL = os.getenv("TEST_AWS_ENDPOINT_URL") or config.external_service_url()
 
 # Secondary test AWS profile - only used for testing against AWS
 SECONDARY_TEST_AWS_PROFILE = os.getenv("SECONDARY_TEST_AWS_PROFILE")
@@ -23,3 +24,10 @@ SECONDARY_TEST_AWS_REGION_NAME = os.getenv("SECONDARY_TEST_AWS_REGION_NAME") or
 
 TEST_SKIP_LOCALSTACK_START = is_env_true("TEST_SKIP_LOCALSTACK_START")
 TEST_FORCE_LOCALSTACK_START = is_env_true("TEST_FORCE_LOCALSTACK_START")
+
+
+def external_localstack_host() -> bool:
+    """
+    Returns true if the tests are running on a separate host than LocalStack
+    """
+    return bool(os.getenv("TEST_AWS_ENDPOINT_URL"))

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/testing/pytest/fixtures.py

@@ -26,6 +26,7 @@ from localstack import config
 from localstack.aws.api.cloudformation import CreateChangeSetInput, Parameter
 from localstack.aws.api.ec2 import CreateSecurityGroupRequest, CreateVpcEndpointRequest, VpcEndpoint
 from localstack.aws.connect import ServiceLevelClientFactory
+from localstack.constants import LOCALHOST_HOSTNAME
 from localstack.services.stores import (
     AccountRegionBundle,
     BaseStore,
@@ -54,6 +55,7 @@ from localstack.utils.json import CustomEncoder, json_safe
 from localstack.utils.net import wait_for_port_open
 from localstack.utils.strings import short_uid, to_str
 from localstack.utils.sync import ShortCircuitWaitException, poll_condition, retry, wait_until
+from localstack.utils.urls import localstack_host
 
 LOG = logging.getLogger(__name__)
 
@@ -2858,3 +2860,42 @@ def logs_log_stream(logs_log_group, aws_client):
 
     for stream_name in log_stream_names:
         aws_client.logs.delete_log_stream(logStreamName=stream_name, logGroupName=logs_log_group)
+
+
+@pytest.fixture()
+def disable_requests_ssl_verification():
+    # modified into a fixture from https://stackoverflow.com/a/15445989
+    # Only disable SSL verification if we use a non default hostname
+    if localstack_host().host == LOCALHOST_HOSTNAME:
+        yield
+        return
+
+    import requests
+
+    old_merge_environment_settings = requests.Session.merge_environment_settings
+
+    opened_adapters = set()
+
+    def merge_environment_settings(self, url, proxies, stream, verify, cert):
+        # Verification happens only once per connection so we need to close
+        # all the opened adapters once we're done. Otherwise, the effects of
+        # verify=False persist beyond the end of this context manager.
+        opened_adapters.add(self.get_adapter(url))
+
+        settings = old_merge_environment_settings(self, url, proxies, stream, verify, cert)
+        settings["verify"] = False
+
+        return settings
+
+    requests.Session.merge_environment_settings = merge_environment_settings
+
+    try:
+        yield
+    finally:
+        requests.Session.merge_environment_settings = old_merge_environment_settings
+
+        for adapter in opened_adapters:
+            try:
+                adapter.close()
+            except Exception:
+                pass

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/testing/pytest/marking.py

@@ -73,7 +73,9 @@ class Markers:
     requires_in_process = pytest.mark.requires_in_process
     """The test and the LS instance have to be run in the same process"""
     requires_docker = pytest.mark.requires_docker
-    """The test requires docker or a compatible container engine - will not work on kubernetes"""
+    """The test requires the LocalStack instance having access to docker or a compatible container engine - will not work on kubernetes"""
+    test_requires_docker = pytest.mark.test_requires_docker
+    """The test itself requires docker or a compatible container engine - will not work without the test having access to a docker instance"""
     lambda_runtime_update = pytest.mark.lambda_runtime_update
     """Tests to execute when updating snapshots for a new Lambda runtime"""
     skip_k8s = pytest.mark.skip_k8s
@@ -223,7 +225,11 @@ def pytest_configure(config):
     )
     config.addinivalue_line(
         "markers",
-        "requires_docker: mark the test as requiring docker (or a compatible container engine) - will not work on kubernetes.",
+        "requires_docker: mark the test requiring a LocalStack instance with access to docker (or a compatible container engine) - will not work on kubernetes.",
+    )
+    config.addinivalue_line(
+        "markers",
+        "test_requires_docker: mark the test itself as requiring docker (or a compatible container engine) - LS itself might not need access to docker",
     )
     config.addinivalue_line(
         "markers",

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.14.1.dev45'
-__version_tuple__ = version_tuple = (4, 14, 1, 'dev45')
+__version__ = version = '4.14.1.dev47'
+__version_tuple__ = version_tuple = (4, 14, 1, 'dev47')
 
-__commit_id__ = commit_id = 'gc47d18cad'
+__commit_id__ = commit_id = 'g7ab7a9381'

{localstack_core-4.14.1.dev45 → localstack_core-4.14.1.dev47}/localstack-core/localstack_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.14.1.dev45
+Version: 4.14.1.dev47
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0