Merge pull request #15 from intelops/bug/packaging_import_issue

fixed import issue after packaging

pyproject.toml

@@ -0,0 +1,15 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "scsctl"
+version = "0.0.1"
+authors = [{name="Jegath S", email="[email protected]" }]
+description = "Tool for automating Vulnerability Risk Management and Software Supply Chain Security Measures"
+readme = "README.md"
+dependencies = ['click==8.1.3', 'clickhouse-driver==0.2.6', 'numpy==1.25.0', 'requests==2.31.0','questionary==1.10.0','tabulate==0.9.0']
+requires-python = ">=3.9"
+
+[project.scripts]
+scsctl = 'scsctl.app:cli'

setup.py

@@ -8,7 +8,7 @@
     install_requires=['click==8.1.3', 'clickhouse-driver==0.2.6', 'numpy==1.25.0', 'requests==2.31.0','questionary==1.10.0','tabulate==0.9.0'],
     entry_points={
         'console_scripts': [
-            'scsctl = app:cli'
+            'scsctl = scsctl.app:cli'
         ]
     }
 )

src/scsctl/__init__.py

@@ -0,0 +1 @@
+from .app import cli

app.py → src/scsctl/app.py

@@ -1,20 +1,20 @@
 from datetime import datetime
 import click
 import questionary
-from helper.falco import (
+from scsctl.helper.falco import (
     parse_logs_and_get_package_paths,
     compare_and_find_extra_packages_using_falco,
     print_falco_packages,
     save_falco_data,
 )
-from helper.pyroscope import (
+from scsctl.helper.pyroscope import (
     get_pyroscope_data,
     print_pyroscope_packages,
     save_pyroscope_data,
     compare_and_find_pyroscope_extra_packages,
 )
-from helper.common import AppDetails, generate_final_report, modify_and_build_docker_image, custom_style_fancy
-from helper.trivy import get_sbom_report, print_sbom_report, save_sbom_data
+from scsctl.helper.common import AppDetails, generate_final_report, modify_and_build_docker_image, custom_style_fancy
+from scsctl.helper.trivy import get_sbom_report, print_sbom_report, save_sbom_data
 
 import yaml
 

helper/falco.py → src/scsctl/helper/falco.py

@@ -4,7 +4,7 @@
 import questionary
 from tabulate import tabulate
 from datetime import datetime
-from helper.clickhouse import connect_to_db
+from scsctl.helper.clickhouse import connect_to_db
 
 
 def read_logs_from_log(pod_name, namespace):

helper/pyroscope.py → src/scsctl/helper/pyroscope.py

@@ -4,8 +4,8 @@
 from tabulate import tabulate
 import questionary
 from datetime import datetime
-from helper.common import AppDetails
-from helper.clickhouse import connect_to_db
+from scsctl.helper.common import AppDetails
+from scsctl.helper.clickhouse import connect_to_db
 
 
 def get_pyroscope_data(app_details: AppDetails):

helper/trivy.py → src/scsctl/helper/trivy.py

@@ -2,8 +2,8 @@
 import click
 import json
 from tabulate import tabulate
-from helper.clickhouse import connect_to_db
-from helper.common import AppDetails
+from scsctl.helper.clickhouse import connect_to_db
+from scsctl.helper.common import AppDetails
 import questionary
 from datetime import datetime