Merge pull request kubernetes#2213 from hectorj2f/fix_panic_license

bom: fix panic when LICENSE file is not found
ashnehete · Aug 19, 2021 · 2f3587e · 2f3587e
2 parents eeb22d2 + 5eda9dc
commit 2f3587e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/spdx/implementation.go b/pkg/spdx/implementation.go
@@ -506,6 +506,10 @@ func (di *spdxDefaultImplementation) GetDirectoryLicense(
 	if err != nil {
 		return nil, errors.Wrap(err, "getting directory license")
 	}
+	if licenseResult == nil {
+		logrus.Warnf("License classifier could not find a license for directory: %v", err)
+		return nil, nil
+	}
 	return licenseResult.License, nil
 }
 

diff --git a/pkg/spdx/spdx.go b/pkg/spdx/spdx.go
@@ -151,9 +151,7 @@ func (spdx *SPDX) PackageFromDirectory(dirPath string) (pkg *Package, err error)
 	if err != nil {
 		return nil, errors.Wrap(err, "scanning directory for licenses")
 	}
-	if lic == nil {
-		logrus.Warnf("License classifier could not find a license for directory: %v", err)
-	} else {
+	if lic != nil {
 		licenseTag = lic.LicenseID
 	}