From a25510c0ce7bbe5fa4ba6f09d749b62536632c4f Mon Sep 17 00:00:00 2001
From: Ritesh Noronha <ritesh.noronha@interlynk.io>
Date: Wed, 21 Aug 2024 14:15:07 -0700
Subject: [PATCH] Add code to satisfy golint

---
 pkg/logger/log.go | 12 ++++++++++--
 pkg/sbom/spdx.go  | 31 +++++++++----------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/pkg/logger/log.go b/pkg/logger/log.go
index 31a1898..c1cf92e 100644
--- a/pkg/logger/log.go
+++ b/pkg/logger/log.go
@@ -31,7 +31,11 @@ func InitProdLogger() {
 		log.Fatalf("Failed to initialize logger: %v", err)
 	}
 
-	defer l.Sync()
+	defer func() {
+		if err := logger.Sync(); err != nil {
+			return
+		}
+	}()
 
 	if logger != nil {
 		panic("logger already initialized")
@@ -45,7 +49,11 @@ func InitDebugLogger() {
 		log.Printf("Failed to zap new development: %v", err)
 	}
 
-	defer l.Sync()
+	defer func() {
+		if err := logger.Sync(); err != nil {
+			return
+		}
+	}()
 
 	if logger != nil {
 		panic("logger already initialized")
diff --git a/pkg/sbom/spdx.go b/pkg/sbom/spdx.go
index 5da5d77..c7509f3 100644
--- a/pkg/sbom/spdx.go
+++ b/pkg/sbom/spdx.go
@@ -218,6 +218,13 @@ func (s *SpdxDoc) parseComps() {
 			nc.Supplier = *supp
 		}
 
+		// https://github.com/spdx/ntia-conformance-checker/issues/100
+		// Add spdx support to check both supplier and originator
+		if supp == nil && manu != nil {
+			nc.Supplier.Name = manu.Name
+			nc.Supplier.Email = manu.Email
+		}
+
 		if sc.PackageVerificationCode != nil {
 			nc.sourceCodeHash = sc.PackageVerificationCode.Value
 		}
@@ -574,6 +581,8 @@ func (s *SpdxDoc) getManufacturer(index int) *manufacturer {
 	}
 }
 
+// https://github.com/spdx/ntia-conformance-checker/issues/100
+// Add spdx support to check both supplier and originator
 func (s *SpdxDoc) getSupplier(index int) *Supplier {
 	pkg := s.doc.Packages[index]
 
@@ -596,28 +605,6 @@ func (s *SpdxDoc) getSupplier(index int) *Supplier {
 	}
 }
 
-// https://github.com/spdx/ntia-conformance-checker/issues/100
-// Add spdx support to check both supplier and originator
-func (s *SpdxDoc) addSupplierName(index int) string {
-	supplier := s.getSupplier(index)
-	manufacturer := s.getManufacturer(index)
-
-	if supplier == nil && manufacturer == nil {
-		s.addToLogs(fmt.Sprintf("spdx doc pkg %s at index %d no supplier/originator found", s.doc.Packages[index].PackageName, index))
-		return ""
-	}
-
-	if supplier != nil {
-		return supplier.Name
-	}
-
-	if manufacturer != nil {
-		return manufacturer.Name
-	}
-
-	return ""
-}
-
 func (s *SpdxDoc) parsePrimaryComponent() {
 	pkgIDs := make(map[string]*spdx.Package)