🧹 remove useless if conditions

mondoohq · Feb 16, 2024 · 7c4033b · 7c4033b
1 parent f797eee
commit 7c4033b
Showing 1 changed file with 38 additions and 40 deletions.
diff --git a/sbom/sbom.go b/sbom/sbom.go
@@ -98,54 +98,52 @@ func GenerateBom(r *ReportCollectionJson) ([]Sbom, error) {
 					bom.Packages = append(bom.Packages, bomPkg)
 				}
 			}
-			if rb.PythonPackages != nil {
-				for _, pkg := range rb.PythonPackages {
-					bomPkg := &Package{
-						Name:    pkg.Name,
-						Version: pkg.Version,
-						Purl:    pkg.Purl,
-						Cpes:    pkg.CPEs,
-						Type:    "pypi",
-					}
 
-					// deprecated path, all files are now in the FilePaths field
-					// TODO: update once the python resource returns multiple results
-					if pkg.FilePath != "" {
-						bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
-							Type:  EvidenceType_EVIDENCE_TYPE_FILE,
-							Value: pkg.FilePath,
-						})
-					}
+			for _, pkg := range rb.PythonPackages {
+				bomPkg := &Package{
+					Name:    pkg.Name,
+					Version: pkg.Version,
+					Purl:    pkg.Purl,
+					Cpes:    pkg.CPEs,
+					Type:    "pypi",
+				}
 
-					for _, filepath := range pkg.FilePaths {
-						bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
-							Type:  EvidenceType_EVIDENCE_TYPE_FILE,
-							Value: filepath,
-						})
-					}
+				// deprecated path, all files are now in the FilePaths field
+				// TODO: update once the python resource returns multiple results
+				if pkg.FilePath != "" {
+					bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
+						Type:  EvidenceType_EVIDENCE_TYPE_FILE,
+						Value: pkg.FilePath,
+					})
+				}
 
-					bom.Packages = append(bom.Packages, bomPkg)
+				for _, filepath := range pkg.FilePaths {
+					bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
+						Type:  EvidenceType_EVIDENCE_TYPE_FILE,
+						Value: filepath,
+					})
 				}
+
+				bom.Packages = append(bom.Packages, bomPkg)
 			}
-			if rb.NpmPackages != nil {
-				for _, pkg := range rb.NpmPackages {
-					bomPkg := &Package{
-						Name:    pkg.Name,
-						Version: pkg.Version,
-						Purl:    pkg.Purl,
-						Cpes:    pkg.CPEs,
-						Type:    "npm",
-					}
 
-					for _, filepath := range pkg.FilePaths {
-						bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
-							Type:  EvidenceType_EVIDENCE_TYPE_FILE,
-							Value: filepath,
-						})
-					}
+			for _, pkg := range rb.NpmPackages {
+				bomPkg := &Package{
+					Name:    pkg.Name,
+					Version: pkg.Version,
+					Purl:    pkg.Purl,
+					Cpes:    pkg.CPEs,
+					Type:    "npm",
+				}
 
-					bom.Packages = append(bom.Packages, bomPkg)
+				for _, filepath := range pkg.FilePaths {
+					bomPkg.EvidenceList = append(bomPkg.EvidenceList, &Evidence{
+						Type:  EvidenceType_EVIDENCE_TYPE_FILE,
+						Value: filepath,
+					})
 				}
+
+				bom.Packages = append(bom.Packages, bomPkg)
 			}
 		}
 		boms = append(boms, bom)