From abd33764e8738e9d46b6ec9dc5d7f73f1eeee675 Mon Sep 17 00:00:00 2001
From: Liam White <liamwhite@uk.ibm.com>
Date: Fri, 16 Feb 2018 10:44:47 +0000
Subject: [PATCH] Fix linting bug with charts containing more than one hyphen

---
 cmd/helm/lint.go                              |   6 +++++-
 cmd/helm/lint_test.go                         |  19 +++++++++++++-----
 .../compressedchart-with-hyphens-0.1.0.tgz    | Bin 0 -> 548 bytes
 3 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 cmd/helm/testdata/testcharts/compressedchart-with-hyphens-0.1.0.tgz

diff --git a/cmd/helm/lint.go b/cmd/helm/lint.go
index f529f8ce5..29eea1a88 100644
--- a/cmd/helm/lint.go
+++ b/cmd/helm/lint.go
@@ -149,7 +149,11 @@ func lintChart(path string, vals []byte, namespace string, strict bool) (support
 			return linter, err
 		}
 
-		base := strings.Split(filepath.Base(path), "-")[0]
+		lastHyphenIndex := strings.LastIndex(filepath.Base(path), "-")
+		if lastHyphenIndex <= 0 {
+			return linter, fmt.Errorf("unable to parse chart archive %q, missing '-'", filepath.Base(path))
+		}
+		base := filepath.Base(path)[:lastHyphenIndex]
 		chartPath = filepath.Join(tempDir, base)
 	} else {
 		chartPath = path
diff --git a/cmd/helm/lint_test.go b/cmd/helm/lint_test.go
index e52bdc056..7f045153c 100644
--- a/cmd/helm/lint_test.go
+++ b/cmd/helm/lint_test.go
@@ -21,11 +21,13 @@ import (
 )
 
 var (
-	values            = []byte{}
-	namespace         = "testNamespace"
-	strict            = false
-	archivedChartPath = "testdata/testcharts/compressedchart-0.1.0.tgz"
-	chartDirPath      = "testdata/testcharts/decompressedchart/"
+	values                       = []byte{}
+	namespace                    = "testNamespace"
+	strict                       = false
+	archivedChartPath            = "testdata/testcharts/compressedchart-0.1.0.tgz"
+	archivedChartPathWithHyphens = "testdata/testcharts/compressedchart-with-hyphens-0.1.0.tgz"
+	invalidArchivedChartPath     = "testdata/testcharts/invalidcompressedchart0.1.0.tgz"
+	chartDirPath                 = "testdata/testcharts/decompressedchart/"
 )
 
 func TestLintChart(t *testing.T) {
@@ -37,4 +39,11 @@ func TestLintChart(t *testing.T) {
 		t.Errorf("%s", err)
 	}
 
+	if _, err := lintChart(archivedChartPathWithHyphens, values, namespace, strict); err != nil {
+		t.Errorf("%s", err)
+	}
+
+	if _, err := lintChart(invalidArchivedChartPath, values, namespace, strict); err == nil {
+		t.Errorf("Expected a chart parsing error")
+	}
 }
diff --git a/cmd/helm/testdata/testcharts/compressedchart-with-hyphens-0.1.0.tgz b/cmd/helm/testdata/testcharts/compressedchart-with-hyphens-0.1.0.tgz
new file mode 100644
index 0000000000000000000000000000000000000000..379210a92c1795429d2c4baae389f1e971f26824
GIT binary patch
literal 548
zcmV+<0^9u`iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc
zVQyr3R8em|NM&qo0PL4fi`y^|#dG$jc->rDXjD0A64=|)92WW)wwIoYVoz*QSrU?*
zG;H^~7dcDXrjTqgP3fZFMMBsbi<vi1E=*$`c~50g3l~Nk8R}8JwKZw~;#FK?ThXXN
zA2{cHKAm<W=lpQw`DC)6ckB6VHk%I6E9gUMeGqQIdEb2w5BHx?k}sUJK^lFDD_oOm
z&{YCf#^H6lB&R8m&$MXh635CVTa)wMKAh!@XaD+Wi3f00|7)RI^1U0tDgBQp^8@|Q
z^9fJ-KL<lBXeC+|uuFC)`-7rj*$^LV=^;G?K3%<iGg=wfh!Cj6N-ByEET~Yz5n`X%
z6%MSB&LbEs<2-H$se{4Rv<`t9t3)8rGVFRwvmN~iJnAB+9`d(2s{ehC_A?gjpSOZj
z`sXjlzv_RSkLP*P|2eoOr3`Lw**nn?zM;JD1{WLSRC#fCmn8V8IjVnFlWJt8jiWv>
zPWu0B_M89nr2n%p#E0nPPIpGV%QZGNX)If*N~tSYQG5|qH0t|nfN!leE_nEwltQJ<
z5{(E&Ep_!Aj+6*;9W6i9KdlR0W<zMIMEu#nQ|o9Yzfy@<a(MEL;k{N{7~Q=YKM9r`
ml+?sBwz&Cx6O5ybRWe-*5{X2jKi>lY0RR8Xa#gbc6aWCh@%&~0

literal 0
HcmV?d00001