add util method to get Docker container names (localstack#1641)

localstack/utils/bootstrap.py

@@ -137,11 +137,16 @@ def load_plugins(scope=None):
 
 
 def docker_container_running(container_name):
-    output = to_str(run("docker ps --format '{{.Names}}'"))
-    container_names = re.split(r'\s+', output.replace('\n', ' '))
+    container_names = get_docker_container_names()
     return container_name in container_names
 
 
+def get_docker_container_names():
+    output = to_str(run("docker ps --format '{{.Names}}'"))
+    container_names = re.split(r'\s+', output.strip().replace('\n', ' '))
+    return container_names
+
+
 def setup_logging():
     # determine and set log level
     log_level = logging.DEBUG if is_debug() else logging.INFO

localstack/utils/cli.py

@@ -1,8 +1,7 @@
-import re
 from docopt import docopt
 from localstack import config
 from localstack.utils.bootstrap import (
-    start_infra_in_docker, start_infra_locally, run, to_str, MAIN_CONTAINER_NAME)
+    start_infra_in_docker, start_infra_locally, run, MAIN_CONTAINER_NAME, docker_container_running)
 
 # Note: make sure we don't have imports at the root level here
 
@@ -67,13 +66,10 @@ def cmd_ssh(argv, args):
 Options:
     """
     args.update(docopt(cmd_ssh.__doc__.strip(), argv=argv))
-    lines = to_str(run('docker ps')).split('\n')[1:]
-    lines = [l for l in lines if MAIN_CONTAINER_NAME in l]
-    if len(lines) != 1:
-        raise Exception('Expected 1 running "%s" container, but found %s' % (MAIN_CONTAINER_NAME, len(lines)))
-    cid = re.split(r'\s', lines[0])[0]
+    if not docker_container_running(MAIN_CONTAINER_NAME):
+        raise Exception('Expected 1 running "%s" container, but found none' % MAIN_CONTAINER_NAME)
     try:
-        process = run('docker exec -it %s bash' % cid, tty=True)
+        process = run('docker exec -it %s bash' % MAIN_CONTAINER_NAME, tty=True)
         process.wait()
     except KeyboardInterrupt:
         pass

localstack/utils/common.py

@@ -318,6 +318,10 @@ def has_docker():
         return False
 
 
+def get_docker_container_names():
+    return bootstrap.get_docker_container_names()
+
+
 def is_port_open(port_or_url, http_path=None, expect_success=True, protocols=['tcp']):
     port = port_or_url
     host = 'localhost'

requirements.txt

@@ -28,7 +28,7 @@ forbiddenfruit==0.1.3
 jsonpath-rw==1.4.0
 localstack-ext[full]>=0.10.2
 localstack-ext>=0.10.2         #basic-lib
-localstack-client>=0.12        #basic-lib
+localstack-client>=0.14        #basic-lib
 moto-ext>=1.3.14.1
 nose>=1.3.7
 nose-timer>=0.7.5