Skip to content
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

util/resolve: parse default registry from version attributes #113

Merged
merged 2 commits into from
Dec 5, 2024
Merged

util/resolve: parse default registry from version attributes #113

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e6b340
resolve: parse default registry from version attributes
cuixq Nov 20, 2024
1b0043a
Merge branch 'google:main' into maven
cuixq Dec 5, 2024
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
34 changes: 21 additions & 13 deletions util/resolve/maven/resolve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ func (r *resolver) resolve(ctx context.Context, vk resolve.VersionKey, requireme
},
}

fetchRepos, depRepos := parseRegistries(ver.AttrSet)
defaultRegistry, fetchRepos, depRepos := parseRegistries(ver.AttrSet)
if len(depRepos) > 0 {
v.repositories = append([]string(nil), depRepos...)
v.repositories = append(v.repositories, fetchRepos...)
Expand Down Expand Up @@ -291,9 +291,7 @@ func (r *resolver) resolve(ctx context.Context, vk resolve.VersionKey, requireme
if !hasMulti || multi {
// Only need to check if we don't already know if multiple
// registries are required.
registries, _ := parseRegistries(match.AttrSet)
// TODO: revisit the logic here once we support injecting
// the registry configuration.
_, registries, _ := parseRegistries(match.AttrSet)
// Attributes having no registries means the package only
// available in the default registry.
keep := len(registries) == 0
Expand All @@ -303,13 +301,21 @@ func (r *resolver) resolve(ctx context.Context, vk resolve.VersionKey, requireme
keep = true
break
}
if u, err := url.Parse(reg); err == nil {
if u.Host == "repo.maven.apache.org" && strings.Trim(u.Path, "/") == "maven2" {
// This is on Maven Central, keep it
keep = true
break

if defaultRegistry == "" {
// If default registry is not set, assume it's Maven Central.
if u, err := url.Parse(reg); err == nil {
if u.Host == "repo.maven.apache.org" && strings.Trim(u.Path, "/") == "maven2" {
// This is on Maven Central, keep it
keep = true
break
}
}
} else if reg == defaultRegistry {
keep = true
break
}

for _, rep := range cur.repositories {
// It can be reached, keep it.
if reg == rep {
Expand Down Expand Up @@ -374,7 +380,7 @@ func (r *resolver) resolve(ctx context.Context, vk resolve.VersionKey, requireme
mergeExclusions(d.exclusions, cur.exclusions)
n.exclusions = d.exclusions
}
_, registries := parseRegistries(match.AttrSet)
_, _, registries := parseRegistries(match.AttrSet)
// Add the list of declared repositories in the version to the list
// of reachable repositories.
if len(registries) > 0 {
Expand Down Expand Up @@ -606,14 +612,16 @@ func (r *resolver) isExcluded(excl map[string]bool, v resolve.VersionKey) (bool,
return excl[fields[0]+":*"] || excl["*:"+fields[1]], nil
}

func parseRegistries(a versionpkg.AttrSet) (fetch []string, dep []string) {
func parseRegistries(a versionpkg.AttrSet) (defaultRegistry string, fetch []string, dep []string) {
r, ok := a.GetAttr(versionpkg.Registries)
if !ok {
return nil, nil
return "", nil, nil
}
for _, rr := range strings.Split(r, "|") {
rr := strings.TrimSpace(rr)
if reg, ok := strings.CutPrefix(rr, "dep:"); ok {
if reg, ok := strings.CutPrefix(rr, "default:"); ok {
defaultRegistry = reg
} else if reg, ok := strings.CutPrefix(rr, "dep:"); ok {
dep = append(dep, reg)
} else {
fetch = append(fetch, rr)
Expand Down
Loading