From 9e9999b6714b1dc53ced5140815de387aa85bd21 Mon Sep 17 00:00:00 2001
From: Hang Park <hangpark@kaist.ac.kr>
Date: Mon, 14 Oct 2019 19:29:06 +0900
Subject: [PATCH] fix(pkg/downloader): Add failing tests for #6416 and bugs due
 to #5874

This commit includes failing tests for a bug reported by #6416 and
several bugs due to #5874. `helm dependency build` command fails if one
of subcharts has optional dependency fields (e.g. Alias / Condition /
Tags) or SemVer ranges.

Signed-off-by: Hang Park <hangpark@kaist.ac.kr>
---
 pkg/downloader/manager_test.go                | 107 ++++++++++++++++++
 .../testdata/local-subchart-0.1.0.tgz         | Bin 0 -> 259 bytes
 2 files changed, 107 insertions(+)
 create mode 100644 pkg/downloader/testdata/local-subchart-0.1.0.tgz

diff --git a/pkg/downloader/manager_test.go b/pkg/downloader/manager_test.go
index b21106fea..0c5c08615 100644
--- a/pkg/downloader/manager_test.go
+++ b/pkg/downloader/manager_test.go
@@ -17,10 +17,14 @@ package downloader
 
 import (
 	"bytes"
+	"path/filepath"
 	"reflect"
 	"testing"
 
 	"helm.sh/helm/v3/pkg/chart"
+	"helm.sh/helm/v3/pkg/chartutil"
+	"helm.sh/helm/v3/pkg/getter"
+	"helm.sh/helm/v3/pkg/repo/repotest"
 )
 
 func TestVersionEquals(t *testing.T) {
@@ -176,3 +180,106 @@ func TestGetRepoNames(t *testing.T) {
 		}
 	}
 }
+
+// This function is the skeleton test code of failing tests for #6416 and bugs due to #5874.
+// This function is used by below tests that ensures success of build operation
+// with optional fields, alias, condition, tags, and even with ranged version.
+// Parent chart includes local-subchart 0.1.0 subchart from a fake repository, by default.
+// If each of these main fields (name, version, repository) is not supplied by dep param, default value will be used.
+func checkBuildWithOptionalFields(t *testing.T, chartName string, dep chart.Dependency) {
+	// Set up a fake repo
+	srv, err := repotest.NewTempServer("testdata/*.tgz*")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer srv.Stop()
+	if err := srv.LinkIndices(); err != nil {
+		t.Fatal(err)
+	}
+	dir := func(p ...string) string {
+		return filepath.Join(append([]string{srv.Root()}, p...)...)
+	}
+
+	// Set main fields if not exist
+	if dep.Name == "" {
+		dep.Name = "local-subchart"
+	}
+	if dep.Version == "" {
+		dep.Version = "0.1.0"
+	}
+	if dep.Repository == "" {
+		dep.Repository = srv.URL()
+	}
+
+	// Save a chart
+	c := &chart.Chart{
+		Metadata: &chart.Metadata{
+			Name:         chartName,
+			Version:      "0.1.0",
+			APIVersion:   "v1",
+			Dependencies: []*chart.Dependency{&dep},
+		},
+	}
+	if err := chartutil.SaveDir(c, dir()); err != nil {
+		t.Fatal(err)
+	}
+
+	// Set-up a manager
+	b := bytes.NewBuffer(nil)
+	g := getter.Providers{getter.Provider{
+		Schemes: []string{"http", "https"},
+		New:     getter.NewHTTPGetter,
+	}}
+	m := &Manager{
+		ChartPath:        dir(chartName),
+		Out:              b,
+		Getters:          g,
+		RepositoryConfig: dir("repositories.yaml"),
+		RepositoryCache:  dir(),
+	}
+
+	// First build will update dependencies and create Chart.lock file.
+	err = m.Build()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Second build should be passed. See PR #6655.
+	err = m.Build()
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestBuild_WithoutOptionalFields(t *testing.T) {
+	// Dependency has main fields only (name/version/repository)
+	checkBuildWithOptionalFields(t, "without-optional-fields", chart.Dependency{})
+}
+
+func TestBuild_WithSemVerRange(t *testing.T) {
+	// Dependency version is the form of SemVer range
+	checkBuildWithOptionalFields(t, "with-semver-range", chart.Dependency{
+		Version: ">=0.1.0",
+	})
+}
+
+func TestBuild_WithAlias(t *testing.T) {
+	// Dependency has an alias
+	checkBuildWithOptionalFields(t, "with-alias", chart.Dependency{
+		Alias: "local-subchart-alias",
+	})
+}
+
+func TestBuild_WithCondition(t *testing.T) {
+	// Dependency has a condition
+	checkBuildWithOptionalFields(t, "with-condition", chart.Dependency{
+		Condition: "some.condition",
+	})
+}
+
+func TestBuild_WithTags(t *testing.T) {
+	// Dependency has several tags
+	checkBuildWithOptionalFields(t, "with-tags", chart.Dependency{
+		Tags: []string{"tag1", "tag2"},
+	})
+}
diff --git a/pkg/downloader/testdata/local-subchart-0.1.0.tgz b/pkg/downloader/testdata/local-subchart-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..4853121056a718bf02392623cf46a826f7908752
GIT binary patch
literal 259
zcmV+e0sQ_SiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PNJuio!4y2H>vq6nTN^{F#I<x*KLQF#Fl3^@xS^LM{an-(9RI
z7?3V3ikNTFLt994;QTRtt<8rERlU*HfBqbw`Bt|kTMhseN=+3&Tp{G;-|4$hkTT;~
z@C-Kv=e5mn_g-;xFG3H^KUvrGUCBqmR^)2i41Rk5=D%cGK1~K+_m=;Kifl)o9P4yT
zCBL2?Hl9~PE^@GE_m<3y@;_=5$Sr&U%;g`DasIywmGb`xyM2mjk|fDHIs^a!|Nq`S
J+7bW^004NVa-;wN

literal 0
HcmV?d00001