more static

Author: attiasas

commands/audit/audit.go

@@ -155,7 +155,7 @@ func CreateAuditResultsContext(serverDetails *config.ServerDetails, xrayVersion
 
 // If the user requested to include vulnerabilities, or if the user didn't provide any watches, project key, artifactory repo path or git repo key, we should include vulnerabilities.
 func shouldIncludeVulnerabilities(includeVulnerabilities bool, watches []string, artifactoryRepoPath, projectKey, gitRepoHttpsCloneUrl string) bool {
-	return includeVulnerabilities || len(watches) <= 0 && projectKey == "" && artifactoryRepoPath == "" && gitRepoHttpsCloneUrl == ""
+	return includeVulnerabilities || len(watches) == 0 && projectKey == "" && artifactoryRepoPath == "" && gitRepoHttpsCloneUrl == ""
 }
 
 func (auditCmd *AuditCommand) Run() (err error) {

commands/audit/audit_test.go

@@ -753,7 +753,7 @@ func TestAuditWithPartialResults(t *testing.T) {
 		t.Run(testcase.name, func(t *testing.T) {
 			serverMock, serverDetails := validations.CreateXrayRestsMockServer(func(w http.ResponseWriter, r *http.Request) {
 				if r.RequestURI == "/xray/api/v1/system/version" {
-					_, err := w.Write([]byte(fmt.Sprintf(`{"xray_version": "%s", "xray_revision": "xxx"}`, utils.EntitlementsMinVersion)))
+					_, err := fmt.Fprintf(w, `{"version":"%s", "xray_revision": "xxx"}`, utils.EntitlementsMinVersion)
 					if !assert.NoError(t, err) {
 						return
 					}

commands/audit/auditparams.go

@@ -199,7 +199,7 @@ func (params *AuditParams) createXrayGraphScanParams() *services.XrayGraphScanPa
 }
 
 func (params *AuditParams) ToBuildInfoBomGenParams() (bomParams technologies.BuildInfoBomGeneratorParams, err error) {
-	serverDetails, err := params.AuditBasicParams.ServerDetails()
+	serverDetails, err := params.ServerDetails()
 	if err != nil {
 		return
 	}

sca/bom/buildinfo/technologies/gem/gem.go

@@ -2,6 +2,7 @@ package gem
 
 import (
 	"bufio"
+	"errors"
 	"fmt"
 	"os"
 	"os/exec"
@@ -195,7 +196,11 @@ func parseLockfileToInternalData(lockFilePath string) (
 	if ioErr != nil {
 		return nil, nil, fmt.Errorf("opening lockfile %s: %w", lockFilePath, ioErr)
 	}
-	defer file.Close()
+	defer func() {
+		if cerr := file.Close(); cerr != nil {
+			err = errors.Join(err, fmt.Errorf("closing lockfile %s: %w", lockFilePath, cerr))
+		}
+	}()
 
 	scanner := bufio.NewScanner(file)
 

tests/validations/test_mocks.go

@@ -174,7 +174,7 @@ func XrayServer(t *testing.T, params MockServerParams) (*httptest.Server, *confi
 			if r.Method == http.MethodPost {
 				apiCallCounts[GraphScanPostAPI]++
 				w.WriteHeader(http.StatusCreated)
-				_, err := w.Write([]byte(fmt.Sprintf(`{"scan_id" : "%s"}`, TestScaScanId)))
+				_, err := fmt.Fprintf(w, `{"scan_id" : "%s"}`, TestScaScanId)
 				if !assert.NoError(t, err) {
 					return
 				}

utils/results/common.go

@@ -728,7 +728,7 @@ func GetCveApplicabilityFieldAndFilterDisqualify(cveId string, applicabilityScan
 	// Filter out evidences that are disqualified
 	filteredEvidence := make([]formats.Evidence, 0, len(applicability.Evidence))
 	for _, evidence := range applicability.Evidence {
-		fileName := evidence.Location.File
+		fileName := evidence.File
 		if fileName == "" || !shouldDisqualifyEvidence(components, filepath.Clean(fileName)) {
 			// If the file name is empty, we cannot determine if it should be disqualified
 			// If the evidence is not disqualified, keep it

utils/results/conversion/simplejsonparser/simplejsonparser.go

@@ -831,6 +831,6 @@ func sortSourceCodeRow(rows []formats.SourceCodeRow) {
 		if rows[i].Applicability != nil && rows[j].Applicability != nil {
 			return jasutils.TokenValidationOrder[rows[i].Applicability.Status] < jasutils.TokenValidationOrder[rows[j].Applicability.Status]
 		}
-		return rows[i].Location.File > rows[j].Location.File
+		return rows[i].File > rows[j].File
 	})
 }

utils/results/conversion/summaryparser/summaryparser.go

@@ -133,7 +133,7 @@ func (sc *CmdResultsSummaryConverter) getScaSecurityViolationHandler(parsed *dat
 			}
 			parsed.Add(key)
 			// Count the violation
-			scaSecurityHandler(sc.currentScan.Violations.ScanResultSummary.ScaResults, severity, applicabilityStatus)
+			scaSecurityHandler(sc.currentScan.Violations.ScaResults, severity, applicabilityStatus)
 		}
 		return
 	}