test runs

Author: pinzon

localstack_utils/__init__.py

@@ -3,8 +3,9 @@
 import docker
 from time import sleep
 
-LOCALSTACK_NAME = "localstack/localstack"
-LOCALSTACK_TAG = "latest"
+LOCALSTACK_COMMUNITY_IMAGE_NAME = "localstack/localstack"
+LOCALSTACK_PRO_IMAGE_NAME = "localstack/localstack-pro"
+LATEST_TAG = "latest"
 
 MAX_PORT_CONNECTION_ATTEMPTS = 10
 MAX_LOG_COLLECTION_ATTEMPTS = 120
@@ -24,16 +25,19 @@ class Container:
     @staticmethod
     def create_localstack_container(
         pull_new_image: bool,
-        image_name: str,
-        image_tag: str,
-        gateway_listen: str,
-        environment_variables: dict,
-        bind_ports: dict,
+        image_name: str = None,
+        image_tag: str = LATEST_TAG,
+        gateway_listen: str = "0.0.0.0:4566",
+        environment_variables: dict = None,
+        bind_ports: dict = None,
+        pro: bool = False,
     ):
         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_name_or_default = image_name or (
+            LOCALSTACK_PRO_IMAGE_NAME if pro else LOCALSTACK_COMMUNITY_IMAGE_NAME
+        )
         image_exists = (
             True
             if len(DOCKER_CLIENT.images.list(name=image_name_or_default))

localstack_utils/container.py

@@ -38,26 +38,21 @@ def startup(self, docker_configuration):
         if self.locked:
             raise Exception("A docker instance is starting or already started.")
         self.locked = True
-        self.external_hostname = docker_configuration.external_hostname
 
         try:
             self.localstack_container = Container.create_localstack_container(
-                docker_configuration.external_hostname,
                 docker_configuration.pull_new_image,
-                docker_configuration.randomize_ports,
                 docker_configuration.image_name,
                 docker_configuration.image_tag,
-                docker_configuration.port_edge,
-                docker_configuration.port_elastic_search,
+                docker_configuration.gateway_listen,
                 docker_configuration.environment_variables,
                 docker_configuration.port_mappings,
-                docker_configuration.bind_mounts,
-                docker_configuration.platform,
+                docker_configuration.pro,
             )
 
             self.setup_logger()
 
-            Container.waitForReady(self.localstack_container, READY_TOKEN)
+            Container.wait_for_ready(self.localstack_container, READY_TOKEN)
 
         except docker.errors.APIError:
             if not docker_configuration.ignore_docker_runerrors:
@@ -74,16 +69,37 @@ def setup_logger(self):
         localstack_logger.start()
 
 
-def startup_localstack(port=4566, services=[], ignore_docker_errors=False):
+def startup_localstack(
+    image_name="",
+    tag="",
+    pro=False,
+    ports=None,
+    env_variables=None,
+    gateway_listen="",
+    ignore_docker_errors=False,
+):
     global localstack_instance
     localstack_instance = Localstack.INSTANCE()
     config = LocalstackDockerConfiguration()
 
-    if len(services):
-        config.envirement_variables.update({"SERVICES": ",".join(services)})
-    if port != 4566:
-        config.port_edge = str(port)
     config.ignore_docker_runerrors = ignore_docker_errors
+    if image_name:
+        config.image_name = image_name
+
+    if tag:
+        config.image_tag = tag
+
+    if ports:
+        config.port_mappings = ports
+
+    if pro:
+        config.pro = pro
+
+    if env_variables:
+        config.environment_variables = env_variables
+
+    if gateway_listen:
+        config.gateway_listen = gateway_listen
 
     localstack_instance.startup(config)
 

localstack_utils/localstack_utils.py localstack_utils/localstack.pylocalstack_utils/localstack_utils.py renamed to localstack_utils/localstack.py

@@ -13,3 +13,4 @@ class LocalstackDockerConfiguration:
     initialization_token = None
     use_dingle_docker_container = False
     ignore_docker_runerrors = False
+    pro = False

localstack_utils/localstack_docker_configuration.py

@@ -47,7 +47,3 @@ exclude =
 exclude =
     tests
     tests.*
-
-[options.entry_points]
-localstack_utils =
-    localstack_utils = localstack_utils

setug.cfg

@@ -1,7 +1,7 @@
 import time
 import boto3
 import unittest
-from localstack_utils import startup_localstack, stop_localstack
+from localstack_utils.localstack import startup_localstack, stop_localstack
 
 
 class TestKinesis(unittest.TestCase):
@@ -21,7 +21,7 @@ def test_create_stream(self):
         )
 
         kinesis.create_stream(StreamName="test", ShardCount=1)
-        time.sleep(5)
+        time.sleep(1)
 
         response = kinesis.list_streams()
         self.assertGreater(len(response.get("StreamNames", [])), 0)