boman-cli 2.5.9__tar.gz → 2.5.11__tar.gz

{boman_cli-2.5.9 → boman_cli-2.5.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boman-cli
-Version: 2.5.9
+Version: 2.5.11
 Summary: CLI tool of boman.ai
 Home-page: https://boman.ai
 Author: Sumeru Software Solutions Pvt. Ltd.

{boman_cli-2.5.9 → boman_cli-2.5.11}/boman_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: boman-cli
-Version: 2.5.9
+Version: 2.5.11
 Summary: CLI tool of boman.ai
 Home-page: https://boman.ai
 Author: Sumeru Software Solutions Pvt. Ltd.

{boman_cli-2.5.9 → boman_cli-2.5.11}/bomancli/Config.py

@@ -121,7 +121,7 @@ class Config:
 
     log_level = "INFO"
 
-    version = 'v15.6.10'
+    version = 'v2.5.11'
 
     boman_config_file = 'boman.yaml'
     
@@ -167,7 +167,8 @@ class Config:
     sbom_scan_status=None
     sbom_target=None
     sbom_output_file=None
-    
+    set_cache_dir = False
+    cache_dir = " --cache-dir /tmp/.trivycache"
     #IAC scanning
     iac_scan_present=None
     iac_scan_build_dir=None

{boman_cli-2.5.9 → boman_cli-2.5.11}/bomancli/main.py

@@ -554,7 +554,13 @@ def runImage(data=None,type=None):
         
         try:
             Config.build_dir = Config.sbom_build_dir = os.getcwd()+'/'
+            command_line = "--format cyclonedx --output /src/boman_trivy_sbom_scan.json --scanners vuln fs /{target}"
             command_line = "% s" % command_line.format(target = 'src/')
+            #added upon jenkins sbom issue - GM
+            if Config.set_cache_dir:
+                command_line = command_line + Config.cache_dir
+                logging.info('SBOM Docker: Cache directory is set for the scan, updated command is %s',command_line[-20:])
+            logging.info(f"SBOM Docker: command ==> {command_line[-20:]}")
             container_output = docker.containers.run(docker_image, command_line, volumes={Config.sbom_build_dir: {
                         'bind': data['bind']}}, user=uid, remove=True)
             logging.info('SBOM Docker: SUCCESS!!! Message: %s Scan Completed',tool_name)
@@ -714,13 +720,14 @@ def runImage(data=None,type=None):
             Config.reachability_status ='Completed'
         except errors.ContainerError as exc:
             logging.error('Reachability Docker: Failed!!! Message: Some Error recorded while scanning %s',str(exc))
-            msg='\n The following error has been recorded while scanning IaC'
+            msg='\n The following error has been recorded while scanning Reachability'
             Config.reachability_status ='Failed'
             Config.reachability_errors =f'{str(exc)}]'
             Utils.logError(msg,str(exc))
+            reachables = None
         
         try:
-            if will_generate_output == 1:
+            if will_generate_output == 1 and reachables is not None:
                 logging.info('Reachability: Uploading %s to the server',output_file)
                 output_reachability = {
                     'output_file': output_file,
@@ -1253,6 +1260,7 @@ def default():
     parser.add_argument('-semgrep_token','--semgrepToken',default='No',help="Pass the semgrep community token here")
     parser.add_argument('-pot','--pollTime',default=60,help="Polling Time. Min : 30s, Max: 5min, Default : 1min. Format: input the time in seconds eg: 1min => 60 ")
     parser.add_argument('-pof','--pollFrequency',default=10,help="Polling Frequency. Min : 5s, Max: 1min, Default : 10s. Format: input the time in seconds eg: 1min => 60 ")
+    parser.add_argument('-std','--setCacheDir',default=False,help="Set the cache directory for the scan. Set true if you use jenkins cicd")
     args = parser.parse_args()
 
     # if len(sys.args) == 1:
@@ -1274,6 +1282,11 @@ def default():
     else:
         ###logging.info('jenkins is not choosen')
         Config.jenkins = 'no'  
+        
+    if args.setCacheDir:
+        Config.set_cache_dir = True
+    else:
+        Config.set_cache_dir = False
 
     # lingu user id set
     if args.semgrepToken == 'No':

{boman_cli-2.5.9 → boman_cli-2.5.11}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 environment = prod
-version = 2.5.9
+version = 2.5.11
 name = boman-cli
 saas_base_url = https://dashboard.boman.ai/