From 5a2174231bc0c98148b7a0d0fd1f8a36af52b682 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 6 Jun 2016 21:40:20 -0600 Subject: [PATCH] fix(helm): fix repo package to use chartutil --- pkg/repo/index.go | 4 ++-- pkg/repo/index_test.go | 9 ++++++--- pkg/repo/repo.go | 8 ++++---- .../testdata/repository/frobnitz-1.2.3.tgz | Bin 1185 -> 1165 bytes .../testdata/repository/sprocket-1.2.0.tgz | Bin 884 -> 847 bytes 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pkg/repo/index.go b/pkg/repo/index.go index f1467c633..1271688c0 100644 --- a/pkg/repo/index.go +++ b/pkg/repo/index.go @@ -7,7 +7,7 @@ import ( "gopkg.in/yaml.v2" - "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/proto/hapi/chart" ) var indexPath = "index.yaml" @@ -24,7 +24,7 @@ type ChartRef struct { Created string `yaml:"created,omitempty"` Removed bool `yaml:"removed,omitempty"` Checksum string `yaml:"checksum,omitempty"` - Chartfile chart.Chartfile `yaml:"chartfile"` + Chartfile *chart.Metadata `yaml:"chartfile"` } // DownloadIndexFile uses diff --git a/pkg/repo/index_test.go b/pkg/repo/index_test.go index e891c8690..168f4bfa1 100644 --- a/pkg/repo/index_test.go +++ b/pkg/repo/index_test.go @@ -29,7 +29,12 @@ func TestDownloadIndexFile(t *testing.T) { fmt.Fprintln(w, string(fileBytes)) })) - dirName, err := ioutil.TempDir("testdata", "tmp") + dirName, err := ioutil.TempDir("", "tmp") + if err != nil { + t.Fatal(err) + } + defer os.RemoveAll(dirName) + path := filepath.Join(dirName, testRepo+"-index.yaml") if err := DownloadIndexFile(testRepo, ts.URL, path); err != nil { t.Errorf("%#v", err) @@ -54,8 +59,6 @@ func TestDownloadIndexFile(t *testing.T) { t.Errorf("Expected 2 entries in index file but got %v", numEntries) } os.Remove(path) - os.Remove(dirName) - } func TestLoadIndexFile(t *testing.T) { diff --git a/pkg/repo/repo.go b/pkg/repo/repo.go index 290f069cc..3c6dc842e 100644 --- a/pkg/repo/repo.go +++ b/pkg/repo/repo.go @@ -13,7 +13,7 @@ import ( "gopkg.in/yaml.v2" - "k8s.io/helm/pkg/chart" + "k8s.io/helm/pkg/chartutil" ) // ChartRepository represents a chart repository @@ -108,12 +108,12 @@ func (r *ChartRepository) Index() error { } for _, path := range r.ChartPaths { - ch, err := chart.Load(path) + ch, err := chartutil.Load(path) if err != nil { return err } - chartfile := ch.Chartfile() + chartfile := ch.Metadata hash, err := generateChecksum(path) if err != nil { return err @@ -135,7 +135,7 @@ func (r *ChartRepository) Index() error { url, _ := url.Parse(r.URL) url.Path = filepath.Join(url.Path, key+".tgz") - entry := &ChartRef{Chartfile: *chartfile, Name: chartfile.Name, URL: url.String(), Created: created, Checksum: hash, Removed: false} + entry := &ChartRef{Chartfile: chartfile, Name: chartfile.Name, URL: url.String(), Created: created, Checksum: hash, Removed: false} r.IndexFile.Entries[key] = entry diff --git a/pkg/repo/testdata/repository/frobnitz-1.2.3.tgz b/pkg/repo/testdata/repository/frobnitz-1.2.3.tgz index 0fe27e994ac89f5de5af4ed0259a114c0b557f28..fc8cacec2a436a816d394e8efb2d82a34719ee86 100644 GIT binary patch literal 1165 zcmV;81akWyiwFQnKvq`(1MS_vZzDw%2k^NoC`OP&&`=HzqPffdwvAkIy5w|M90laK z<`5ct$MGt=JFDHZ5*WENSk8E~!9LH%ln_{?Zjh2oVjFvUwdTp;61hm5!jvM&xHWSS= zd`%N&VPsA(C6UH-OVb;ud~Q2x*6%MlPW^jKmKQ{S-2c|Cfy|9{B$L=G4)rR}LGMQ^ z2p09fKkk3G6}W-xder}I&+(XWR{0_px#a!dbw0d%PqeL|dhjY^{u`YKgYAb`fB2WN zB%*gCj#a94F5_t7F_OB073-di7oY3XV+XYNbWexMF7lqe7nwoXwR$?S_sg!zQ)N_P zQ|rXe_V?^uW!k1KCX_}F9~F_&`H@ZIH#OaA08hv7%HJe_i>@^Nt#@8wzUL07)y>A6 z;`P_=pZBW*00000fHgAN74{h|uhx&R)ypf#mH+?%00000aB<0yv9C55`-`Ib|Nr>@ z{~ucUjpApDpD4bk_?F^piZ3V*DL$gOLve%REsB?}jgIrj#(Dlm00000003|a4RoS9 zVqi?xv28W`=o6V_v8q0D&bEddi`lJqUu(N7b5`gw@2L(GLM1YaJ0jIx9Ui?qdxTV0 z2mgRhp;IMx;zCWIP<@VlZu8xN5_f2)*i|xN)HpR1Dlak1RGi@8mcO>OZnocEaiF zKb)55)%71O)PJnQ@%oP^FLxgN{`SMG*Z)TS2fzyh^&bEL0001&9_l{;00000003Tm zRsBb~!Pu`0>OX#@_>STmiZ3ZXuWLU(rnptter(jWAAi=z`33bK00000003~77S?wN zaoP%xWi=kvQRY^8EUxpIK4nRzN7ZOl>rt&usy(U)%j!KE!-9`38D|4&xz}CK51Nht zUH@^0AD>@d|KT`+=TE=?BWMc8ZTY^7`j2&(9S;12(Zgqpjre3#^660J(;>|3am}9{ z?tE@W@P#?V=OrCqlBc}RX1+A%`J%~!pLdt6)g=Gl-?_PcZ^uf))t}>}{P%o!l>dIy z3H&Pmo2?e|e=Rn}?Q!1nNxr9|&Ii#O{#D?7b5q$P#yr7|4QBQIu7qQTuIm zpkkdRDm9$n*0~5r8&oc$w6AZ7LMdTr4lp{~imQEMTGwS=t}Hx1ll(V|`chU!cPl@~ zDZl^infz}BPJr)!TZc*iAIP{=#hF|Ho;3fve*4(>|FxPeAM^h@Y>Jy=)b*ktRTI7* zUZ@q-Nf;Dzc9FB9oftln8|r@5W37wdfu%;L|xIrIN` z%`(|)rh=35pKbtW=YP*>`vLNQ9q0xu*5dJFYnZ%G=pwBz%h-qp-Pgro>TpOE literal 1185 zcmV;S1YY|eiwG0|32ul0|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PLN;ZzIJU$LFs26{8X$0u3#6G|*AeKtV-K4Fw$)B^?s{0Z2S+Z@f6zP6UoalJ7_NXm)oV z&#e8-GdH8`SKH5ZYPykm%uWx-37mGbNu}eoTjSF4f^j*9xnA3C1#aN9eCD{W7qpmY zp5i@C7#2q6bSwY1ox?A3Se_Fm@wcs81DPA^Kqj$O?CT}=;kb^|3W7QD_ow1dp(p>q z^&BQv@*`gI_;;Om?%oq^D=1H%XUu=8^I)*~@aorpFqTBUfr?|5YMskCn%hQFIasmo z$#{NW9~^1W-qAfBD!a&g_D*C5!>-lSiM>1QsytOj6*hS%cDB1?=PJ`ST`{3Fa&%Ti zM&}21J$~!qyYwFkfb-7K^fz96j`^NDnw!=eFN+snxPR7n1poj500013Att-RKBV$$ zb$+cXuN)}>0000000000aDI^?W1p@u_A6QW_y5EF|L=70BiVOk-;#Yr_66BzWFM35 zlRYB4Lw1Ag6|(JrqAA&NfxW}k#n{& zx>!tKwfkDzU752&5A&YtFdO!YVY{iADKTtl$KGS`B zpu`=j6x&KBjGR+Lrt+dgE};%-d%huxEZ4nVW$3V<>uy@Ab#~RkzRpAP+avEtryb#1 zp5?Pp6}>#l%;?hgASwj?lhp?wTWs9#q@8*Ck8FuSIJy4AX?b3y{|KP}SOrJ*A5Z_^ zdGOP#53gST4f+oNE)39r0000000405f&K#k000000002E_>}sO;TmH<%+Y^*L-r-v z=VYIdeN<^b-XptJX+PE~?Z+=wJKsb90RR9100000;53=5?-1go3Xeq^kFu4SDv$X( zkNP7ElpdwiSnE+9P1GLc$s)Z+VvY=EH!_sN&zp3_Atg}R=hV$Dx7vcDV%0-m+ z^$k%dB@E30MrRvwStn{;mvy0$m~1+)N*wRrNxdXv^z;weqieL0McXwbSY4ja#&VIscJ)cLXZNE)pp|do>SG% zl2mzzQk&%B;GDay78|AQGUc{YrWMSxUAyHt+-bXvTaIIK!de$NrkXs{B88zuLhEj> zy@5<;>VaCXx1gQsKI(K$$j0+;JRFEr8$%I=Ms}Pmvk!P4ZO556|IP9ITW!a(ZOexF zcP-Z?j4yK#^SI*k-{r5KK4Y%o6os3Fgm*fx@9!OK?))Ys3gBskp^TMEMHtL&BdQdP zPY4pO5Av?zsmMIcyE2WXmYE6Kk(nI!%~U4Jgc|J&Ek>m* z&?+68wf#=acj?avLDrsJ_jd1HCr#TLh1KoGU3UA{%gY`Wf*=TjAP9mWD?}$70dF~|^LX8 zqsnZ$*6b-|c121um8YKU5XNLAg0RD4)m8rR!E_6;C>nnOU8q>HM`0!>UnsV*&s5(Z zNcIFSvVAEc0?M%lk!jWe6<_)A>wK4ux41*Lm#S_Y=(prh4v$spgWeHn2P*C`%dibj ze3^M^kmym>{vgO0d_>(wgOnZDZLVVf{NnQ;oI6mc&VM+z3#g?`9JXb7H^mS?{GZ-w-W04KN4XsvkO@O&Wrz6(>-(kv)ytr{;z~>w#Uk; zXT2bl%u}N{ofVm0(9cs*tOW)wBXFY#!R$HY8#I&NXqkXWTwN^cSr8ZNMR~1pr9$ai zG9&(vbB0cq6AI4re|Q0$j{i1yn;iXr6~OyfsMyJgF>>B_%$Gfphnh9uwJ!7E$` Z2!bF8f*=TjAPBPd`~~*!Et~*Q004wYsG literal 884 zcmV-)1B?70iwG0|32ul0|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PLGhZreB%fSCZZAu!2cW)8q{mVqTomhFLo022%bGqY$nP1{A& z1ufCGU`Z52Dyf^My+D`UblH9PUH1mPKyT1RdxJjtM~;&?DNx&K;P)X9lt|`L^7}Cb z>*+L8eqS20L^$_&vtEam^JZhza@QNRBZ%WRordRlPBHE{yx|g7U*<(k$h8p}T*~+A zncT>vy(LWSZ(D!&L}sjkh$BlMr;A*JJDfK>Z;t(IXYKF0jtlc^&6-2lNI z`2P-TT3&JT3n9_(t%rO2hnu^f35i3$C!Z6Rb%2BAUO}^K%OAuJTnN zZJqgcH#EJxZTTv;`*~Yti8NB%Fgv!>e%H=qs%+>nfiPltrbDB$fnECV)O{EJ86n86 zCpVqypFfkD>kM<#PUR2w+pqU;`l=8FK@bE%5CmBvCfy(}pxqpwZ;#uJb1i}(2!bF8 zf*=TjAh#D05b|n^kWV1R@BfqM|1WUx0pvZ%JCL^^Z$MsyyaYJ{IRyC^WEW%yAP9mW2!bHU`q5LdY_Xm(Y0I|d?Aa3$r;#k)I49L%r=IP#J4)GYkrA!( z%$F^~n2bdjwOFFsDj57Vt057E@_Vp^N+kOy(sKF_#cS-BPCw{L_8$zg11VwxlM@3X zGu?tIfePU1yvoWFohs{Os-1-9De23>vC0CNcLcLTm9&^+xfUmZ)P5GGX4rMm3pIm3 zQR=9W(ZZ$9RlGlcb^QnD9vn~Ve_Y2a>OXkBf%PA&VAdVzb?!rF-Hn!hNT<$8r!Gs! zUQExrHoesQ>D*|cmjxHSA{yy9V(FD}P3NTpdeb&pC1v~@3HL9I)Qex^o9q8-b>27= z|5*RGd@kC*JhDu>nD2t?@;`h5oU?!3E9yTn|1TfNzmZ}mC)Qm^vFsTOWJlzYVHHU0 zQBXNOU8`)kew6WlB%)ku%c#X~0I!RG=R*9~YHl6le--SoeKs;Z>x7YHz8db+baBuL zyLl#xy`V*Du?1s$tWs>kSdlC$ls?kZFNPnNqr)r`CdHO