fix sbom (#555)

* fix sbom

Author: cx-pedro-lopes

internal/commands/result.go

@@ -15,6 +15,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 	"github.com/checkmarx/ast-cli/internal/commands/util"
 	"github.com/checkmarx/ast-cli/internal/commands/util/printer"
+	"github.com/checkmarx/ast-cli/internal/logger"
 
 	commonParams "github.com/checkmarx/ast-cli/internal/params"
 
@@ -73,6 +74,7 @@ const (
 	scaLastScanTimeFlagDescription          = "SCA last scan time. Available options: integer above 1"
 	projectPrivatePackageFlagDescription    = "Enable or disable project private package. Available options: true,false"
 	scaPrivatePackageVersionFlagDescription = "SCA project private package version. Example: 0.1.1"
+	reportSbomMaxRetries                    = 10
 )
 
 var filterResultsListFlagUsage = fmt.Sprintf(
@@ -752,8 +754,13 @@ func createReport(
 		convertNotAvailableNumberToZero(summary)
 
 		if !contains(summary.EnginesEnabled, scaType) {
-			return fmt.Errorf("to generate %s report, SCA engine must be enabled on scan summary", printer.FormatSbom)
+			return fmt.Errorf("unable to generate %s report - SCA engine must be enabled on scan summary", printer.FormatSbom)
 		}
+
+		if summary.ScaIssues == notAvailableNumber {
+			return fmt.Errorf("unable to generate %s report - SCA engine did not complete successfully", printer.FormatSbom)
+		}
+
 		return exportSbomResults(resultsSbomWrapper, summaryRpt, summary, formatSbomOptions, useSCALocalFlow)
 	}
 	return fmt.Errorf("bad report format %s", format)
@@ -946,10 +953,26 @@ func exportSbomResults(sbomWrapper wrappers.ResultsSbomWrapper, targetFile strin
 	}
 
 	log.Println("Generating SBOM report with " + payload.FileFormat + " file format using SCA proxy...")
+	i := uint64(0)
+
+	for i < reportSbomMaxRetries {
+		completed, err := sbomWrapper.GenerateSbomReportWithProxy(payload, targetFile)
+		if err != nil {
+			return err
+		}
+
+		if completed {
+			return nil
+		}
+		i++
+		time.Sleep(delayValueForReport * time.Millisecond)
+		logger.PrintIfVerbose(
+			fmt.Sprintf(
+				"Retry SBOM report: --%d retry",
+				i,
+			),
+		)
 
-	err := sbomWrapper.GenerateSbomReportWithProxy(payload, targetFile)
-	if err != nil {
-		return err
 	}
 
 	return nil

internal/wrappers/mock/results-sbom-mock.go

@@ -9,7 +9,7 @@ import (
 
 type ResultsSbomWrapper struct{}
 
-func (w *ResultsSbomWrapper) GenerateSbomReportWithProxy(payload *wrappers.SbomReportsPayload, targetFile string) error {
+func (w *ResultsSbomWrapper) GenerateSbomReportWithProxy(payload *wrappers.SbomReportsPayload, targetFile string) (bool, error) {
 	file, err := os.Create(targetFile)
 	defer func() {
 		err = file.Close()
@@ -18,9 +18,10 @@ func (w *ResultsSbomWrapper) GenerateSbomReportWithProxy(payload *wrappers.SbomR
 		}
 	}()
 	if err != nil {
-		return errors.Wrapf(err, "Failed to create file %s", targetFile)
+		return true, errors.Wrapf(err, "Failed to create file %s", targetFile)
 	}
-	return nil
+
+	return true, nil
 }
 
 // GenerateSbomReport mock for tests

internal/wrappers/results-sbom-http.go

@@ -72,35 +72,39 @@ func (r *SbomHTTPWrapper) GenerateSbomReport(payload *SbomReportsPayload) (*Sbom
 	}
 }
 
-func (r *SbomHTTPWrapper) GenerateSbomReportWithProxy(payload *SbomReportsPayload, targetFile string) error {
+func (r *SbomHTTPWrapper) GenerateSbomReportWithProxy(payload *SbomReportsPayload, targetFile string) (bool, error) {
 	clientTimeout := viper.GetUint(commonParams.ClientTimeoutKey)
 	path := fmt.Sprintf("%s/%s/%s", r.proxyPath, payload.ScanID, "export")
 	params := map[string]string{"format": payload.FileFormat}
 	resp, err := SendPrivateHTTPRequestWithQueryParams(http.MethodGet, path, params, nil, clientTimeout)
 	if err != nil {
-		return err
+		return true, err
 	}
 
 	defer func() {
 		_ = resp.Body.Close()
 	}()
 
+	if resp.StatusCode == http.StatusCreated || resp.StatusCode == http.StatusAccepted {
+		return false, nil
+	}
+
 	if resp.StatusCode != http.StatusOK {
-		return errors.Errorf("response status code %d", resp.StatusCode)
+		return true, errors.Errorf("response status code %d", resp.StatusCode)
 	}
 
 	file, err := os.Create(targetFile)
 	if err != nil {
-		return errors.Wrapf(err, "Failed to create file %s", targetFile)
+		return true, errors.Wrapf(err, "Failed to create file %s", targetFile)
 	}
 	defer file.Close()
 	size, err := io.Copy(file, resp.Body)
 	if err != nil {
-		return errors.Wrapf(err, "Failed to write file %s", targetFile)
+		return true, errors.Wrapf(err, "Failed to write file %s", targetFile)
 	}
 
 	log.Printf("Downloaded file: %s - %d bytes\n", targetFile, size)
-	return nil
+	return true, nil
 }
 
 func (r *SbomHTTPWrapper) GetSbomReportStatus(reportID string) (*SbomPollingResponse, error) {

internal/wrappers/results-sbom.go

@@ -2,7 +2,7 @@ package wrappers
 
 type ResultsSbomWrapper interface {
 	GenerateSbomReport(payload *SbomReportsPayload) (*SbomReportsResponse, error)
-	GenerateSbomReportWithProxy(payload *SbomReportsPayload, targetFile string) error
+	GenerateSbomReportWithProxy(payload *SbomReportsPayload, targetFile string) (bool, error)
 	GetSbomReportStatus(reportID string) (*SbomPollingResponse, error)
 	DownloadSbomReport(reportID, targetFile string) error
 }