conviso-cli 2.1.5.dev10__tar.gz → 2.1.5.dev13__tar.gz

{conviso-cli-2.1.5.dev10 → conviso-cli-2.1.5.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.1.5.dev10
+Version: 2.1.5.dev13
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.1.5.dev10 → conviso-cli-2.1.5.dev13}/conviso_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: conviso-cli
-Version: 2.1.5.dev10
+Version: 2.1.5.dev13
 Summary: UNKNOWN
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com

{conviso-cli-2.1.5.dev10 → conviso-cli-2.1.5.dev13}/convisoappsec/flowcli/ast/entrypoint.py

@@ -132,49 +132,6 @@ def perform_vulnerabilities_service(context) -> None:
         raise click.ClickException(str(err)) from err
 
 
-def validate_git_repo(context):
-    """
-    Validates the repository to ensure that it will not lose the git history reference.
-
-    Args:
-        context (<class 'click.core.Context'>)
-
-    Returns:
-        context object
-    """
-    repository_dir = context.params['repository_dir']
-    previous_commit = context.params['previous_commit']
-
-    repo = git.Repo(repository_dir)
-    commits = list(repo.iter_commits())
-
-    if not commits:
-        # No commits in the repository, just return
-        click.echo("No commits found in the repository.")
-        return
-
-    previous_commit_is_in_commits = any(commit.hexsha == previous_commit for commit in commits)
-
-    if previous_commit_is_in_commits:
-        return
-
-    merge_commits = [commit for commit in commits if len(commit.parents) > 1]
-
-    if merge_commits:
-        last_merge_commit = merge_commits[-1]
-        first_parent_commit = last_merge_commit.parents[0]
-        context.params['previous_commit'] = first_parent_commit.hexsha
-    else:
-        if len(commits) > 1:
-            second_latest_commit = commits[1]
-            context.params['previous_commit'] = second_latest_commit.hexsha
-        else:
-            # Only one commit in the repository, use that as the previous commit.
-            context.params['previous_commit'] = commits[0].hexsha
-
-    return
-
-
 def perform_deploy(context):
     """Setup and runs the "deploy create with values" command.
 
@@ -197,7 +154,6 @@ def perform_deploy(context):
     context.params = parse_params(context.params, values.params)
     try:
         LOGGER.info("Creating new deploy ...")
-        validate_git_repo(context)
         created_deploy = values.invoke(context)
 
         if created_deploy:

{conviso-cli-2.1.5.dev10 → conviso-cli-2.1.5.dev13}/convisoappsec/flowcli/sast/run.py

@@ -1,7 +1,6 @@
 import sys
 import click
 import traceback
-from copy import deepcopy as clone
 from json import load as json_load
 from copy import deepcopy as clone
 from base64 import b64decode
@@ -15,7 +14,6 @@ from convisoappsec.sast.decision import Decision, Severity
 from convisoappsec.sast.sastbox import SASTBox
 from convisoappsec.common.graphql.errors import ReponseError
 from convisoappsec.flowcli.requirements_verifier import RequirementsVerifier
-from convisoappsec.flowcli.findings import import_sarif
 
 
 def log_func(msg, new_line=True, clear=False):
@@ -195,12 +193,9 @@ def parse_first_line_number(encoded_base64):
 def deploy_results_to_conviso_beta(
     flow_context, conviso_api, results_filepaths, asset_id, commit_ref=None, deploy_id=None
 ):
-    file_path = results_filepaths[0]  # sastbox v2 unify all results in one file
-    # the way it was decided to import perform_command was to make it more explicit where it comes from
-    converted_results = [import_sarif.entrypoint.perform_command(flow_context, file_path, internal=True)]
 
     results_context = click.progressbar(
-        converted_results, label="Sending SAST reports to Conviso Platform"
+        results_filepaths, label="Sending SAST reports to Conviso Platform"
     )
 
     duplicated_issues = 0
@@ -565,7 +560,7 @@ def perform_command(
                 )
 
             else:
-                commit_refs = git_adapater.show_commit_refs(end_commit)
+                commit_refs = git_adapter.show_commit_refs(end_commit)
 
                 deploy_results_to_conviso(
                     conviso_rest_api,

{conviso-cli-2.1.5.dev10 → conviso-cli-2.1.5.dev13}/convisoappsec/sast/sastbox.py

@@ -19,7 +19,7 @@ class SASTBox(object):
     CONTAINER_CODE_DIR = bitbucket or '/code'
     CONTAINER_REPORTS_DIR = '/tmp'
     WORKSPACE_REPORT_PATH = CONTAINER_CODE_DIR
-    JSON_REPORT_PATTERN = 'output.sarif'
+    JSON_REPORT_PATTERN = 'output.json'
     SUCCESS_EXIT_CODE = 1
     USER_ENV_VAR = "USER"
 

conviso-cli-2.1.5.dev13/convisoappsec/version.py

@@ -0,0 +1 @@
+__version__ = '2.1.5-dev.13'

conviso-cli-2.1.5.dev10/convisoappsec/version.py

@@ -1 +0,0 @@
-__version__ = '2.1.5-dev.10'