conviso-ast 3.0.0rc0__tar.gz → 3.0.1rc0__tar.gz

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/PKG-INFO

@@ -1,22 +1,22 @@
 Metadata-Version: 2.2
 Name: conviso-ast
-Version: 3.0.0rc0
+Version: 3.0.1rc0
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: GitPython==3.1.45
+Requires-Dist: GitPython==3.1.46
 Requires-Dist: click==8.1.8
 Requires-Dist: requests==2.32.5
-Requires-Dist: urllib3==2.4.0
+Requires-Dist: urllib3==2.6.3
 Requires-Dist: semantic-version==2.10.0
 Requires-Dist: docker==7.1.0
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: click-log==0.4.0
 Requires-Dist: transitions==0.9.2
 Requires-Dist: jsonschema==4.25.1
-Requires-Dist: giturlparse<=0.12.0
+Requires-Dist: giturlparse<=0.14.0
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: setuptools==78.1.0
 Dynamic: description

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/conviso_ast.egg-info/PKG-INFO

@@ -1,22 +1,22 @@
 Metadata-Version: 2.2
 Name: conviso-ast
-Version: 3.0.0rc0
+Version: 3.0.1rc0
 Maintainer: Conviso
 Maintainer-email: development@convisoappsec.com
 Project-URL: Source, https://github.com/convisoappsec/convisocli/
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: GitPython==3.1.45
+Requires-Dist: GitPython==3.1.46
 Requires-Dist: click==8.1.8
 Requires-Dist: requests==2.32.5
-Requires-Dist: urllib3==2.4.0
+Requires-Dist: urllib3==2.6.3
 Requires-Dist: semantic-version==2.10.0
 Requires-Dist: docker==7.1.0
 Requires-Dist: PyYAML==6.0.3
 Requires-Dist: click-log==0.4.0
 Requires-Dist: transitions==0.9.2
 Requires-Dist: jsonschema==4.25.1
-Requires-Dist: giturlparse<=0.12.0
+Requires-Dist: giturlparse<=0.14.0
 Requires-Dist: jmespath==1.0.1
 Requires-Dist: setuptools==78.1.0
 Dynamic: description

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/conviso_ast.egg-info/SOURCES.txt

@@ -49,13 +49,8 @@ convisoappsec/flow/graphql_api/v1/models/project.py
 convisoappsec/flow/graphql_api/v1/schemas/__init__.py
 convisoappsec/flow/graphql_api/v1/schemas/mutations/__init__.py
 convisoappsec/flow/graphql_api/v1/schemas/resolvers/__init__.py
-convisoappsec/flow/source_code_scanner/__init__.py
-convisoappsec/flow/source_code_scanner/exceptions.py
-convisoappsec/flow/source_code_scanner/scc.py
-convisoappsec/flow/source_code_scanner/source_code_scanner.py
 convisoappsec/flow/util/__init__.py
 convisoappsec/flow/util/ci_provider.py
-convisoappsec/flow/util/metrics.py
 convisoappsec/flow/util/source_code_compressor.py
 convisoappsec/flow/version_searchers/__init__.py
 convisoappsec/flow/version_searchers/sorted_by_versioning_style.py

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/conviso_ast.egg-info/requires.txt

@@ -1,13 +1,13 @@
-GitPython==3.1.45
+GitPython==3.1.46
 click==8.1.8
 requests==2.32.5
-urllib3==2.4.0
+urllib3==2.6.3
 semantic-version==2.10.0
 docker==7.1.0
 PyYAML==6.0.3
 click-log==0.4.0
 transitions==0.9.2
 jsonschema==4.25.1
-giturlparse<=0.12.0
+giturlparse<=0.14.0
 jmespath==1.0.1
 setuptools==78.1.0

conviso_ast-3.0.1rc0/convisoappsec/flow/util/__init__.py

@@ -0,0 +1,5 @@
+from .source_code_compressor import SourceCodeCompressor
+
+__all__ = [
+    'SourceCodeCompressor'
+]

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/convisoappsec/flowcli/deploy/create/with_/tag_tracker/sort_by/time_.py

@@ -1,6 +1,5 @@
 import click
 # TODO: refactoring. all deploy create share some behavior
-from convisoappsec.flow.util import project_metrics
 from convisoappsec.flow.version_searchers import TimeBasedVersionSearcher
 from convisoappsec.flow.version_control_system_adapter import GitAdapter
 from convisoappsec.flowcli.context import pass_flow_context
@@ -72,7 +71,6 @@ def time_(flow_context, create_context, tag_tracker_context, attach_diff):
             previous_version=previous_version,
             diff_content=diff_content,
             metrics=deploy_metrics,
-            project_metrics=project_metrics(repository_dir),
             commit_authors=authors_data
         )
 

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/convisoappsec/flowcli/deploy/create/with_/tag_tracker/sort_by/versioning_style.py

@@ -1,6 +1,5 @@
 import click
 # TODO: refactoring. all deploy create share some behavior
-from convisoappsec.flow.util import project_metrics
 from convisoappsec.flowcli.context import pass_flow_context
 from convisoappsec.flow.version_searchers import SortedByVersioningStyle
 from convisoappsec.flow.version_control_system_adapter import GitAdapter
@@ -103,7 +102,6 @@ def versioning_style(
             previous_version=previous_version,
             diff_content=diff_content,
             metrics=deploy_metrics,
-            project_metrics=project_metrics(repository_dir),
             commit_authors=authors_data
         )
 

conviso_ast-3.0.1rc0/convisoappsec/version.py

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

{conviso_ast-3.0.0rc0 → conviso_ast-3.0.1rc0}/setup.py

@@ -33,17 +33,17 @@ setup(
         exclude=["test*"],
     ),
     install_requires=[
-        "GitPython==3.1.45",
+        "GitPython==3.1.46",
         "click==8.1.8",
         "requests==2.32.5",
-        "urllib3==2.4.0",
+        "urllib3==2.6.3",
         "semantic-version==2.10.0",
         "docker==7.1.0",
         "PyYAML==6.0.3",
         "click-log==0.4.0",
         "transitions==0.9.2",
         "jsonschema==4.25.1",
-        "giturlparse<=0.12.0",
+        "giturlparse<=0.14.0",
         "jmespath==1.0.1",
         "setuptools==78.1.0"
     ],

conviso_ast-3.0.0rc0/convisoappsec/flow/source_code_scanner/__init__.py

@@ -1,9 +0,0 @@
-from .source_code_scanner import SourceCodeScanner # noqa
-from .exceptions import SourceCodeScannerException # noqa
-from .scc import SCC # noqa
-
-__all_ = [
-    'SourceCodeScanner',
-    'SourceCodeScannerException',
-    'SCC'
-]

conviso_ast-3.0.0rc0/convisoappsec/flow/source_code_scanner/exceptions.py

@@ -1,2 +0,0 @@
-class SourceCodeScannerException(RuntimeError):
-    pass

conviso_ast-3.0.0rc0/convisoappsec/flow/source_code_scanner/scc.py

@@ -1,68 +0,0 @@
-import yaml
-import tempfile
-
-from .source_code_scanner import SourceCodeScanner
-from .exceptions import SourceCodeScannerException
-
-
-class SCC(SourceCodeScanner):
-
-    def __init__(
-        self, 
-        source_code_dir, 
-        container_source_dir = '/code', 
-        create_source_code_volume = True
-    ):
-        super().__init__(
-            source_code_dir, 
-            create_source_code_volume=create_source_code_volume
-        )
-        self.__scan_result = {}
-        self.__container_source_dir = container_source_dir
-
-    @property
-    def repository(self):
-        return 'convisoappsec/scc'
-
-    @property
-    def tag(self):
-        return 'latest'
-
-    @property
-    def container_source_dir(self):
-        return self.__container_source_dir
-
-    def _read_scan_stdout(self, stdout_generator):
-        with tempfile.TemporaryFile() as yaml_output:
-            for chunk in stdout_generator:
-                yaml_output.write(chunk)
-
-            yaml_output.seek(0)
-
-            self.__scan_result = yaml.load(
-                yaml_output,
-                Loader=yaml.FullLoader
-            )
-
-    @property
-    def summary(self):
-        summary = self.__scan_result.get('SUM')
-        if not summary:
-            raise SourceCodeScannerException(
-                'Unexpected error retrienving source code summary metrics'
-            )
-
-        return summary
-
-    @property
-    def total_source_code_lines(self):
-        return self.summary.get('code')
-
-    @property
-    def command(self):
-        return [
-            '--no-cocomo',
-            '--no-complexity',
-            '--format',
-            'cloc-yaml'
-        ]

conviso_ast-3.0.0rc0/convisoappsec/flow/source_code_scanner/source_code_scanner.py

@@ -1,177 +0,0 @@
-import docker
-from contextlib import suppress
-import tempfile
-from uuid import uuid4
-
-from convisoappsec.flow.util import SourceCodeCompressor
-from .exceptions import SourceCodeScannerException
-
-
-class SourceCodeScanner(object):
-    SUCCESS_EXIT_CODE = 0
-    '''
-    hooks:
-      def _pre_pull(self):
-          :return: void
-
-      def _capture_stdout(self, stdout_bytes)
-        :param stdout_bytes: chunks generated by stdout
-        :paramtype stdout_bytes: bytes
-        :return: void
-    _pre_scan
-    _scan_stdout
-    _post_scan
-    '''
-
-    def __init__(self, source_code_dir, create_source_code_volume = True):
-        uuid = str(uuid4())
-        self.docker = docker.from_env(version="auto")
-        self.__container_name = "source_code_scanner_{0}".format(
-            uuid
-        )
-        self.__source_code_dir = source_code_dir
-        self.__create_source_code_volume = create_source_code_volume
-
-        if self.__create_source_code_volume:
-            self.__source_code_volume_name = "source_code_scanner_src_{0}".format(
-                uuid
-            )
-        else:
-            self.__source_code_volume_name = None
-
-    @property
-    def repository(self):
-        raise Exception('Not implemented yet!')
-
-    @property
-    def tag(self):
-        raise Exception('Not implemented yet!')
-
-    @property
-    def command(self):
-        raise Exception('Not implemented yet!')
-
-    @property
-    def container_source_dir(self):
-        raise Exception('Not implemented yet!')
-
-    @property
-    def image(self):
-        return "{repository}:{tag}".format(
-            repository=self.repository,
-            tag=self.tag,
-        )
-
-    @property
-    def volumes(self):
-        if not self.__create_source_code_volume:
-            return {}
-
-        return {
-            self.__source_code_volume_name: {
-                'bind': self.container_source_dir,
-                'mode': 'rw',
-            }
-        }
-
-    def __get_container(self):
-        return self.docker.containers.get(
-            self.__container_name
-        )
-
-    def __get_source_code_volume(self):
-        return self.docker.volumes.get(
-            self.__source_code_volume_name
-        )
-
-    @property
-    def __container(self):
-        try:
-            return self.__get_container()
-        except docker.errors.NotFound:
-            return self.__create_container()
-
-    def __create_container(self):
-        return self.docker.containers.create(
-            self.image,
-            name=self.__container_name,
-            volumes=self.volumes,
-            detach=True,
-            command=self.command,
-            working_dir=self.container_source_dir if self.container_source_dir != '/code' else '/code'
-        )
-
-    def __pull_image(self):
-        if self.has_pre_pull:
-            self._pre_pull()
-
-        self.docker.images.pull(self.repository, self.tag)
-
-    def __load_source_code(self):
-        container = self.__container
-
-        with tempfile.TemporaryFile() as fileobj:
-            compressor = SourceCodeCompressor(
-                self.__source_code_dir
-            )
-
-            compressor.write_to(fileobj)
-            fileobj.seek(0)
-
-            container.put_archive(
-                self.container_source_dir,
-                fileobj
-            )
-
-    def scan(self):
-        self.__pull_image()
-        self.__load_source_code()
-        container = self.__container
-
-        container.start()
-
-        if self.has_read_scan_stderr:
-            self._read_scan_stderr(
-                container.logs(
-                    stream=True, stdout=False, stderr=True
-                )
-            )
-
-        if self.has_read_scan_stdout:
-            self._read_scan_stdout(
-                container.logs(
-                    stream=True, stdout=True, stderr=False
-                )
-            )
-
-        wait_result = container.wait()
-        status_code = wait_result.get('StatusCode')
-
-        if not status_code == self.SUCCESS_EXIT_CODE:
-            raise SourceCodeScannerException(
-                'Source code scanning fail'
-            )
-
-    def __has_method(self, method_name):
-        return hasattr(self, method_name)
-
-    @property
-    def has_read_scan_stdout(self):
-        return self.__has_method('_read_scan_stdout')
-
-    @property
-    def has_read_scan_stderr(self):
-        return self.__has_method('_read_scan_stderr')
-
-    @property
-    def has_pre_pull(self):
-        return self.__has_method('_pre_pull')
-
-    def __del__(self):
-        with suppress(Exception):
-            container = self.__get_container()
-            container.remove()
-
-        with suppress(Exception):
-            source_code_volume = self.__get_source_code_volume()
-            source_code_volume.remove()

conviso_ast-3.0.0rc0/convisoappsec/flow/util/__init__.py

@@ -1,7 +0,0 @@
-from .source_code_compressor import SourceCodeCompressor
-from .metrics import project_metrics
-
-__all__ = [
-    'SourceCodeCompressor',
-    'project_metrics',
-]

conviso_ast-3.0.0rc0/convisoappsec/flow/util/metrics.py

@@ -1,16 +0,0 @@
-from convisoappsec.flow.source_code_scanner import SCC
-from convisoappsec.logger import LOGGER
-import docker
-
-def project_metrics(source_code_dir):
-    try:
-        scanner = SCC(source_code_dir, create_source_code_volume=False)
-        scanner.scan()
-        return {
-            'total_lines': scanner.total_source_code_lines
-        }
-    except docker.errors.APIError as e:
-        LOGGER.error('Error on fetch project metrics')
-        LOGGER.exception(e)
-        return {}
-

conviso_ast-3.0.0rc0/convisoappsec/version.py

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