Add latest changes from gitlab-org/gitlab@16-2-stable-ee

1 files changed, 10 insertions, 1 deletions

diff --git a/lib/sbom/purl_type/converter.rb b/lib/sbom/purl_type/converter.rb
index e02d6932167..bfcfb414180 100644
--- a/lib/sbom/purl_type/converter.rb
+++ b/lib/sbom/purl_type/converter.rb
@@ -14,15 +14,24 @@ module Sbom
         'composer' => 'composer',
         'conan' => 'conan',
         'go' => 'golang',
+        'gobinary' => 'golang', # this package manager is generated by trivy
         'nuget' => 'nuget',
         'pip' => 'pypi',
         'pipenv' => 'pypi',
-        'setuptools' => 'pypi'
+        'setuptools' => 'pypi',
+        'python-pkg' => 'pypi'  # this package manager is generated by trivy
       }.with_indifferent_access.freeze
 
       def self.purl_type_for_pkg_manager(package_manager)
+        matches = package_manager.match(TRIVY_PACKAGE_MANAGER_REGEX)
+
+        package_manager = matches['trivy-package-manager-type'] if matches
+
         PACKAGE_MANAGER_TO_PURL_TYPE_MAP[package_manager]
       end
+
+      TRIVY_PACKAGE_MANAGER_REGEX = /\((?<trivy-package-manager-type>.*?)\)/
+      private_constant :TRIVY_PACKAGE_MANAGER_REGEX
     end
   end
 end