pyntcli 0.1.60__py3-none-any.whl → 0.1.62__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.60"
+__version__ = "0.1.62"

pyntcli/analytics/send.py

@@ -24,6 +24,7 @@ def set_user_id(user_id):
 CLI_START = "cli_start"
 LOGIN_START = "cli_login_start"
 LOGIN_DONE = "cli_login_done"
+CICD = "CI/CD"
 ERROR = "error"
 
 class AnalyticsSender():

pyntcli/auth/login.py

@@ -21,7 +21,7 @@ class InvalidTokenInEnvVarsException(LoginException):
     pass
 
 PYNT_CREDENTIALS = "PYNT_CREDENTIALS"
-PYNT_SAAS = "PYNT_SAAS_URL"
+PYNT_SAAS = os.environ.get("PYNT_SAAS_URL") if os.environ.get("PYNT_SAAS_URL") else "https://api.pynt.io/v1"
 
 class Login():
     def __init__(self) -> None:
@@ -60,9 +60,7 @@ class Login():
 
 
 def refresh_request(refresh_token):
-    if os.environ.get(PYNT_SAAS): 
-        return pynt_requests.post(os.environ[PYNT_SAAS] + "/auth/refresh", json={"refresh_token": refresh_token})
-    return pynt_requests.post("https://auth.pynt.io/default/refresh", json={"refresh_token": refresh_token})
+    return pynt_requests.post(PYNT_SAAS + "/auth/refresh", json={"refresh_token": refresh_token})
 
 def refresh_token():
     token = None

pyntcli/commands/root.py

@@ -1,6 +1,8 @@
 import argparse
 import sys
 
+from os import environ
+
 from pyntcli.auth import login
 from pyntcli.ui import ui_thread
 from pyntcli.analytics import send as analytics
@@ -19,6 +21,18 @@ def root_usage():
 def usage(*args):
     ui_thread.print(root_usage())
 
+
+def check_cicd_context():
+    if environ.get('GITHUB_ACTION') is not None:
+        analytics.emit(analytics.CICD, {"env": "GitHub"})
+        return
+    if environ.get('GITLAB_USER_ID') is not None:
+        analytics.emit(analytics.CICD, {"env": "GitLab"})
+        return
+    if environ.get('JENKINS_HOME') is not None:
+        analytics.emit(analytics.CICD, {"env": "Jenkins"})
+    
+
 class BaseCommand():
     def __init__(self) -> None:
         self.base: argparse.ArgumentParser = None
@@ -57,3 +71,5 @@ class BaseCommand():
         user_id = login.user_id()
         if user_id:
             analytics.set_user_id(user_id)
+
+        check_cicd_context()

pyntcli/pynt_docker/pynt_container.py

@@ -79,10 +79,7 @@ def get_container_with_arguments(args: argparse.Namespace , *port_args: PyntDock
         docker_arguments += ["--host-ca", ca_name]
         mounts.append(create_mount(os.path.abspath(args.host_ca), "/etc/pynt/{}".format(ca_name)))
     
-    env = {PYNT_CREDENTIALS:CredStore().get_access_token()}
-    
-    if os.environ.get(PYNT_SAAS): 
-        env.update({PYNT_SAAS: os.environ[PYNT_SAAS]})
+    env = {PYNT_CREDENTIALS:CredStore().get_access_token(), "PYNT_SAAS_URL": PYNT_SAAS}
 
     return PyntBaseConatiner(docker_type, docker_arguments, mounts, env)
     
@@ -171,6 +168,7 @@ class PyntContainer():
         ui_thread.print(ui_thread.PrinterText("Docker pull done", ui_thread.PrinterText.INFO))
     
         args = self.base_container.docker_arguments if self.base_container.docker_arguments else None
+            
 
         run_arguments = {
                 "image":image, 

{pyntcli-0.1.60.dist-info → pyntcli-0.1.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.60
+Version: 0.1.62
 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.60.dist-info → pyntcli-0.1.62.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pyntcli/__init__.py,sha256=SH6dBtwKkjChke7DXHi0Y5HbtzV16-5wAfhv91d_D0A,23
+pyntcli/__init__.py,sha256=cwSKWX9cG1qs0I6C99TSkty5QpTa10uiqSeiXnsoOg0,23
 pyntcli/main.py,sha256=MmciZ-oE1_1Q0PUbMb1MUAesXlIxG5PqD43LCKY6I1U,3607
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/analytics/send.py,sha256=hHoMorH3bmY0oXHDQac1JJAAN05BjDHaY7p0WmKg4Z4,2095
+pyntcli/analytics/send.py,sha256=tfRsXlwABk_el1snDrxJ-XKiMQu08MmIwj2cIAaf5mI,2110
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/auth/login.py,sha256=kUDrmnKyfhiGgRgwZoNrmla5v4ELBCr7lFyEkSP5IGE,4918
+pyntcli/auth/login.py,sha256=P5CoIf72V1rWAIBp5UGUuCAtEUweEjyoztF-PCBYGPM,4839
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/commands/har.py,sha256=s5TUw9JVhINRa1kaU6d784u6k_UAMcYu8ZzLk9W6JG4,2935
 pyntcli/commands/id_command.py,sha256=2J5oEa39uyBMMSCRHzuKh3_11CeUEYi7YLoBk1yuu_I,942
@@ -11,11 +11,11 @@ pyntcli/commands/newman.py,sha256=7u6N12IrJZeLXOTTz7JE8qBXPWNmGFxHmGlY_gE_zGM,41
 pyntcli/commands/postman.py,sha256=kuEBsxQ0chbsify5MQOJjKYZToDaxxXfGLGb446MFs4,2522
 pyntcli/commands/proxy.py,sha256=kyhgtpB9zrbMa_lpg0q8uLdZJ4MqLZfqyxumoaqiK3w,7861
 pyntcli/commands/pynt_cmd.py,sha256=JjOHrJs5S9iPtg272zBr04e7uKsO0IdSLaA5wpSg888,2406
-pyntcli/commands/root.py,sha256=n0v8LhlKJcuzr4r1aRhHLlpe9aLngUH0gquItaTnkMQ,2252
+pyntcli/commands/root.py,sha256=leN3gFCHrSH4XLemZt2oycwVfffQMuF0Ocr-5wAWI24,2690
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
 pyntcli/commands/util.py,sha256=txcrmZvFH-xGImbUMPfsYNbRbuZpDkKNK76STiqCEcs,2893
 pyntcli/pynt_docker/__init__.py,sha256=PQIOVxc7XXtMLfEX7ojgwf_Z3mmTllO3ZvzUZTPOxQY,30
-pyntcli/pynt_docker/pynt_container.py,sha256=rpyIOL6PPxUeOdcnVmT1k12Ug-FL9AZh1TZT8W41Oxk,7314
+pyntcli/pynt_docker/pynt_container.py,sha256=5FuZ05g4WtYAxfaZdRLEjquTJaY4LFZLU9HGKEssESM,7260
 pyntcli/store/__init__.py,sha256=xuS9OB21F6B1sUx5XPGxz_6WpG6-KTMbuq50RrZS5OY,29
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=Fbc7yxjht0EJ89eGF8eMgNQJ3sgYRTPmj2-sWQ5UUPs,1766
@@ -30,8 +30,8 @@ pyntcli/ui/ui_thread.py,sha256=JAonXc6aOFawaEixghclxHSCHZBieEWfZzsPef_ZNMI,4796
 tests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 tests/auth/test_login.py,sha256=M6JRFTQRZrL6M2-iph_r-aBSQMMiFDncQbVYeObBFYU,3296
 tests/store/test_cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli-0.1.60.dist-info/METADATA,sha256=sjEU_0zk4NvJFkvjzLxQ3dQv052Ul2OQnFcS-awBwV0,361
-pyntcli-0.1.60.dist-info/WHEEL,sha256=5sUXSg9e4bi7lTLOHcm6QEYwO5TIF1TNbTSVFVjcJcc,92
-pyntcli-0.1.60.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.60.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
-pyntcli-0.1.60.dist-info/RECORD,,
+pyntcli-0.1.62.dist-info/METADATA,sha256=1cs1VO2XZ4kOHvA4UQbgSgK3rawfJRHDUomMrcMtD5w,361
+pyntcli-0.1.62.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+pyntcli-0.1.62.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.62.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
+pyntcli-0.1.62.dist-info/RECORD,,

{pyntcli-0.1.60.dist-info → pyntcli-0.1.62.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.1)
+Generator: bdist_wheel (0.41.2)
 Root-Is-Purelib: true
 Tag: py3-none-any