Merge pull request #63 from Komalis/feat/rework-sync

fix: issue with sync not being done correctly

Author: Komalis

easyecs/cli.py

@@ -314,7 +314,7 @@ def action_dev(
 
     for event_handler in event_handlers:
         event_handler.synchronize()
-        time.sleep(1)
+        time.sleep(0.1)
 
     found_tty = execute_command(
         ecs_manifest,

easyecs/command/__init__.py

@@ -1,3 +1,4 @@
+from hashlib import md5
 import json
 import os
 import subprocess
@@ -91,8 +92,11 @@ def run_sync_thread(parsed_containers, ecs_manifest):
         if len(container.volumes) > 0:
             observer = Observer()
             container_name = container.name
-            port = parsed_containers[container_name].get("netcat_port", None)
             for volume in container.volumes:
+                md5_volume = md5(volume.encode("utf-8")).hexdigest()
+                port = parsed_containers[container_name].get(
+                    f"netcat_port_{md5_volume}", None
+                )
                 _from, _ = volume.split(":")
                 event_handler = SynchronizeEventHandler(volume, port)
                 event_handlers.append(event_handler)
@@ -172,8 +176,11 @@ def run_nc_command(
     for container in containers:
         if len(container.volumes) > 0:
             for volume in container.volumes:
+                md5_volume = md5(volume.encode("utf-8")).hexdigest()
                 random_port = generate_random_port()
-                parsed_containers[container_name]["netcat_port"] = random_port
+                parsed_containers[container_name][
+                    f"netcat_port_{md5_volume}"
+                ] = random_port
                 port_forward(
                     parsed_containers,
                     container_name,
@@ -184,15 +191,28 @@ def run_nc_command(
                 )
                 client = boto3.client("ssm")
                 target = parsed_containers.get(container_name)["ssm_target"]
-                command_server = [
-                    f"bash -c 'while true; do nc -v -l {random_port} >"
-                    f" /tmp/{random_port}.tar.gz.tmp; cp /tmp/{random_port}.tar.gz.tmp"
-                    f" /tmp/{random_port}.copy.tar.gz; fc=$(cat"
-                    f" /tmp/{random_port}.copy.tar.gz | tar -ztf - | head -c1); if ["
-                    f" $fc = . ]; then cat /tmp/{random_port}.copy.tar.gz | tar -xzf -;"
-                    f" else cat /tmp/{random_port}.copy.tar.gz | tar -xzf - -C /; fi;"
-                    " done'"
-                ]
+                command_server = [f"""
+                    bash -c '
+                        set -x
+                        set -u
+                        while true
+                        do
+                            RANDOM_PORT={random_port}
+                            RANDOM_NUMBER=$RANDOM
+                            nc -v -l ${{RANDOM_PORT}} > /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.tar.gz.tmp
+                            cp /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.tar.gz.tmp /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz
+                            rm /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.tar.gz.tmp
+                            fc=$(cat /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz | tar -ztf - | head -c1)
+                            if [ $fc = . ]
+                            then
+                                cat /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz | tar -xzf -
+                            else
+                                # cat /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz | tar -xzf - -C /
+                                tar -xzf /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz -C /
+                            fi
+                            rm /tmp/${{RANDOM_PORT}}.${{RANDOM_NUMBER}}.copy.tar.gz
+                        done'
+                    """]  # noqa
                 parameters_nc_server = {"command": command_server}
                 ssm_nc_server = client.start_session(
                     Target=target,

easyecs/helpers/common.py

@@ -2,7 +2,6 @@
 import os
 import random
 import re
-import time
 from typing import Dict
 import boto3
 import socket
@@ -84,6 +83,5 @@ def generate_random_port():
     random_port = random.randint(1024, 65535)
     while is_port_in_use(random_port):
         random_port = random.randint(1024, 65535)
-        time.sleep(0.1)
     random_port = str(random_port)
     return random_port

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "easyecs"
-version = "0.18.1"
+version = "0.19.0"
 description = ""
 authors = ["BONVARLET Benjamin <benjaminbonvarlet96@gmail.com>"]
 readme = "README.md"