update and simplify config

Author: pinzon

.gitignore

@@ -3,3 +3,4 @@
 nosetests.xml
 __pycache__
 localstack_utils.egg-info
+.ruff_cache

localstack_utils/container.py

@@ -5,8 +5,6 @@
 
 LOCALSTACK_NAME = "localstack/localstack"
 LOCALSTACK_TAG = "latest"
-LOCALSTACK_PORT_EDGE = "4566"
-LOCALSTACK_PORT_ELASTICSEARCH = "4571"
 
 MAX_PORT_CONNECTION_ATTEMPTS = 10
 MAX_LOG_COLLECTION_ATTEMPTS = 120
@@ -17,66 +15,55 @@
 ENV_USE_SSL = "USE_SSL"
 ENV_DEBUG_DEFAULT = "1"
 LOCALSTACK_EXTERNAL_HOSTNAME = "HOSTNAME_EXTERNAL"
-DEFAULT_CONTAINER_ID = "localstack_main"
+DEFAULT_CONTAINER_ID = "localstack-main"
 
 DOCKER_CLIENT = docker.from_env()
 
 
 class Container:
     @staticmethod
     def create_localstack_container(
-        external_hostname,
         pull_new_image,
-        randomize_ports,
         image_name,
         image_tag,
-        port_edge,
-        port_elasticsearch,
+        gateway_listen,
         environment_variables,
-        port_mappings,
-        bind_mounts,
-        platform,
     ):
-        environment_variables = (
-            {} if environment_variables is None else environment_variables
-        )
-        bind_mounts = {} if bind_mounts is None else bind_mounts
-        port_mappings = {} if port_mappings is None else port_mappings
+        environment_variables = environment_variables or {}
+        environment_variables["GATEWAY_LISTEN"] = gateway_listen
+
         image_name_or_default = LOCALSTACK_NAME if image_name is None else image_name
         image_exists = (
             True
             if len(DOCKER_CLIENT.images.list(name=image_name_or_default))
             else False
         )
 
-        fullPortEdge = {
-            (LOCALSTACK_PORT_EDGE if port_edge is None else port_edge): (
-                LOCALSTACK_PORT_EDGE
-            )
-        }
+        port = gateway_listen.split(":")[1]
+        full_port_edge = {port: port}
 
         if pull_new_image or not image_exists:
             logging.info("Pulling latest image")
             DOCKER_CLIENT.images.pull(image_name_or_default, image_tag)
 
         return DOCKER_CLIENT.containers.run(
             image_name_or_default,
-            ports=fullPortEdge,
+            ports=full_port_edge,
             environment=environment_variables,
             detach=True,
         )
 
     @staticmethod
-    def waitForReady(container, pattern):
-        attemps = 0
+    def wait_for_ready(container, pattern):
+        attempts = 0
 
         while True:
             logs = container.logs(tail=NUM_LOG_LINES).decode("utf-8")
             if re.search(pattern, logs):
                 return
 
             sleep(POLL_INTERVAL)
-            attemps += 1
+            attempts += 1
 
-            if attemps >= MAX_LOG_COLLECTION_ATTEMPTS:
+            if attempts >= MAX_LOG_COLLECTION_ATTEMPTS:
                 raise "Could not find token: " + pattern.toString() + "in logs"

localstack_utils/localstack_docker_configuration.py

@@ -5,9 +5,7 @@ class LocalstackDockerConfiguration:
     image_tag = None
     platform = None
 
-    port_edge = "4566"
-    port_elastic_search = "4571"
-    external_hostname = "localhost"
+    gateway_listen = "0.0.0.0:4566"
     environment_variables = {}
     port_mappings = {}
     bind_mounts = {}