diff --git a/extractor/standalone/windows/dismpatch/extractor_windows.go b/extractor/standalone/windows/dismpatch/extractor_windows.go index 4b048fd8..98ee6bd6 100644 --- a/extractor/standalone/windows/dismpatch/extractor_windows.go +++ b/extractor/standalone/windows/dismpatch/extractor_windows.go @@ -55,9 +55,10 @@ func (e *Extractor) Extract(ctx context.Context, input *standalone.ScanInput) ([ // ToPURL converts an inventory created by this extractor into a PURL. func (e Extractor) ToPURL(i *extractor.Inventory) (*purl.PackageURL, error) { return &purl.PackageURL{ - Type: purl.TypeMicrosoft, - Name: i.Name, - Version: i.Version, + Type: purl.TypeGeneric, + Namespace: "microsoft", + Name: i.Name, + Version: i.Version, }, nil } diff --git a/extractor/standalone/windows/regosversion/extractor_windows.go b/extractor/standalone/windows/regosversion/extractor_windows.go index 1152d941..6042af16 100644 --- a/extractor/standalone/windows/regosversion/extractor_windows.go +++ b/extractor/standalone/windows/regosversion/extractor_windows.go @@ -120,9 +120,10 @@ func (e Extractor) windowsRevision(key registry.Key) (uint64, error) { // ToPURL converts an inventory created by this extractor into a PURL. func (e Extractor) ToPURL(i *extractor.Inventory) (*purl.PackageURL, error) { return &purl.PackageURL{ - Type: purl.TypeMicrosoft, - Name: i.Name, - Version: i.Version, + Type: purl.TypeGeneric, + Namespace: "microsoft", + Name: i.Name, + Version: i.Version, }, nil } diff --git a/extractor/standalone/windows/regpatchlevel/extractor_windows.go b/extractor/standalone/windows/regpatchlevel/extractor_windows.go index 2e863155..b5d00f04 100644 --- a/extractor/standalone/windows/regpatchlevel/extractor_windows.go +++ b/extractor/standalone/windows/regpatchlevel/extractor_windows.go @@ -120,9 +120,10 @@ func (e *Extractor) handleKey(registryPath, keyName string) (*extractor.Inventor // ToPURL converts an inventory created by this extractor into a PURL. func (e Extractor) ToPURL(i *extractor.Inventory) (*purl.PackageURL, error) { return &purl.PackageURL{ - Type: purl.TypeMicrosoft, - Name: i.Name, - Version: i.Version, + Type: purl.TypeGeneric, + Namespace: "microsoft", + Name: i.Name, + Version: i.Version, }, nil } diff --git a/purl/purl.go b/purl/purl.go index 971c7050..d642a758 100644 --- a/purl/purl.go +++ b/purl/purl.go @@ -79,8 +79,6 @@ const ( TypeRPM = "rpm" // TypeSwift is pkg:swift purl TypeSwift = "swift" - // TypeMicrosoft is pkg:microsoft purl - TypeMicrosoft = "microsoft" // TypeGooget is pkg:googet purl TypeGooget = "googet" ) @@ -168,7 +166,6 @@ func validType(t string) bool { TypePyPi: true, TypeRPM: true, TypeSwift: true, - TypeMicrosoft: true, TypeGooget: true, }