Doug/fix gitlab main flow (SocketDev#2)

dacoburn · web-flow · commit 702176cd111f · 2024-06-04T19:26:06.000-07:00
* Added fixes for missing commit-sha option. Added option to export SBOM file. Added node, npm, and yarn to Dockerfile

* Fixed how to check for the gitlab workflow
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "socketsecurity"
-version = "0.0.72"
+version = "0.0.74"
 requires-python = ">= 3.9"
 dependencies = [
     'requests',
diff --git a/socketsecurity/core/__init__.py b/socketsecurity/core/__init__.py
@@ -25,7 +25,7 @@
 
 
 __author__ = 'socket.dev'
-__version__ = '0.0.72'
+__version__ = '0.0.74'
 __all__ = [
     "Core",
     "log",
diff --git a/socketsecurity/core/gitlab.py b/socketsecurity/core/gitlab.py
@@ -147,7 +147,7 @@ def __init__(self):
     @staticmethod
     def check_event_type() -> str:
         if ci_pipeline_source.lower() == "push" or ci_pipeline_source.lower() == 'merge_request_event':
-            if ci_merge_request_iid is None or ci_merge_request_iid == "":
+            if ci_merge_request_iid is None or ci_merge_request_iid == "" or str(ci_merge_request_iid) == "0":
                 event_type = "main"
             else:
                 event_type = "diff"
diff --git a/socketsecurity/socketcli.py b/socketsecurity/socketcli.py
@@ -39,7 +39,7 @@
 )
 parser.add_argument(
     '--pr_number',
-    default=0,
+    default="0",
     help='The pr or build number',
     required=False
 )

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`)`
`40`	`40`	`parser.add_argument(`
`41`	`41`	`'--pr_number',`
`42`		`- default=0,`
	`42`	`+ default="0",`
`43`	`43`	`help='The pr or build number',`
`44`	`44`	`required=False`
`45`	`45`	`)`