From 17ccdaca1b06e2e77b25dec0757129ec096fad2a Mon Sep 17 00:00:00 2001
From: Matt Butcher <mbutcher@engineyard.com>
Date: Tue, 4 Oct 2016 12:13:01 -0600
Subject: [PATCH] fix(chart): Chart.yaml now has an apiVersion field.

This is to future-proof charts, and also be consistent with repo and
index YAML files.

Closes #1264
---
 _proto/hapi/chart/metadata.proto              |   3 +
 cmd/helm/create.go                            |   1 +
 cmd/helm/create_test.go                       |  71 ++++++++++++++++++
 pkg/chartutil/chartfile.go                    |   3 +
 pkg/chartutil/chartfile_test.go               |   5 ++
 pkg/chartutil/testdata/chartfiletest.yaml     |   1 +
 pkg/chartutil/testdata/frobnitz-1.2.3.tgz     | Bin 4017 -> 4025 bytes
 pkg/chartutil/testdata/frobnitz/Chart.yaml    |   1 +
 .../frobnitz/charts/mariner-4.3.2.tgz         | Bin 1025 -> 1031 bytes
 .../mariner/charts/albatross-0.1.0.tgz        | Bin 347 -> 347 bytes
 pkg/proto/hapi/chart/metadata.pb.go           |  40 +++++-----
 11 files changed, 106 insertions(+), 19 deletions(-)
 create mode 100644 cmd/helm/create_test.go

diff --git a/_proto/hapi/chart/metadata.proto b/_proto/hapi/chart/metadata.proto
index 40c8b40dc..da194e9d3 100644
--- a/_proto/hapi/chart/metadata.proto
+++ b/_proto/hapi/chart/metadata.proto
@@ -61,4 +61,7 @@ message Metadata {
 
 	// The URL to an icon file.
 	string icon = 9;
+
+	// The API Version of this chart.
+	string apiVersion = 10;
 }
diff --git a/cmd/helm/create.go b/cmd/helm/create.go
index 9f50be5f7..317e8fd6b 100644
--- a/cmd/helm/create.go
+++ b/cmd/helm/create.go
@@ -85,6 +85,7 @@ func (c *createCmd) run() error {
 		Name:        chartname,
 		Description: "A Helm chart for Kubernetes",
 		Version:     "0.1.0",
+		ApiVersion:  chartutil.ApiVersionV1,
 	}
 
 	_, err := chartutil.Create(cfile, filepath.Dir(c.name))
diff --git a/cmd/helm/create_test.go b/cmd/helm/create_test.go
new file mode 100644
index 000000000..5fb2c82a6
--- /dev/null
+++ b/cmd/helm/create_test.go
@@ -0,0 +1,71 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package main
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+
+	"k8s.io/helm/pkg/chartutil"
+)
+
+func TestCreateCmd(t *testing.T) {
+	cname := "testchart"
+	// Make a temp dir
+	tdir, err := ioutil.TempDir("", "helm-create-")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.Remove(tdir)
+
+	// CD into it
+	pwd, err := os.Getwd()
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := os.Chdir(tdir); err != nil {
+		t.Fatal(err)
+	}
+	defer os.Chdir(pwd)
+
+	// Run a create
+	cmd := newCreateCmd(os.Stdout)
+	if err := cmd.RunE(cmd, []string{cname}); err != nil {
+		t.Errorf("Failed to run create: %s", err)
+		return
+	}
+
+	// Test that the chart is there
+	if fi, err := os.Stat(cname); err != nil {
+		t.Fatalf("no chart directory: %s", err)
+	} else if !fi.IsDir() {
+		t.Fatalf("chart is not directory")
+	}
+
+	c, err := chartutil.LoadDir(cname)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if c.Metadata.Name != cname {
+		t.Errorf("Expected %q name, got %q", cname, c.Metadata.Name)
+	}
+	if c.Metadata.ApiVersion != chartutil.ApiVersionV1 {
+		t.Errorf("Wrong API version: %q", c.Metadata.ApiVersion)
+	}
+}
diff --git a/pkg/chartutil/chartfile.go b/pkg/chartutil/chartfile.go
index 588670541..3087d81d4 100644
--- a/pkg/chartutil/chartfile.go
+++ b/pkg/chartutil/chartfile.go
@@ -24,6 +24,9 @@ import (
 	"k8s.io/helm/pkg/proto/hapi/chart"
 )
 
+// APIVersionV1 is the API version number for version 1.
+const ApiVersionV1 = "v1"
+
 // UnmarshalChartfile takes raw Chart.yaml data and unmarshals it.
 func UnmarshalChartfile(data []byte) (*chart.Metadata, error) {
 	y := &chart.Metadata{}
diff --git a/pkg/chartutil/chartfile_test.go b/pkg/chartutil/chartfile_test.go
index 1b8e800f0..4ccddd3d7 100644
--- a/pkg/chartutil/chartfile_test.go
+++ b/pkg/chartutil/chartfile_test.go
@@ -39,6 +39,11 @@ func verifyChartfile(t *testing.T, f *chart.Metadata) {
 		t.Fatal("Failed verifyChartfile because f is nil")
 	}
 
+	// Api instead of API because it was generated via protobuf.
+	if f.ApiVersion != ApiVersionV1 {
+		t.Errorf("Expected API Version %q, got %q", ApiVersionV1, f.ApiVersion)
+	}
+
 	if f.Name != "frobnitz" {
 		t.Errorf("Expected frobnitz, got %s", f.Name)
 	}
diff --git a/pkg/chartutil/testdata/chartfiletest.yaml b/pkg/chartutil/testdata/chartfiletest.yaml
index b665c61be..7c071c27b 100644
--- a/pkg/chartutil/testdata/chartfiletest.yaml
+++ b/pkg/chartutil/testdata/chartfiletest.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 name: frobnitz
 description: This is a frobnitz.
 version: "1.2.3"
diff --git a/pkg/chartutil/testdata/frobnitz-1.2.3.tgz b/pkg/chartutil/testdata/frobnitz-1.2.3.tgz
index 49ec9ca8789a18c5aa67ef1a0bcc34a924f9f134..07b1113649c3fad6538ec8f284eacfd3f49524c5 100644
GIT binary patch
literal 4025
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

literal 4017
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
X5D*X$5D*X$ZVCSdSW0!Z0H6Q>y^a8J

diff --git a/pkg/chartutil/testdata/frobnitz/Chart.yaml b/pkg/chartutil/testdata/frobnitz/Chart.yaml
index b665c61be..7c071c27b 100644
--- a/pkg/chartutil/testdata/frobnitz/Chart.yaml
+++ b/pkg/chartutil/testdata/frobnitz/Chart.yaml
@@ -1,3 +1,4 @@
+apiVersion: v1
 name: frobnitz
 description: This is a frobnitz.
 version: "1.2.3"
diff --git a/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz b/pkg/chartutil/testdata/frobnitz/charts/mariner-4.3.2.tgz
index 4928e7e7af41bd33be43a458f4c9c3a7221fc595..88f255c238b9b53ea02fc4cc1266f94165c8bd41 100644
GIT binary patch
literal 1031
zcmV+i1o-<OiwFSQ?DJOu1MQc4Y!pQt$1j*vT_1mmq6v0Vv`Rzw_Pu%yR;*Eys*pfp
z2%2>6ZtiaDKCZKKh4a;zSOPYc*x1AbX#W7gM<5lo7!M*ugHj(Th!GH9F*ZdSqYaI*
zcy)H~k@C=DygM|^=PsGO+u5Dn{m$?EowXn~Y=nb>G9n0quByOqwOlJmO0LZVL`m00
zSym)n0)nVWq7VRTIWMX}$|VrfOR*p!;S`A^5I$!=+AS9QoAc!FquBmWu=4shB_Jkz
z8d_%Q$Dq$cQ<T5fUlesue@T&bT~QUPza}bj00^bOl(V_W^|zsgLLfg2xF~WX*hmt?
zu|r@1ScpsuM7)^+Vh#q)sW8GeBFN?15qAAf3NP~#mvFqZ)YNbn`gR!qkV5_YD!b*0
zf%El$Mb%VQ&}seCMq~b82@3jS)Rr<ZvXD*OQpdow{;x`B<iD<oD)awJ5JgF3N0A*d
zkQ?Fvs0X=3fMysH?6@xd4*-mkj%yGHr$Zn?NYV`jgJ>nRk|yFKjukxJMf^jG2~i{P
zA}_FL_-|5Bjvy)~q|si62slswpSu2&y!vPUUw#Vuw?i|9O78qQrt^PE)qMR`MOJ0S
z%YRJ~B<BB>U=Fw&#bC-LAU6a2g?@fg@Z21*G-0@aej!-4;QssS>0a+ap(uzM)ccEJ
z5I0C7751}$IF?y&LObqnaozwC6Jq2COKzTlBs8!Khy%jjw(HXK88-cyc2XD=t;icc
zmqs=IVJt&R&)NP@n+QrcW|U3<k}QQAOjrMcES~QFl1M+S{wu-M3ZJSxE47P*Gv5D;
z%l>+Q)y|XnqyK)4>FQsV<=p$fu4yve79>H_L{|Tmpt|d_z|j+94+bt7{o+{byI@w;
zx3h=qHeL7W6SdhpKe=a7RfaowWOGZaxOpJcZ#2)?IPv0$Hh#w~eXBp)d3;M-@0vY3
zM*lb#UA?e*-?LjoZ$96(<gvXgw_Q=UbkEBz?{&_5rlEGrx&tpgvhi}Gu6xaE$G_h`
z_+9v&&#hfg#@CO9R*kO}nzCI-p1!R^>&}ep2PPNawR1z`{&ar_&u#6zW^TvLWT=1J
z{O6jp>1@NnFMF=afaQnVuOFOv>tv>9{=mII-7t7!Mb+|&-F<Hlt=iB%`0>@+8}C1$
z47)?E->j9_p~hX{x1L{4RWIq=bmil}X7}GdeACR6!;QUxuO@d0KUQ0>uc)0p`l|Dk
z^Fz?>JmtWTCR-kgADw$+p!!fp&+msO7LBZ5Jn6s>8fX4IE7b7e_U^IXHnjJJk??5K
zzH7feJn*nJ@0EtBk8`&(J|lSPvbw;n7fMhDgTY`h7z_r3!C)}X!JozzB5VLC004S+
B3t0dF

literal 1025
zcmV+c1pfOUiwFQ!I_y^f1MQc4Y!pQt$1j*vT_1mmq6v0Vv`Rzw_Iaz@V8t3GsR{`g
zLeQjhcXM}J_i>$>E1a*!#1gQn#KtBjK>G&>J_4zr#dr`Q8kG7#L5!gIim@ru7$r2u
z;?>=~N6JGh@$S$tpSxuCZf9p^_xt;Of3p_EhK+DAP(}nn&{P%pZ7A0Yl9Frl08!F3
zQI-`+lYk&9k|+d#TFylkND&ILyA%sj8cxwj0^xJ^bGyZ2e=|=0K8o%C1S_w9Qvzbj
zr=ew*eh&9}gcRkk^%q6W(_d0#O;c3G)juREasUXWU&`5B<oestLORGt0T)Fif{i3K
z99swTz<gv{AmT*^h&dQEr@{!^h$6zZBTW2G3NP~#mvFpMYHGL(eLIZvq>%r<%A`DH
z;QakxRWyb9e<djBk5OC7z{o;2C8aI{Q~JLuouR)L5>@8^l^}|e$c`dAVj!Y(0MvtA
zMSx})QtS}o{s#a?NrxEJ!D$^NC`}SQ7(^?el{66_ajf9!F5+KOtPnK<FY*E_4gXCF
z%2DKs3Ek3Oh7#}({eSZQPxA7g`G5H-=-&>_6e_v%=a|a>B{k&huPU-CE1IXjB1p{t
zE5R&qH;TcONkJ|G{EdD-D0prbSe!5jaK8{Nop=9z_3l~kL7^y!8Lsyii$UC=iB#CH
z1=O+3dK21l|A_M@h?o!~zp&)u3?!j}37`%Ld&h*h;~BR5Gwq}>C|Z#>f36zU_?NL7
zQhLtzf47OCgkwhC0HDcIxWQEUFUaEQ{x6B{hvk1In4IC0m1n7Tad5`_e{tJi@9)}q
z8h`ZP&oNd0tFr9B|H*=^ijwN)zt^ATe<i5yx-9UZetb#blF`qPw!Q;qRDC;hxNhTh
zpFB~Uz4POH7F1=pgGV;Cw2GSsGW|yLv<>4gj)cbUxTSB^r#p{rZtGpWXUFItN29Ce
zH}89Pi~h#*U5g&uyJG7Vb&L1B-12VcoM#$pH?KYL(jyx#H|n}qzjo~VZG+#1-~P<n
z^<;eA34P_*8lfrMb>!*WIzru<G3~&_!n<~^Z`_~m@8G#Do!89nxS0<1Z=L&Gb2goA
zIQT`+RT;4CaQpRx<8PkK^voT&_oo{Mk1wxUHom*>t)Z3cy9YnII`sN`4=BTAsP&sQ
z@><lm3;fpe%c<%`eH*WQ{MYRM+lOzOesZ|6H}KWO4&ldYYy0xrnWL{dPdPsXN#`jC
zemK$cQ2fi;HwLN?b@cpxXneuQx`h)Ce7|w}&olIf54Lrm=xsxLUl<9GHtoCi>%#*N
vTXSA%nEW_*J7d#=moBXf+<Kt|WiS{F27|$1Fc=I5;~e}6XWATp04M+en+pww

diff --git a/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz b/pkg/chartutil/testdata/mariner/charts/albatross-0.1.0.tgz
index 2eb42120203818c178c1f9c4770914ff073650e8..5fb374a789567b5f1518f1b00c3d4b75c29f7e4a 100644
GIT binary patch
delta 16
Xcmcc3beoA?zMF&L_M6We*+UosH5Udu

delta 16
Xcmcc3beoA?zMF#~)auPf_7Fw@Egl5?

diff --git a/pkg/proto/hapi/chart/metadata.pb.go b/pkg/proto/hapi/chart/metadata.pb.go
index 8cd1ac1f1..220902ba7 100644
--- a/pkg/proto/hapi/chart/metadata.pb.go
+++ b/pkg/proto/hapi/chart/metadata.pb.go
@@ -69,6 +69,8 @@ type Metadata struct {
 	Engine string `protobuf:"bytes,8,opt,name=engine" json:"engine,omitempty"`
 	// The URL to an icon file.
 	Icon string `protobuf:"bytes,9,opt,name=icon" json:"icon,omitempty"`
+	// The API Version of this chart.
+	ApiVersion string `protobuf:"bytes,10,opt,name=apiVersion" json:"apiVersion,omitempty"`
 }
 
 func (m *Metadata) Reset()                    { *m = Metadata{} }
@@ -92,23 +94,23 @@ func init() {
 func init() { proto.RegisterFile("hapi/chart/metadata.proto", fileDescriptor2) }
 
 var fileDescriptor2 = []byte{
-	// 275 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x91, 0x4b, 0x4b, 0xc4, 0x30,
-	0x14, 0x85, 0x9d, 0x47, 0x5f, 0xb7, 0x9b, 0xe1, 0x22, 0x43, 0x74, 0x55, 0xba, 0x72, 0xd5, 0x01,
-	0x05, 0x71, 0x2d, 0x88, 0x0b, 0x9d, 0x8e, 0x0c, 0x8a, 0xe0, 0x2e, 0xb6, 0xc1, 0x06, 0x6d, 0x53,
-	0x92, 0xa8, 0xf8, 0x9f, 0xfc, 0x91, 0x26, 0xb7, 0xf3, 0x5a, 0xb8, 0x28, 0x9c, 0x73, 0xbe, 0xde,
-	0xdc, 0x9e, 0x06, 0x4e, 0x1a, 0xde, 0xcb, 0x45, 0xd5, 0x70, 0x6d, 0x17, 0xad, 0xb0, 0xbc, 0xe6,
-	0x96, 0x17, 0xbd, 0x56, 0x56, 0x21, 0x78, 0x54, 0x10, 0xca, 0x2f, 0x01, 0x96, 0x5c, 0x76, 0xd6,
-	0x3d, 0x42, 0x23, 0xc2, 0xb4, 0xe3, 0xad, 0x60, 0xa3, 0x6c, 0x74, 0x96, 0xac, 0x49, 0xe3, 0x31,
-	0x04, 0xa2, 0xe5, 0xf2, 0x83, 0x8d, 0x29, 0x1c, 0x4c, 0xfe, 0x3b, 0x86, 0x78, 0xb9, 0x39, 0xf6,
-	0xdf, 0x31, 0x97, 0x35, 0xca, 0x65, 0xc3, 0x14, 0x69, 0x64, 0x10, 0x19, 0xf5, 0xa9, 0x2b, 0x61,
-	0xd8, 0x24, 0x9b, 0xb8, 0x78, 0x6b, 0x3d, 0xf9, 0x12, 0xda, 0x48, 0xd5, 0xb1, 0x29, 0x0d, 0x6c,
-	0x2d, 0x66, 0x90, 0xd6, 0xc2, 0x54, 0x5a, 0xf6, 0xd6, 0xd3, 0x80, 0xe8, 0x61, 0x84, 0xa7, 0x10,
-	0xbf, 0x8b, 0x9f, 0x6f, 0xa5, 0x6b, 0xc3, 0x42, 0x3a, 0x76, 0xe7, 0xf1, 0x0a, 0xd2, 0x76, 0x57,
-	0xcf, 0xb0, 0xc8, 0xe1, 0xf4, 0x7c, 0x5e, 0xec, 0x7f, 0x40, 0xb1, 0x6f, 0xbf, 0x3e, 0x7c, 0x15,
-	0xe7, 0x10, 0x8a, 0xee, 0xcd, 0x69, 0x16, 0xd3, 0xca, 0x8d, 0xf3, 0xbd, 0x64, 0xe5, 0x3e, 0x24,
-	0x19, 0x7a, 0x79, 0x9d, 0x67, 0x10, 0xde, 0x0c, 0x34, 0x85, 0xe8, 0xa9, 0xbc, 0x2b, 0x57, 0xcf,
-	0xe5, 0xec, 0x08, 0x13, 0x08, 0x6e, 0x57, 0x8f, 0x0f, 0xf7, 0xb3, 0xd1, 0x75, 0xf4, 0x12, 0xd0,
-	0xba, 0xd7, 0x90, 0xae, 0xe0, 0xe2, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x72, 0xdf, 0x74, 0xb5, 0x9f,
-	0x01, 0x00, 0x00,
+	// 287 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0x51, 0x4b, 0x4b, 0xc4, 0x30,
+	0x10, 0x76, 0x1f, 0x6d, 0xb7, 0xd3, 0xcb, 0x32, 0xc8, 0x12, 0x3d, 0x48, 0xe9, 0xc9, 0x53, 0x17,
+	0x14, 0xc4, 0xb3, 0x20, 0x1e, 0x74, 0xbb, 0xb2, 0xf8, 0x00, 0x6f, 0xb1, 0x0d, 0x36, 0x68, 0x9b,
+	0x92, 0x44, 0xc5, 0xff, 0xe8, 0x8f, 0x32, 0x9d, 0x76, 0x77, 0x7b, 0xf0, 0x50, 0xf8, 0x1e, 0xfd,
+	0x26, 0xf3, 0x25, 0x70, 0x54, 0xf2, 0x46, 0x2e, 0xf3, 0x92, 0x6b, 0xbb, 0xac, 0x84, 0xe5, 0x05,
+	0xb7, 0x3c, 0x6d, 0xb4, 0xb2, 0x0a, 0xa1, 0xb5, 0x52, 0xb2, 0x92, 0x0b, 0x80, 0x15, 0x97, 0xb5,
+	0x75, 0x9f, 0xd0, 0x88, 0x30, 0xad, 0x79, 0x25, 0xd8, 0x28, 0x1e, 0x9d, 0x86, 0x1b, 0xc2, 0x78,
+	0x08, 0x9e, 0xa8, 0xb8, 0xfc, 0x60, 0x63, 0x12, 0x3b, 0x92, 0xfc, 0x8e, 0x61, 0xb6, 0xea, 0xc7,
+	0xfe, 0x1b, 0x73, 0x5a, 0xa9, 0x9c, 0xd6, 0xa5, 0x08, 0x23, 0x83, 0xc0, 0xa8, 0x4f, 0x9d, 0x0b,
+	0xc3, 0x26, 0xf1, 0xc4, 0xc9, 0x5b, 0xda, 0x3a, 0x5f, 0x42, 0x1b, 0xa9, 0x6a, 0x36, 0xa5, 0xc0,
+	0x96, 0x62, 0x0c, 0x51, 0x21, 0x4c, 0xae, 0x65, 0x63, 0x5b, 0xd7, 0x23, 0x77, 0x28, 0xe1, 0x31,
+	0xcc, 0xde, 0xc5, 0xcf, 0xb7, 0xd2, 0x85, 0x61, 0x3e, 0x8d, 0xdd, 0x71, 0xbc, 0x84, 0xa8, 0xda,
+	0xd5, 0x33, 0x2c, 0x70, 0x76, 0x74, 0xb6, 0x48, 0xf7, 0x17, 0x90, 0xee, 0xdb, 0x6f, 0x86, 0xbf,
+	0xe2, 0x02, 0x7c, 0x51, 0xbf, 0x39, 0xcc, 0x66, 0x74, 0x64, 0xcf, 0xda, 0x5e, 0x32, 0x77, 0x8b,
+	0x84, 0x5d, 0xaf, 0x16, 0xe3, 0x09, 0x80, 0x1b, 0xf8, 0xd4, 0x17, 0x00, 0x72, 0x06, 0x4a, 0x12,
+	0x83, 0x7f, 0xdd, 0xa5, 0x23, 0x08, 0x1e, 0xb3, 0xdb, 0x6c, 0xfd, 0x9c, 0xcd, 0x0f, 0x30, 0x04,
+	0xef, 0x66, 0xfd, 0x70, 0x7f, 0x37, 0x1f, 0x5d, 0x05, 0x2f, 0x1e, 0xad, 0xf3, 0xea, 0xd3, 0x13,
+	0x9d, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x65, 0x86, 0x8b, 0xda, 0xbf, 0x01, 0x00, 0x00,
 }