Reduce duplication code

Signed-off-by: Alexandr Danilin <alexandr.danilin@ooma.com>
pull/31524/head
Alexandr Danilin 2 months ago
parent 6da5ae2a0f
commit 29e3487933

@ -77,7 +77,7 @@ func (r *Resolver) Resolve(reqs []*chart.Dependency, repoNames map[string]string
}
continue
}
if strings.HasPrefix(d.Repository, "file://") {
if IsLocalDependency(d.Repository) {
chartpath, err := GetLocalPath(d.Repository, r.chartpath)
if err != nil {
return nil, err
@ -261,3 +261,7 @@ func GetLocalPath(repo, chartpath string) (string, error) {
return depPath, nil
}
func IsLocalDependency(repositoryPath string) bool {
return strings.HasPrefix(repositoryPath, "file://")
}

@ -195,7 +195,7 @@ func (m *Manager) Update() error {
// do resolution for each local dependency first
// it is required when local dependencies may have their own dependencies which must be resolved
for _, dep := range req {
if !isLocalDependency(dep.Repository) {
if !resolver.IsLocalDependency(dep.Repository) {
continue
}
chartpath, err := resolver.GetLocalPath(dep.Repository, m.ChartPath)
@ -320,7 +320,7 @@ func (m *Manager) downloadAll(deps []*chart.Dependency) error {
}
continue
}
if isLocalDependency(dep.Repository) {
if resolver.IsLocalDependency(dep.Repository) {
if m.Debug {
fmt.Fprintf(m.Out, "Archiving %s from repo %s\n", dep.Name, dep.Repository)
}
@ -496,7 +496,7 @@ func (m *Manager) hasAllRepos(deps []*chart.Dependency) error {
Loop:
for _, dd := range deps {
// If repo is from local path or OCI, continue
if strings.HasPrefix(dd.Repository, "file://") || registry.IsOCI(dd.Repository) {
if resolver.IsLocalDependency(dd.Repository) || registry.IsOCI(dd.Repository) {
continue
}
@ -601,7 +601,7 @@ func (m *Manager) resolveRepoNames(deps []*chart.Dependency) (map[string]string,
continue
}
// if dep chart is from local path, verify the path is valid
if strings.HasPrefix(dd.Repository, "file://") {
if resolver.IsLocalDependency(dd.Repository) {
if _, err := resolver.GetLocalPath(dd.Repository, m.ChartPath); err != nil {
return nil, err
}
@ -894,7 +894,7 @@ func writeLock(chartpath string, lock *chart.Lock, legacyLockfile bool) error {
// archive a dep chart from local directory and save it into destPath
func tarFromLocalDir(chartpath, name, repo, version, destPath string) (string, error) {
if !strings.HasPrefix(repo, "file://") {
if !resolver.IsLocalDependency(repo) {
return "", fmt.Errorf("wrong format: chart %s repository %s", name, repo)
}
@ -940,7 +940,3 @@ func key(name string) (string, error) {
}
return hex.EncodeToString(hash.Sum(nil)), nil
}
func isLocalDependency(repositoryPath string) bool {
return strings.HasPrefix(repositoryPath, "file://")
}

Loading…
Cancel
Save