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

pyntcli/__init__.py

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

pyntcli/commands/command.py

@@ -98,7 +98,8 @@ class CommandSubCommand(sub_command.PyntSubCommand):
             env_copy.update(
                 {
                     "http_proxy": "http://localhost:{}".format(args.proxy_port),
-                    "https_proxy": "http://localhost:{}".format(args.proxy_port)
+                    "https_proxy": "http://localhost:{}".format(args.proxy_port),
+                    "JAVA_TOOL_OPTIONS": "-Dhttp.proxyHost=localhost -Dhttp.proxyPort={} -Dhttps.proxyHost=localhost -Dhttps.proxyPort={}".format(args.proxy_port, args.proxy_port),
                 }
             )
             return env_copy

pyntcli/commands/pynt_cmd.py

@@ -1,5 +1,4 @@
 import argparse
-import requests
 from typing import Dict, List
 from datetime import datetime, timedelta
 from pyntcli import __version__ as cli_version
@@ -134,30 +133,36 @@ class PyntCommand:
             return False
 
     def _post_login_args_validation(self, args: argparse.Namespace, command: str, is_business_plan_user: bool):
+        if not is_business_plan_user:
+            # All other validations only relevant for business plan users
+            return
+
+        if command in commands_without_app_id:
+            # Skip application validation if it isn't required
+            return
+
+
         if getattr(args, "application_name"):
-            try:
-                pynt_client.get_application_by_name(args.application_name)
-            except HTTPError as e:
-                if e.response.status_code == 404:
-                    if getattr(args, "yes") or self._is_auto_create_app_confirmed(args.application_name):
-                        return
-                    else:
-                        raise UserAbortedException()
-            if getattr(args, "yes") or self._is_missing_app_id_confirmed():
+            # When `--application-name` exists, we'll validate its existence.
+            # If the validation fails due to some error, we'll throw it back as we can't continue the execution.
+            #
+            # In any case, when `application-name` is provided, we don't need `application-id`
+            if pynt_client.validate_application_name_exists(args.application_name):
+                return
+
+            # Application does not exist, validate if the user wants to create it automatically
+            if getattr(args, "yes") or self._is_auto_create_app_confirmed(args.application_name):
                 return
             else:
                 raise UserAbortedException()
 
-        # Confirm not using application-id flag if applicable
-        if getattr(args, "application_id") or command in commands_without_app_id:
+        if getattr(args, "application_id"):
             return
 
-        # For a business user, it's recommended to always provide the application-id.
-        if is_business_plan_user:
-            if getattr(args, "yes") or self._is_missing_app_id_confirmed():
-                return
-            else:
-                raise UserAbortedException()
+        if getattr(args, "yes") or self._is_missing_app_id_confirmed():
+            return
+        else:
+            raise UserAbortedException()
 
     def is_confirmed(self, prompt_history_key: str, confirmation_message: str, default_confirmation: str) -> bool:
         """
@@ -195,5 +200,5 @@ class PyntCommand:
 
 
     def _is_auto_create_app_confirmed(self, application_name: str) -> bool:
-        return self.is_confirmed("", f"Application {application_name} will be created automatically if it does not exist.\n" +
+        return self.is_confirmed("", f"Application {application_name} will be created automatically as it does not exist.\n" +
                                                        f"Do you want to continue with the application name {application_name}?", "yes")

pyntcli/saas_client/saas_client.py

@@ -1,3 +1,4 @@
+import json
 import os
 import requests
 
@@ -5,7 +6,6 @@ import pyntcli.log.log as log
 from pyntcli.store import CredStore
 
 PYNT_SAAS = os.environ.get("PYNT_SAAS_URL", "https://api.pynt.io/v1")
-logger = log.get_logger()
 
 class PyntClient:
     def __init__(self, base_url=PYNT_SAAS):
@@ -29,28 +29,29 @@ class PyntClient:
             return response.json()  # returning actual data
 
         except requests.exceptions.HTTPError as e:
-            logger.error(f"HTTP error accessing '{url}': {e}")
             raise e
-        except requests.exceptions.RequestException as e:
-            logger.error(f"Error accessing '{url}': {e}")
+        except requests.exceptions.RequestException:
+            pass
 
         return None
 
-    def get_application_by_name(self, application_name):
-        url = f"{self.base_url}/application/{application_name}"
+    def validate_application_name_exists(self, application_name):
+        url = f"{self.base_url}/application"
         headers = self._get_headers()
-
-        try:
-            response = requests.get(url, headers=headers)
-            response.raise_for_status()
-            return response.json()  # returning actual data
-
-        except requests.exceptions.HTTPError as e:
-            logger.error(f"HTTP error accessing '{url}': {e}")
-            raise e
-        except requests.exceptions.RequestException as e:
-            logger.error(f"Error accessing '{url}': {e}")
-
-        return None
+        query_filter = {
+            "filter": json.dumps({
+                "where": {
+                    "name": application_name,
+                },
+            })
+        }
+
+        applications_response = requests.get(url, headers=headers, params=query_filter)
+        if applications_response.status_code == 404:
+            return False
+        applications_response.raise_for_status()
+
+        applications = applications_response.json()
+        return len(applications) == 1
 
 pynt_client = PyntClient()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyntcli
-Version: 0.1.117
+Version: 0.1.118
 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.117.dist-info → pyntcli-0.1.118.dist-info}/RECORD

@@ -1,7 +1,7 @@
 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=tC6Ly5NZvDBZKJuC4iaO2NyJcqX7enbauSAG6rxadFU,24
+pyntcli/__init__.py,sha256=NPyYE62Vvtk0QcfoU6DNt1tjRHKRzegMxg0JMV_i078,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
@@ -9,13 +9,13 @@ pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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
+pyntcli/commands/command.py,sha256=TuX7It8gOSG8fY6RvpAak3bkvmKKy-3k7kw-SI8xvKw,11260
 pyntcli/commands/har.py,sha256=laVRjG35LDEykoSfRIuEwHYfLstui6EpPxSjcam64ng,4719
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
 pyntcli/commands/listen.py,sha256=RTlUt2oq5_BPeBZpG5yQ6GPAG_Cf0JVrUrkzz8uw9ns,9042
 pyntcli/commands/newman.py,sha256=w0d0Pi1swJQ8E3oRs6vsgw_591sl-4bcLpWZwuBXmDI,5282
 pyntcli/commands/postman.py,sha256=kN1PkzPpcUnsbirg17AN9JwJZu6VBt6OeKYrLGrvtFc,4964
-pyntcli/commands/pynt_cmd.py,sha256=TcsKVl0QZLEDIZjo-977IY6k4MAXVk_hljraW1eJmyg,7790
+pyntcli/commands/pynt_cmd.py,sha256=oRKgiG9i84sxkS-C5Nw4vv9mIO6zL8YfqhOUJ-XVpas,7934
 pyntcli/commands/root.py,sha256=bTGlFroeK7WG9dAhFkVTVnpEM-Gdp8QKCuTxW_QWNlQ,4441
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
@@ -27,7 +27,7 @@ pyntcli/pynt_docker/__init__.py,sha256=PQIOVxc7XXtMLfEX7ojgwf_Z3mmTllO3ZvzUZTPOx
 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/saas_client/saas_client.py,sha256=Cpf1pitVlxjW7KpchPL7Q-DgUqw6A8ldCtDlBXaPig0,1663
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=Kl_HT9FJFdKlAH7SwAt3g4-bW-r-1ve_u13OPggQai0,2529
@@ -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.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.118.dist-info/METADATA,sha256=0FTF3QHwBL7UzwrFnPrvSNjSO_A0D6XMPS_tPi-N3xM,427
+pyntcli-0.1.118.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyntcli-0.1.118.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.118.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.118.dist-info/RECORD,,