fixed non interactive mode and bumped version 0.0.3

Author: jegathintelops

.github/workflows/build.yml

@@ -36,21 +36,21 @@ jobs:
     - name: Install cosign
       uses: sigstore/[email protected]
       with:
-        inputs: dist/scsctl-0.0.2-py3-none-any.whl
+        inputs: dist/scsctl-0.0.3-py3-none-any.whl
     - name: Sign with sigstore using GitHub App credentials
       run: |
-          sigstore sign --overwrite dist/scsctl-0.0.2-py3-none-any.whl
+          sigstore sign --overwrite dist/scsctl-0.0.3-py3-none-any.whl
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       with:
         name: dist
         path: |
           dist
-    - name: Copy dist/scsctl-0.0.2.tar.gz dist/scsctl-0.0.2-py3-none-any.whl to release directory
+    - name: Copy dist/scsctl-0.0.3.tar.gz dist/scsctl-0.0.3-py3-none-any.whl to release directory
       run: |
         mkdir -p release
-        cp dist/scsctl-0.0.2.tar.gz release/scsctl-0.0.2.tar.gz
-        cp dist/scsctl-0.0.2-py3-none-any.whl release/scsctl-0.0.2-py3-none-any.whl
+        cp dist/scsctl-0.0.3.tar.gz release/scsctl-0.0.3.tar.gz
+        cp dist/scsctl-0.0.3-py3-none-any.whl release/scsctl-0.0.3-py3-none-any.whl
           
     - name: Publish distribution 📦 to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "scsctl"
-version = "0.0.2"
+version = "0.0.3"
 authors = [{name="Jegath S", email="[email protected]" }]
 description = "Tool for automating Vulnerability Risk Management and Software Supply Chain Security Measures"
 readme = "README.md"

src/scsctl/app.py

@@ -164,14 +164,14 @@ def scan(
         if(non_interactive):
             click.echo("Sbom report")
             click.echo("===========")
-            print_sbom_report(sbom_report)
+            print_sbom_report(sbom_report = sbom_report,is_non_interactive = True)
             click.echo("Pyroscope detected packages")
             click.echo("===========================")
-            print_pyroscope_packages(pyroscope_data)
+            print_pyroscope_packages(pyroscope_package_names = pyroscope_data,is_non_interactive = True)
             if falco_enabled:
                 click.echo("Falco detected packages")
                 click.echo("=======================")
-                print_falco_packages(falco_found_extra_packages)
+                print_falco_packages(falco_package_names = falco_found_extra_packages,is_non_interactive = True)
             click.echo("Final Report")
             click.echo("=============")
             click.echo(final_report)

src/scsctl/helper/falco.py

@@ -69,16 +69,22 @@ def compare_and_find_extra_packages_using_falco(falco_package_names, sbom_packag
     return extra_packages
 
 
-def print_falco_packages(falco_package_names):
+def print_falco_packages(falco_package_names,is_non_interactive=False):
     headers = ["Packages"]
     data = []
     for item in falco_package_names:
         data.append([item])
 
+    width = [100]
+
+    if is_non_interactive:
+        print(tabulate(data, headers=headers, tablefmt="grid",maxcolwidths=width, showindex=list(range(1, len(data) + 1))))
+        return
+
+
     chunk_size = 200
     index = 0
 
-    width = [100]
 
     while index < len(data):
         table = tabulate(

src/scsctl/helper/pyroscope.py

@@ -24,7 +24,7 @@ def get_pyroscope_data(app_details: AppDetails):
     return [], False
 
 
-def print_pyroscope_packages(pyroscope_package_names):
+def print_pyroscope_packages(pyroscope_package_names,is_non_interactive = False):
     if "total" in pyroscope_package_names:
         pyroscope_package_names.remove("total")
     if "other" in pyroscope_package_names:
@@ -33,11 +33,15 @@ def print_pyroscope_packages(pyroscope_package_names):
     data = []
     for item in pyroscope_package_names:
         data.append([item])
+    
+    width = [100]
+    if is_non_interactive:
+        print(tabulate(data, headers=headers, tablefmt="grid",maxcolwidths=width, showindex=list(range(1, len(data) + 1))))
+        return
 
     chunk_size = 200
     index = 0
 
-    width = [100]
 
     while index < len(data):
         table = tabulate(

src/scsctl/helper/trivy.py

@@ -45,7 +45,7 @@ def get_sbom_report(app_details: AppDetails):
         return "", False
 
 
-def print_sbom_report(sbom_report):
+def print_sbom_report(sbom_report,is_non_interactive=False):
     sbom_report = json.loads(sbom_report)
     sbom_report = sbom_report["Results"]
     sbom_report = [item["Vulnerabilities"] for item in sbom_report if item["Class"] != "lang-pkgs"][0]
@@ -71,7 +71,10 @@ def print_sbom_report(sbom_report):
 
     # Change width of the columns (First width is for the index column)
     width = [10, 20, 20, 20, 10, 10, 80]
-    # print(data)
+    
+    if is_non_interactive:
+        print(tabulate(data, headers=headers, tablefmt="grid",maxcolwidths=width, showindex=list(range(1, len(data) + 1))))
+        return
 
     while index < len(data):
         table = tabulate(