static analysis: return error if archive extraction is not implemente…

…d and log unserialisable JSON as warning (#877) Signed-off-by: Max Fisher <[email protected]> Co-authored-by: Caleb Brown <[email protected]>
ossf · Sep 12, 2023 · 8b19e90 · 8b19e90
1 parent 92541c7
commit 8b19e90
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/internal/pkgmanager/ecosystem.go b/internal/pkgmanager/ecosystem.go
@@ -119,7 +119,10 @@ func (p *PkgManager) DownloadArchive(name, version, directory string) (string, e
 }
 
 func (p *PkgManager) ExtractArchive(archivePath, outputDir string) error {
-	return p.extractArchive(archivePath, outputDir)
+	if p.extractArchive != nil {
+		return p.extractArchive(archivePath, outputDir)
+	}
+	return fmt.Errorf("archive extraction not implemented for %s", p.Ecosystem())
 }
 
 func normalizePkgName(pkg string) string {

diff --git a/sandboxes/staticanalysis/staticanalyze.go b/sandboxes/staticanalysis/staticanalyze.go
@@ -185,7 +185,7 @@ func run() (err error) {
 
 	jsonResult, err := json.Marshal(results)
 	if err != nil {
-		slog.DebugContext(ctx, fmt.Sprintf("unserialisable JSON: %v", results))
+		slog.WarnContext(ctx, fmt.Sprintf("unserialisable JSON: %v", results))
 		return fmt.Errorf("JSON marshal error: %w", err)
 	}