localstack · thrau · Sep 1, 2023 · Jul 31, 2023 · Jul 31, 2023 · Jul 31, 2023
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -291,7 +291,7 @@ jobs:
             TEST_PATH: "tests/bootstrap"
             COVERAGE_ARGS: "-p"
           command: |
-            PYTEST_ARGS="-s ${TINYBIRD_PYTEST_ARGS}--junitxml=target/reports/bootstrap-tests.xml -o junit_suite_name=bootstrap-tests" make test-coverage
+            PYTEST_ARGS="${TINYBIRD_PYTEST_ARGS}--junitxml=target/reports/bootstrap-tests.xml -o junit_suite_name=bootstrap-tests" make test-coverage
       - store_test_results:
           path: target/reports/
       - run:

diff --git a/localstack/cli/localstack.py b/localstack/cli/localstack.py
@@ -7,6 +7,7 @@
 
 from localstack import config
 from localstack.utils.analytics.cli import publish_invocation
+from localstack.utils.bootstrap import get_container_default_logfile_location
 from localstack.utils.json import CustomEncoder
 
 if sys.version_info >= (3, 8):
@@ -532,11 +533,10 @@ def cmd_logs(follow: bool, tail: int) -> None:
     If your LocalStack container has a different name, set the config variable
     `MAIN_CONTAINER_NAME`.
     """
-    from localstack.utils.bootstrap import LocalstackContainer
     from localstack.utils.docker_utils import DOCKER_CLIENT
 
     container_name = config.MAIN_CONTAINER_NAME
-    logfile = LocalstackContainer(container_name).logfile
+    logfile = get_container_default_logfile_location(container_name)
 
     if not DOCKER_CLIENT.is_container_running(container_name):
         console.print("localstack container not running")

diff --git a/localstack/plugins.py b/localstack/plugins.py
@@ -2,17 +2,18 @@
 
 from localstack import config
 from localstack.runtime import hooks
+from localstack.utils.bootstrap import Container
 
 LOG = logging.getLogger(__name__)
 
 
 @hooks.configure_localstack_container()
-def configure_edge_port(container):
+def configure_edge_port(container: Container):
     ports = [config.EDGE_PORT, config.EDGE_PORT_HTTP]
     LOG.debug("configuring container with edge ports: %s", ports)
     for port in ports:
         if port:
-            container.ports.add(port)
+            container.config.ports.add(port)
 
 
 # Register the ArnPartitionRewriteListener only if the feature flag is enabled

diff --git a/localstack/testing/pytest/fixtures.py b/localstack/testing/pytest/fixtures.py
@@ -1740,7 +1740,7 @@ def factory(ports=None, **kwargs):
 
 
 @pytest.fixture
-def cleanups(aws_client):
+def cleanups():
     cleanup_fns = []
 
     yield cleanup_fns

diff --git a/localstack/utils/analytics/metadata.py b/localstack/utils/analytics/metadata.py
@@ -6,6 +6,7 @@
 
 from localstack import config, constants
 from localstack.runtime import hooks
+from localstack.utils.bootstrap import Container
 from localstack.utils.functions import call_safe
 from localstack.utils.json import FileMappedDocument
 from localstack.utils.objects import singleton_factory
@@ -177,12 +178,12 @@ def prepare_host_machine_id():
 
 
 @hooks.configure_localstack_container()
-def _mount_machine_file(container):
+def _mount_machine_file(container: Container):
     from localstack.utils.container_utils.container_client import VolumeBind
 
     # mount tha machine file from the host's CLI cache directory into the appropriate location in the
     # container
     machine_file = os.path.join(config.dirs.cache, "machine.json")
     if os.path.isfile(machine_file):
         target = os.path.join(config.dirs.for_container().cache, "machine.json")
-        container.volumes.add(VolumeBind(machine_file, target, read_only=True))
+        container.config.volumes.add(VolumeBind(machine_file, target, read_only=True))