conviso-cli 2.3.0.dev4__tar.gz → 2.3.0rc1__tar.gz

{conviso-cli-2.3.0.dev4 → conviso-cli-2.3.0rc1}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.3.0.dev4
+Version: 2.3.0rc1
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 License: UNKNOWN
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Platform: UNKNOWN
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 # CLI

{conviso-cli-2.3.0.dev4 → conviso-cli-2.3.0rc1}/conviso_cli.egg-info/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.3.0.dev4
+Version: 2.3.0rc1
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 License: UNKNOWN
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Platform: UNKNOWN
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 
 # CLI

conviso-cli-2.3.0rc1/conviso_cli.egg-info/requires.txt

@@ -0,0 +1,13 @@
+GitPython==3.1.44
+click==8.1.8
+requests==2.32.3
+urllib3==2.3.0
+semantic-version==2.10.0
+docker==7.1.0
+PyYAML==6.0.2
+click-log==0.4.0
+transitions==0.9.2
+jsonschema==4.23.0
+giturlparse<=0.12.0
+jmespath==1.0.1
+setuptools==75.8.0

{conviso-cli-2.3.0.dev4 → conviso-cli-2.3.0rc1}/convisoappsec/flowcli/entrypoint.py

@@ -23,15 +23,6 @@ from .container import container
 
 click_log.basic_config(LOGGER)
 
-
-def api_url_autocompletion(*args, **kargs):
-    return [
-        api.PRODUCTION_API_URL,
-        api.STAGING_API_URL,
-        api.DEVELOPMENT_API_URL,
-    ]
-
-
 @click.group()
 @click_log.simple_verbosity_option(LOGGER, '-l', '--verbosity')
 @click.option(
@@ -48,7 +39,6 @@ def api_url_autocompletion(*args, **kargs):
     envvar=("CONVISO_API_URL", "FLOW_API_URL"),
     default=api.DEFAULT_API_URL,
     show_default=True,
-    autocompletion=api_url_autocompletion,
     help='The api url to access Conviso Platform resources.',
 )
 @click.option(

{conviso-cli-2.3.0.dev4 → conviso-cli-2.3.0rc1}/convisoappsec/flowcli/sast/run.py

@@ -2,25 +2,20 @@ import sys
 import click
 import traceback
 import time
-import json
-from convisoappsec.common.retry_handler import RetryHandler
 from copy import deepcopy as clone
 from base64 import b64decode
 from re import search as regex_search
 from convisoappsec.flow import GitAdapter
-from convisoappsec.flow.graphql_api.beta.models.issues.sast import (CreateSastFindingInput)
 from convisoappsec.flowcli import help_option
 from convisoappsec.flowcli.common import (asset_id_option, on_http_error, project_code_option)
 from convisoappsec.flowcli.context import pass_flow_context
 from convisoappsec.sast.decision import Decision, Severity
 from convisoappsec.sast.sastbox import SASTBox
-from convisoappsec.common.graphql.errors import ResponseError
 from convisoappsec.flowcli.requirements_verifier import RequirementsVerifier
 from docker.errors import APIError
-from convisoappsec.logger import LOGGER
 
 
-def log_func(msg, new_line=True, clear=False):
+def log_func(msg, new_line=True):
     click.echo(msg, nl=new_line, err=True)
 
 
@@ -117,31 +112,6 @@ def perform_sastbox_scan(
     return results_filepaths
 
 
-def deploy_results_to_conviso(
-        conviso_api, results_filepaths, project_code, deploy_id=None, commit_refs=None
-):
-    results_context = click.progressbar(
-        results_filepaths, label="Sending SAST reports to the Conviso Platform..."
-    )
-
-    with results_context as reports:
-        for report_name in reports:
-            report_file = open(report_name)
-
-            default_report_type = "sast"
-
-            conviso_api.findings.create(
-                project_code,
-                commit_refs,
-                report_file,
-                default_report_type=default_report_type,
-                deploy_id=deploy_id,
-            )
-
-            report_file.close()
-    pass
-
-
 def parse_conviso_references(references=[]):
     divider = "\n"
 
@@ -198,7 +168,7 @@ def parse_first_line_number(encoded_base64):
 
 
 def deploy_results_to_conviso_beta(
-        flow_context, conviso_api, results_filepaths, asset_id, company_id, commit_ref=None, deploy_id=None
+        flow_context, results_filepaths, asset_id, company_id, commit_ref=None, deploy_id=None
 ):
     """Send SAST results to the Conviso platform."""
 
@@ -209,16 +179,25 @@ def deploy_results_to_conviso_beta(
     with results_context as reports:
         for report_path in reports:
             api_key = flow_context.key
+            max_retries = 5
             conviso_api = flow_context.create_conviso_graphql_client()
 
-            try:
-                conviso_api.issues.send_issues_file(
-                    company_id=company_id, asset_id=asset_id, file_path=report_path, api_key=api_key, vulnerability_type='SAST_FINDING',
-                    deploy_id=deploy_id, commit_ref=commit_ref
-                )
-            except Exception as e:
-                # send to conviso slack and pass
-                pass
+            for attempt in range(1, max_retries + 1):
+                try:
+                    conviso_api.issues.send_issues_file(
+                        company_id=company_id, asset_id=asset_id, file_path=report_path, api_key=api_key,
+                        vulnerability_type='SAST_FINDING',
+                        deploy_id=deploy_id, commit_ref=commit_ref
+                    )
+                    break  # If successful, exit loop
+                except Exception as e:
+                    if attempt == max_retries:
+                        # Notify via Slack or log the failure
+                        print(f"Failed after {max_retries} attempts: {e}")
+                    else:
+                        wait_time = 2 ** attempt  # Exponential backoff (2s, 4s, 8s, 16s)
+                        print(f"Retry {attempt}/{max_retries} failed. Retrying in {wait_time} seconds...")
+                        time.sleep(wait_time)
 
 
 @click.command()
@@ -436,7 +415,6 @@ def perform_command(flow_context, project_code, asset_id, end_commit, start_comm
             return
 
         conviso_rest_api = flow_context.create_conviso_rest_api_client()
-        conviso_beta_api = flow_context.create_conviso_api_client_beta()
 
         results_filepaths = perform_sastbox_scan(
             conviso_rest_api,
@@ -451,21 +429,9 @@ def perform_command(flow_context, project_code, asset_id, end_commit, start_comm
         )
 
         if send_to_flow:
-            if experimental:
-                deploy_results_to_conviso_beta(
-                    flow_context, conviso_beta_api, results_filepaths, asset_id, company_id, commit_ref=end_commit, deploy_id=deploy_id
-                )
-
-            else:
-                commit_refs = git_adapter.show_commit_refs(end_commit)
-
-                deploy_results_to_conviso(
-                    conviso_rest_api,
-                    results_filepaths,
-                    project_code,
-                    deploy_id,
-                    commit_refs,
-                )
+            deploy_results_to_conviso_beta(
+                flow_context, results_filepaths, asset_id, company_id, commit_ref=end_commit, deploy_id=deploy_id
+            )
 
         blocked_issues = find_blocked_issues(
             results_filepaths, overall_threshold, severity_threshold, severity

conviso-cli-2.3.0rc1/convisoappsec/version.py

@@ -0,0 +1 @@
+__version__ = '2.3.0-rc.1'

{conviso-cli-2.3.0.dev4 → conviso-cli-2.3.0rc1}/setup.py

@@ -33,19 +33,19 @@ setup(
         exclude=["test*"],
     ),
     install_requires=[
-        "GitPython>=3.1.2,<4",
-        "click>=7.1.2,<8",
-        "requests==2.31.0",
-        "urllib3==2.2.0",
-        "semantic-version>=2.8.5,<3",
-        "docker<=6.1.3",
-        "PyYAML==6.0.1",
-        "click-log>=0.3.2,<1",
-        "transitions>=0.8.7,<1",
-        "jsonschema>=2.5.1,<3",
+        "GitPython==3.1.44",
+        "click==8.1.8",
+        "requests==2.32.3",
+        "urllib3==2.3.0",
+        "semantic-version==2.10.0",
+        "docker==7.1.0",
+        "PyYAML==6.0.2",
+        "click-log==0.4.0",
+        "transitions==0.9.2",
+        "jsonschema==4.23.0",
         "giturlparse<=0.12.0",
-        "jmespath>=0.9.0,<1.0.1",
-        "setuptools==69.2.0"
+        "jmespath==1.0.1",
+        "setuptools==75.8.0"
     ],
     entry_points={
         'console_scripts': [
@@ -61,5 +61,5 @@ setup(
     project_urls={
         'Source': 'https://github.com/convisoappsec/convisocli/',
     },
-    python_requires='>=3.8',
+    python_requires='>=3.9',
 )

conviso-cli-2.3.0.dev4/conviso_cli.egg-info/requires.txt

@@ -1,13 +0,0 @@
-GitPython<4,>=3.1.2
-click<8,>=7.1.2
-requests==2.31.0
-urllib3==2.2.0
-semantic-version<3,>=2.8.5
-docker<=6.1.3
-PyYAML==6.0.1
-click-log<1,>=0.3.2
-transitions<1,>=0.8.7
-jsonschema<3,>=2.5.1
-giturlparse<=0.12.0
-jmespath<1.0.1,>=0.9.0
-setuptools==69.2.0

conviso-cli-2.3.0.dev4/convisoappsec/version.py

@@ -1 +0,0 @@
-__version__ = '2.3.0-dev.4'