Merge pull request #106 from sw360/105-be-more-flexible-at-find-sources

105 be more flexible at find sources

ChangeLog.md

@@ -12,6 +12,7 @@
 * `bom convert` improved: we can now convert from and to CycloneDX XML.
 * new command `bom validate` to do a siple validation whether a given SBOM
   complies with the CycloneDX spec version 1.4, 1.5 or 1.6.
+* `bom findsources`: programming language can be `golang` or `go`.
 
 ## 2.6.0.dev1
 

capycli/bom/findsources.py

@@ -524,7 +524,7 @@ def find_sources(self, bom: Bom) -> Tuple[int, int]:
                 if self.verbose:
                     print("    No Source code URL available - try to find with language:")
                 source_url = self.find_source_url_by_language(component)
-            if not source_url and language.lower() == "golang":
+            if not source_url and (language.lower() == "golang" or language.lower() == "go"):
                 if self.verbose:
                     print("    No Source code URL available - try to find on pkg.go.dev:")
                 source_url = self.find_golang_url(component)

tests/test_bom_create_releases.py

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------------
-# Copyright (c) 2021-2023 Siemens
+# Copyright (c) 2021-2024 Siemens
 # All Rights Reserved.
 # Author: [email protected], [email protected]
 #
@@ -703,7 +703,7 @@ def test_upload_file_allow_git_binary_upload(self) -> None:
             body="content")
         responses.add(
             responses.POST, SW360_BASE_URL + 'releases/06a6e7/attachments',
-            match=[upload_matcher("babel.git")])
+            match=[upload_matcher("babel.git", "BINARY")])
 
         self.app.download = True
         item = Component(
@@ -1171,4 +1171,4 @@ def test_update_release_attachment_rename(self) -> None:
 if __name__ == '__main__':
     APP = CapycliTestBomCreate()
     APP.setUp()
-    APP.test_update_release_attachment()
+    APP.test_upload_file_allow_git_binary_upload()