Skip to content

chore: reduce duplicate case SwiftPkg #2696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spiffcs merged 1 commit into from
Mar 7, 2024
Merged

chore: reduce duplicate case SwiftPkg #2696

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion syft/pkg/language.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func LanguageByName(name string) Language {
return Dart
case string(Dotnet), ".net", packageurl.TypeNuget:
return Dotnet
case packageurl.TypeCocoapods, packageurl.TypeSwift, string(CocoapodsPkg), string(SwiftPkg):
case packageurl.TypeCocoapods, packageurl.TypeSwift, string(CocoapodsPkg):
Copy link
Copy Markdown
Contributor

@spiffcs spiffcs Mar 7, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the slate of PRs @testwill - I'll take some time today to validate these today. I'm trying to figure out why this was duplicated in the first place:

// TypeCocoapods is a pkg:cocoapods purl.
--
66 | TypeCocoapods = "cocoapods"

CocoapodsPkg          Type = "pod"]

Looks like these are two different strings here so it's not a duplicate case =)

Thanks for the due diligence on checking this though.

Closing for now given the different names.

If you think this could be clearer let me know and I can reopen and we can figure out what the chance should be

Copy link
Copy Markdown
Contributor

@spiffcs spiffcs Mar 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💯 - my fault I totally switched gears and looked at the wrong value change - this is good to go!

https://github.com/package-url/packageurl-go/blob/7cb81af9593b9512bb946c55c85609948c48aab9/packageurl.go#L114

syft/syft/pkg/type.go

Line 42 in e2a9d89

SwiftPkg Type = "swift"

Same string

return Swift
case packageurl.TypeConan, string(CPP):
return CPP
Expand Down