Skip to content

Commit

Permalink
Add OCI tag verions to the Dependency object before Resolve. TODO: fi…
Browse files Browse the repository at this point in the history
…x HTTP HTTPS error for local registries

Signed-off-by: Scott Rigby <scott@r6by.com>
  • Loading branch information
scottrigby committed Jan 12, 2022
1 parent 9a7c362 commit e3f2fb4
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 1 deletion.
17 changes: 16 additions & 1 deletion internal/resolver/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@ func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string
return nil, errors.Wrapf(FeatureGateOCI.Error(),
"repository %s is an OCI registry", d.Repository)
}

// This works, fake it to test mocking the version
// tags := []string{"0.1.0", "0.1.1", "0.2.0"}
tags := d.OCITagVersions
vs = make(repo.ChartVersions, len(tags))
for ti, t := range tags {
// Mock chart version objects
version := &repo.ChartVersion{
Metadata: &chart.Metadata{
Version: t,
},
}
vs[ti] = version
}
}

locked[i] = &chart.Dependency{
Expand All @@ -149,7 +163,8 @@ func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string
// The version are already sorted and hence the first one to satisfy the constraint is used
for _, ver := range vs {
v, err := semver.NewVersion(ver.Version)
if err != nil || len(ver.URLs) == 0 {
// OCI does not need URLs
if err != nil || (!registry.IsOCI(d.Repository) && len(ver.URLs) == 0) {
// Not a legit entry.
continue
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/chart/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ type Dependency struct {
ImportValues []interface{} `json:"import-values,omitempty"`
// Alias usable alias to be used for the chart
Alias string `json:"alias,omitempty"`
// OCI tag versions available to check against the constraint when Version
// contains a semantic version range.
// See (*Manager).resolve.
OCITagVersions []string `json:"-"`
}

// Validate checks for common problems with the dependency datastructure in
Expand Down
20 changes: 20 additions & 0 deletions pkg/downloader/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,26 @@ func (m *Manager) loadChartDir() (*chart.Chart, error) {
// This returns a lock file, which has all of the dependencies normalized to a specific version.
func (m *Manager) resolve(req []*chart.Dependency, repoNames map[string]string) (*chart.Lock, error) {
res := resolver.New(m.ChartPath, m.RepositoryCache)
// NOTE: When OCI dependencies specify a semver range in Version,
// (*Resolver).Resolve must somehow get the list of OCI tag versions
// available to check against this constraint. However for backward
// compatibility we can not change that function signature to pass a
// *registry.Client required to get tags from the ORAS tag listing API.
// However we can add a new backward compatible struct field to
// *chart.Dependency, so that we can pass these along to
// (*Resolver).resolve from here through reqs []*chart.Dependency.
for i, d := range req {
if registry.IsOCI(d.Repository) {
// TODO(scottrigby): fix HTTP error
// > Error: Get "https://localhost:5000/v2/helm-charts/tags/list": http: server gave HTTP response to HTTPS client
ref := strings.Trim(d.Repository, "oci://")
tags, err := m.RegistryClient.Tags(ref)
if err != nil {
return nil, err
}
req[i].OCITagVersions = tags
}
}
return res.Resolve(req, repoNames)
}

Expand Down

0 comments on commit e3f2fb4

Please sign in to comment.