test: use local logger instance in tests

snyk · Mar 4, 2024 · 2cc7b35 · 2cc7b35
1 parent 6bf7ae4
commit 2cc7b35
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/lib/ecosystems/enrich_cyclonedx_test.go b/lib/ecosystems/enrich_cyclonedx_test.go
@@ -30,8 +30,6 @@ import (
 	"github.com/snyk/parlay/lib/sbom"
 )
 
-var logger = zerolog.Nop()
-
 func TestEnrichSBOM_CycloneDX(t *testing.T) {
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
@@ -67,6 +65,7 @@ func TestEnrichSBOM_CycloneDX(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -114,6 +113,7 @@ func TestEnrichSBOM_CycloneDX_NestedComps(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -146,6 +146,7 @@ func TestEnrichSBOMWithoutLicense(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -191,6 +192,7 @@ func TestEnrichLicense(t *testing.T) {
 func TestEnrichBlankSBOM(t *testing.T) {
 	bom := new(cdx.BOM)
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 

diff --git a/lib/ecosystems/enrich_spdx_test.go b/lib/ecosystems/enrich_spdx_test.go
@@ -21,6 +21,7 @@ import (
 	"testing"
 
 	"github.com/jarcoal/httpmock"
+	"github.com/rs/zerolog"
 	"github.com/spdx/tools-golang/spdx/v2/common"
 	"github.com/spdx/tools-golang/spdx/v2/v2_3"
 	"github.com/stretchr/testify/assert"
@@ -60,6 +61,7 @@ func TestEnrichSBOM_SPDX(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 

diff --git a/lib/snyk/enrich_test.go b/lib/snyk/enrich_test.go
@@ -13,8 +13,6 @@ import (
 	"github.com/snyk/parlay/lib/sbom"
 )
 
-var logger = zerolog.Nop()
-
 func TestEnrichSBOM_CycloneDXWithVulnerabilities(t *testing.T) {
 	teardown := setupTestEnv(t)
 	defer teardown()
@@ -30,6 +28,7 @@ func TestEnrichSBOM_CycloneDXWithVulnerabilities(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -63,6 +62,7 @@ func TestEnrichSBOM_CycloneDXWithVulnerabilities_NestedComponents(t *testing.T)
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -85,6 +85,7 @@ func TestEnrichSBOM_CycloneDXWithoutVulnerabilities(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)
 
@@ -112,6 +113,7 @@ func TestEnrichSBOM_SPDXWithVulnerabilities(t *testing.T) {
 		},
 	}
 	doc := &sbom.SBOMDocument{BOM: bom}
+	logger := zerolog.Nop()
 
 	EnrichSBOM(doc, &logger)