Skip to content

Commit 414f009

Browse files
Ly-Joeycopybara-github
authored andcommitted
fix: match new deps.dev naming
deps.dev recently changed their naming convention of go stdlib versions Updating relating logic in license and packagedeprecation enrichers PiperOrigin-RevId: 840479734
1 parent a76a7d1 commit 414f009

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

enricher/license/license.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@ func (e *Enricher) makeVersionRequest(ctx context.Context, queries []*depsdevpb.
163163
}
164164

165165
func versionQuery(system depsdevpb.System, name string, version string) *depsdevpb.GetVersionRequest {
166-
if system == depsdevpb.System_GO && name != "stdlib" {
167-
version = "v" + version
166+
// Matching deps.dev naming convention.
167+
if system == depsdevpb.System_GO {
168+
if name == "stdlib" {
169+
version = "go" + version
170+
} else {
171+
version = "v" + version
172+
}
168173
}
169174

170175
return &depsdevpb.GetVersionRequest{

enricher/packagedeprecation/packagedeprecation.go

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,13 @@ func makeVersionKey(pkg *extractor.Package) (VersionKey, bool) {
133133
}
134134
name, ver := pkg.Name, pkg.Version
135135

136-
// Add "v" prefix for Go versions (except stdlib) to match deps.dev format.
137-
if pkg.PURLType == purl.TypeGolang && pkg.Name != "stdlib" {
138-
ver = "v" + ver
136+
// Matching deps.dev naming convention.
137+
if pkg.PURLType == purl.TypeGolang {
138+
if name == "stdlib" {
139+
ver = "go" + ver
140+
} else {
141+
ver = "v" + ver
142+
}
139143
}
140144

141145
return VersionKey{

0 commit comments

Comments
 (0)