pyntcli 0.1.100__py3-none-any.whl → 0.1.102__py3-none-any.whl

pyntcli/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.100"
+__version__ = "0.1.102"
 
 try:
     from logzio import sender

pyntcli/commands/postman.py

@@ -98,7 +98,7 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "postman",
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, name="--port"))
+            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, port=args.port, name="--port"))
 
         postman_docker = pynt_container.PyntContainerNative(container_config)
         postman_docker.prepare_client()

pyntcli/pynt_docker/pynt_container.py

@@ -1,6 +1,5 @@
 import platform
 import subprocess
-from docker.types import Mount
 import os
 import json
 import argparse
@@ -21,7 +20,13 @@ PYNT_CONTAINER_INTERNAL_PORT = "5001"
 
 
 def create_mount(src, destination, mount_type="bind"):
-    return Mount(target=destination, source=src, type=mount_type)
+    return {
+        'Target': destination,
+        'Source': src,
+        'Type': mount_type,
+        'ReadOnly': False,
+        'NoCopy': False,
+    }
 
 
 class DockerNotAvailableException(Exception):
@@ -92,7 +97,8 @@ class DockerContainerConfig:
                 self.docker_arguments.append(p.name)
                 self.docker_arguments.append(str(p.dest))
             else:
-                ports[str(p.src)] = int(p.dest)
+                # `dest` is the host port, `src` is in the container
+                ports[str(p.dest)] = int(p.src)
 
         if create_network_host:
             self.docker_type = PyntNativeHost(network="host")
@@ -188,7 +194,7 @@ def get_docker_mounts(args: argparse.Namespace) -> list:
 class PyntContainerNative:
     def __init__(self, container_config: DockerContainerConfig):
         self.config = container_config
-        self.container_name = ""
+        self.container_name = "pynt_engine"
         self.system = platform.system().lower()
         self.stdout = None
         self.running = False
@@ -216,7 +222,7 @@ class PyntContainerNative:
 
         self.fetch_and_validate_image()
         args = self.config.docker_arguments if self.config.docker_arguments else None
-        docker_command = ["docker", "run", "-d"]
+        docker_command = ["docker", "run", "--rm", "-d", "--name", self.container_name]
 
         mounts = []
         for mount in self.config.mounts:
@@ -228,11 +234,10 @@ class PyntContainerNative:
 
         docker_type_options = []
         for key, value in self.config.docker_type.get_arguments().items():
-            if key == "ports":
-                if isinstance(value, dict):
-                    for s, d in value.items():
-                        # --publish source:destination for each port
-                        docker_type_options.extend([f"-p", f"{s}:{d}"])
+            if key == "ports" and isinstance(value, dict):
+                for host_port, container_port in value.items():
+                    # --publish HOST_PORT:CONTAINER_PORT for each port
+                    docker_type_options.extend(["-p", f"{host_port}:{container_port}"])
             else:
                 docker_type_options.extend([f"--{key}={value}"])
 
@@ -270,7 +275,7 @@ class PyntContainerNative:
         ui_thread.print_verbose("Killing other pynt containers if such exist")
         try:
             for _ in IMAGE_TAGS:
-                command = ["docker", "ps", "-q", "-f", f"ancestor={self.config.image.name}"]
+                command = ["docker", "ps", "-q", "-f", f"name={self.container_name}"]
                 containers_output = subprocess.check_output(command, text=True)
                 if not containers_output:
                     continue
@@ -293,7 +298,7 @@ class PyntContainerNative:
             pull_command = ['docker', 'pull', self.config.image.name]
             get_image_command = ['docker', 'images', '-q', f'{self.config.image.name}']
             pull_process = subprocess.Popen(pull_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            pull_stdout, pull_stderr = pull_process.communicate()
+            _, pull_stderr = pull_process.communicate()
             get_process = subprocess.Popen(get_image_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             get_stdout, _ = get_process.communicate()
             local_image_id = get_stdout.decode('utf-8')

{pyntcli-0.1.100.dist-info → pyntcli-0.1.102.dist-info}/METADATA

@@ -1,11 +1,10 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.100
+Version: 0.1.102
 Summary: Command line utility to handle all of Pynt's different integrations
 Author-email: Pynt-io <support@pynt.io>
 Project-URL: Homepage, https://pynt.io
 Requires-Python: >=3.7
-Requires-Dist: docker
 Requires-Dist: rich
 Requires-Dist: requests==2.31.0
 Requires-Dist: pem

{pyntcli-0.1.100.dist-info → pyntcli-0.1.102.dist-info}/RECORD

@@ -1,7 +1,7 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 ignoreTests/auth/login.py,sha256=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=-ZeumLDPTHS2r0t8ZT98JHgmzaxmfZaDpjbaLrfkeuw,403
+pyntcli/__init__.py,sha256=FOqUO2NVzyu71qVPUvSdcSq0R9nb3HWrEn0eMrsEMO8,403
 pyntcli/main.py,sha256=WEbWyqzDjtnZGSWgqru1FCT7wmHdi11uzd1LmwTTCI4,6095
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=9TRAEoPbv4rWOZfcNaGanrRJAFvNs39P-uKSl49GcQE,3679
@@ -14,7 +14,7 @@ pyntcli/commands/har.py,sha256=NzxyXlgS5YtQJqi9528V0FkbonMaZ0wHuvRl0LmR5JA,4329
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
 pyntcli/commands/listen.py,sha256=oxgMvJYpPEu6h8qRFoueGF3a_nmwzaWMPL8ucfy7yxE,8983
 pyntcli/commands/newman.py,sha256=PRbsbDTxL54FRVYOYEpKJ5icVdGXtG2bfiGsnJgmKT4,5173
-pyntcli/commands/postman.py,sha256=HPFNcmAtVziLCAimUg8GUXBMUGBGAXBrSPvP6Tuiubk,4971
+pyntcli/commands/postman.py,sha256=aStkkyx3FTXvnIcQxNf1_OPKDE1RL25OALc2eyAZJCY,4980
 pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,7012
 pyntcli/commands/root.py,sha256=6dSzKSjUX-ZetE2KYJNkBmfDDrcYJligmHBqIAIc2aQ,4140
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
@@ -24,7 +24,7 @@ pyntcli/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
 pyntcli/log/log.py,sha256=cWCdWmUaAwePwdhYDcgNMEG9d9RM34sGahxBCYEdv2Y,1069
 pyntcli/pynt_docker/__init__.py,sha256=PQIOVxc7XXtMLfEX7ojgwf_Z3mmTllO3ZvzUZTPOxQY,30
 pyntcli/pynt_docker/container_utils.py,sha256=_Onn7loInzyJAG2-Uk6CGpsuRyelmUFHOvtJj4Uzi9A,175
-pyntcli/pynt_docker/pynt_container.py,sha256=NxizyjSgXSyPbKFs5ggyBSOcLVlb0xk9MS96L2XLrZ4,13126
+pyntcli/pynt_docker/pynt_container.py,sha256=Yl_YESabRmWb38roDDUa_r3NKeAiwa0h9TPY7zTIsfY,13303
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=ZLSe0WAjHDp8cSt4BBFDkPGRux4cgOo5UfF7V4naM7U,2559
@@ -39,8 +39,8 @@ pyntcli/ui/report.py,sha256=W-icPSZrGLOubXgam0LpOvHLl_aZg9Zx9qIkL8Ym5PE,1930
 pyntcli/ui/ui_thread.py,sha256=XUBgLpYQjVhrilU-ofw7VSXgTiwneSdTxm61EvC3x4Q,5091
 tests/test_utils.py,sha256=t5fTQUk1U_Js6iMxcGYGqt4C-crzOJ0CqCKtLkRtUi0,2050
 tests/commands/test_pynt_cmd.py,sha256=BjGFCFACcSziLrNA6_27t6TjSmvdu54wx9njwLpRSJY,8379
-pyntcli-0.1.100.dist-info/METADATA,sha256=ofzCKRvESAbl7zbATZPp-PCqCJT-EP_3xPNRPj_3i0E,494
-pyntcli-0.1.100.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pyntcli-0.1.100.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.100.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.100.dist-info/RECORD,,
+pyntcli-0.1.102.dist-info/METADATA,sha256=hC0ph5yb-J8gVgy9CKsVxj6s5UR80btfQdehYhTT_e0,472
+pyntcli-0.1.102.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pyntcli-0.1.102.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.102.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.102.dist-info/RECORD,,