pyntcli 0.1.116__py3-none-any.whl → 0.1.117__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.116"
+__version__ = "0.1.117"

pyntcli/auth/login.py

@@ -31,13 +31,6 @@ PYNT_SAAS = os.environ.get("PYNT_SAAS_URL") if os.environ.get(
     "PYNT_SAAS_URL") else "https://api.pynt.io/v1"
 PYNT_APP_URL = os.environ.get("PYNT_APP_URL") if os.environ.get(
     "PYNT_APP_URL") else "https://app.pynt.io"
-PYNT_BUCKET_NAME = os.environ.get(
-    "PYNT_BUCKET_NAME") if os.environ.get("PYNT_BUCKET_NAME") else ""
-PYNT_PARAM1 = os.environ.get(
-    "PYNT_PARAM1") if os.environ.get("PYNT_PARAM1") else ""
-PYNT_PARAM2 = os.environ.get(
-    "PYNT_PARAM2") if os.environ.get("PYNT_PARAM2") else ""
-
 
 def generate_device_code() -> str:
     """

pyntcli/pynt_docker/container_utils.py

@@ -1,7 +1,53 @@
-
 import socket
+import subprocess
+import time
+from typing import Optional, List
+
+GRACEFUL_KILL_TIMEOUT_SECONDS = 10
 
 
 def is_port_in_use(port: int) -> bool:
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        return s.connect_ex(('localhost', port)) == 0
+        return s.connect_ex(("localhost", port)) == 0
+
+
+def list_running_containers(
+    name: Optional[str] = None, container_id: Optional[str] = None
+) -> List[str]:
+    ps_filter = []
+    if name is not None:
+        ps_filter.extend(["-f", f"name={name}"])
+    elif container_id is not None:
+        ps_filter.extend(["-f", f"id={container_id}"])
+
+    output = subprocess.check_output(
+        ["docker", "ps", "-a", "-q", *ps_filter],
+        text=True,
+    )
+    return output.splitlines()
+
+
+def kill_container_gracefully(container_id: str):
+    subprocess.run(
+        ["docker", "kill", "--signal", "SIGINT", container_id],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )
+
+    for _ in range(GRACEFUL_KILL_TIMEOUT_SECONDS):
+        time.sleep(1)
+        is_still_running = len(list_running_containers(container_id=container_id)) > 0
+        if not is_still_running:
+            return
+
+    if len(list_running_containers(container_id=container_id)) > 0:
+        kill_container_gracefully(container_id)
+
+
+def kill_container(container_id: str):
+    # `doccker remove -f` sends SIGKILL
+    subprocess.run(
+        ["docker", "remove", "-f", container_id],
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL,
+    )

pyntcli/pynt_docker/pynt_container.py

@@ -7,17 +7,15 @@ import argparse
 import threading
 from datetime import datetime
 from typing import List
-import base64
 
 from . import container_utils
 
 from pyntcli.ui import ui_thread
 from pyntcli.analytics import send as analytics
 from pyntcli.store import CredStore
-from pyntcli.auth.login import PYNT_ID, PYNT_SAAS, PYNT_BUCKET_NAME, PYNT_PARAM1, PYNT_PARAM2
+from pyntcli.auth.login import PYNT_ID, PYNT_SAAS
 
 PYNT_DOCKER_IMAGE = "ghcr.io/pynt-io/pynt"
-IMAGE_TAGS = ["postman-latest", "newman-latest", "har-latest", "proxy-latest", "v1-latest"]
 
 
 def create_mount(src, destination, mount_type="bind"):
@@ -95,8 +93,9 @@ class DockerContainerConfig:
         self.docker_arguments = build_docker_args(integration_name, args, port_args)
         self.mounts = get_docker_mounts(args)
         self.env_vars = {PYNT_ID: CredStore().get_tokens(), "PYNT_SAAS_URL": PYNT_SAAS}
-        if user_set_all_variables():
-            add_env_variables(self.env_vars)
+        otel_endpoint = os.environ.get("OTEL_COLLECTOR_ENDPOINT")
+        if otel_endpoint:
+            self.env_vars["OTEL_COLLECTOR_ENDPOINT"] = otel_endpoint
 
 
 def get_image_config(args: argparse.Namespace) -> PyntDockerImage:
@@ -122,16 +121,6 @@ def is_network_host() -> bool:
         return True
 
 
-def user_set_all_variables():
-    return all([PYNT_BUCKET_NAME, PYNT_PARAM1, PYNT_PARAM2])
-
-
-def add_env_variables(env: dict):
-    env["PYNT_BUCKET_NAME"] = PYNT_BUCKET_NAME
-    env["PYNT_PARAM1"] = base64.b64encode(PYNT_PARAM1.encode('utf-8')).decode('utf-8')
-    env["PYNT_PARAM2"] = base64.b64encode(PYNT_PARAM2.encode('utf-8')).decode('utf-8')
-
-
 def value_from_environment_variable(key):
     e = os.environ.get(key)
 
@@ -300,29 +289,23 @@ class PyntContainerNative:
             # Start log streaming in a separate thread
             DockerLogFollower(docker_exec, container_id).start()
 
-    def kill_other_instances(self, report_to_user=True):
+    def kill_other_instances(self, gracefully: bool) -> int:
         ui_thread.print_verbose("Killing other pynt containers if such exist")
+        killed_containers = 0
         try:
-            for _ in IMAGE_TAGS:
-                command = ["docker", "ps", "-a", "-q", "-f", f"name={self.container_name}"]
-                containers_output = subprocess.check_output(command, text=True)
-                if not containers_output:
-                    continue
-
-                container_ids = containers_output.splitlines()
-                for container_id in container_ids:
-                    kill_command = ["docker", "kill", container_id]
-                    remove_command = ["docker", "remove", container_id]
-                    subprocess.run(kill_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-                    subprocess.run(remove_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-                    if report_to_user:
-                        ui_thread.print(
-                            ui_thread.PrinterText("Another Pynt container was running, killed it", ui_thread.PrinterText))
-
+            container_ids = container_utils.list_running_containers(name=self.container_name)
+            for container_id in container_ids:
+                if gracefully:
+                    container_utils.kill_container_gracefully(container_id)
+                else:
+                    container_utils.kill_container(container_id)
+                killed_containers += 1
         except subprocess.CalledProcessError:
             analytics.emit(analytics.ERROR, {"error": "Unable to kill other pynt containers"})
             ui_thread.print(ui_thread.PrinterText("Error: Unable to kill other pynt containers", ui_thread.PrinterText.WARNING))
 
+        return killed_containers
+
     def fetch_and_validate_image(self):
         try:
             ui_thread.print(ui_thread.PrinterText("Pulling latest docker image", ui_thread.PrinterText.INFO))
@@ -356,11 +339,18 @@ class PyntContainerNative:
     def stop(self):
         if not self.running:
             return
-        self.kill_other_instances(report_to_user=False)
+        self.kill_other_instances(gracefully=True)
         self.running = False
 
     def pre_run_validation(self, port):
-        self.kill_other_instances()
+        killed_containers = self.kill_other_instances(gracefully=False)
+        if killed_containers > 0:
+            ui_thread.print(
+                ui_thread.PrinterText(
+                    "Another Pynt container was running, killed it",
+                    ui_thread.PrinterText,
+                )
+            )
 
         ui_thread.print_verbose("Checking if port is in use")
         if container_utils.is_port_in_use(int(port)):

{pyntcli-0.1.116.dist-info → pyntcli-0.1.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyntcli
-Version: 0.1.116
+Version: 0.1.117
 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

{pyntcli-0.1.116.dist-info → pyntcli-0.1.117.dist-info}/RECORD

@@ -1,12 +1,12 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 ignoreTests/auth/login.py,sha256=7GeBirHTD9t6EassLYsegCw1FZHkfjvVW1Z5uybHzgM,3801
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=WH7k6Lp9d5LeVrO9NrIvNHTU68a2Yw4l0K-_6mGJeDk,24
+pyntcli/__init__.py,sha256=tC6Ly5NZvDBZKJuC4iaO2NyJcqX7enbauSAG6rxadFU,24
 pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=0hJ0WJNFHLqyohtRr_xOg5WEXzxHrUOlcePPg-k65Hk,3846
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/auth/login.py,sha256=Oz1DtEZje0afgJcHSwEFHcH78X-QD5Mjn0CQ9ZgCfQU,5844
+pyntcli/auth/login.py,sha256=qtdoCgWIPi3_YXehI7SVk_E8aDVhH39wGc87tlkazSE,5558
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/commands/burp.py,sha256=9kcqjC9Rgj5oZimGZuA_oO71Hn2Z3py8k5vr-eMKnUM,14317
 pyntcli/commands/command.py,sha256=ulxhWyTnuqQfyNy5somqBbQoTCvd0Hg4OnPJ8thJzAs,11078
@@ -24,8 +24,8 @@ pyntcli/commands/util.py,sha256=ev06aUlJ9tCSw1eAGVIsGlVVY4u0H6AJG9b5MB_bAzs,4594
 pyntcli/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
 pyntcli/log/log.py,sha256=YXCvcCzuhQ5QUT2L02uQEdN_lTCzLEuet4OnLuEnjlM,112
 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=4vW12inRuKgsUM5K8NHTEjPZE1Qp8F62_J0gy6FjiRU,14506
+pyntcli/pynt_docker/container_utils.py,sha256=DeI-uSgdcO_2rGs2dvQ5gBDNo_iKKuPIQO2D9oej5Gw,1485
+pyntcli/pynt_docker/pynt_container.py,sha256=7VG7e8mCabFUJoX-AuSnxVoXtO9ben-QQdNBL5Y5z9g,13861
 pyntcli/saas_client/__init__.py,sha256=HPBzoC5a6F5_WkHubcjq_W4m1OQ9i0TX8QXBtJlKm1M,26
 pyntcli/saas_client/saas_client.py,sha256=7mJNo2x4Oy2N4NKdHyGRxXZUk_VHZvRu1x586rojrp0,1756
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
@@ -42,8 +42,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=J4JrEuD_qSVN76Fu6bKRjrxWSwCTXVEAzVPYdXMa0tI,8826
-pyntcli-0.1.116.dist-info/METADATA,sha256=68McFg0rYxmguHJX3Tc-YVRv9pg-zyyxNuUN1H_283M,427
-pyntcli-0.1.116.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-pyntcli-0.1.116.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.116.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.116.dist-info/RECORD,,
+pyntcli-0.1.117.dist-info/METADATA,sha256=R8P0CNK4GXBEwOB-ky2Qxu9lHrURd-eogrp1lIF3pwo,427
+pyntcli-0.1.117.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyntcli-0.1.117.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.117.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.117.dist-info/RECORD,,

{pyntcli-0.1.116.dist-info → pyntcli-0.1.117.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any