From 04514a544822643474e965b0d50cb7a5a675faf4 Mon Sep 17 00:00:00 2001 From: Martin Hickey Date: Mon, 3 Feb 2020 10:40:22 +0000 Subject: [PATCH] Update after review Comments: - https://github.com/helm/helm/pull/7261#discussion_r373827088 - https://github.com/helm/helm/pull/7261#discussion_r373827250 Signed-off-by: Martin Hickey --- cmd/helm/dependency_build_test.go | 6 ------ .../issue-7233/charts/alpine-0.1.0.tgz | Bin 1167 -> 1167 bytes pkg/downloader/manager.go | 4 ++-- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/cmd/helm/dependency_build_test.go b/cmd/helm/dependency_build_test.go index 0e76381f4..eeca12fa6 100644 --- a/cmd/helm/dependency_build_test.go +++ b/cmd/helm/dependency_build_test.go @@ -112,10 +112,4 @@ func TestDependencyBuildCmdWithHelmV2Hash(t *testing.T) { t.Logf("Output: %s", out) t.Fatal(err) } - - // Make sure the child chart file got downloaded. - expect := filepath.Join(chartName, "charts/alpine-0.1.0.tgz") - if _, err := os.Stat(expect); err != nil { - t.Fatal(err) - } } diff --git a/cmd/helm/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz b/cmd/helm/testdata/testcharts/issue-7233/charts/alpine-0.1.0.tgz index 925018e84f0365b92d64f347d355248a5839f42e..a64d9ed46a25dec2446050321772fc2d1d35417a 100644 GIT binary patch delta 1110 zcmV-c1gZOv36BYoNPn{Yjrg{B6W|Tn2En!nP!vTymc|yb6seMwwW{O)UXYZ$Yi+Yz zps}|fnu{Qcd^j_lXJ#nm1rs#q{KR@q9XU&p3{|&v-nWU5zI5(QL7p zET)UAcr>2Q7grFUL6=8TYJ=)3{>yuHjr)fP7VHx#&7@euZhsVDQ5;{xN%STRQqqZH zg>ge~so=5(gf(iGz_kk=_?C(C4hoqDnapVknK6Z44u=`>Jkpta1_JFTA8vt`rAkOI zgTZm~mYJ+vM~Tece7|Vd>JmqzC=OoQS^q+5_`gG5l0H)cc#i+^IPUU)F`D%Jzl3~n zw9M;4!_1e~r+=5rO2dCcdBM?;9{PbnA=9sx4W8lucrqP#_&=M@dj4NTI`#jSiF64c zWg6sUFhzsQ0KnJoaKDdkh!bjxY}z;+2K#;V$yW|P5C#Ao*Tl752Ji}g$Ou9#is-gn zlM-Y|M@$ZL6u6~yu&zVD0GNhSQwm0cQJCC9m9ZoPBY!1tpiCVwON=7?$y@C_E23=LGI2ognTtn;)p*{|w4ImL%tdUHEkOnrg6zOX_-~jD*_Bd18V98ChqXXOT+rjVy?MQ_Xod6#W785~pw#^K$ zK^BJP>^DlGIfW)x99k}IR2)MNIp|s#ymRh3!G+Jz+1MT1$(-dMY1cTpqhtVfTZ2rH za({VZ&?J}&nIYv)isiVqDaTi%8X$AmvI;X@3{GWY$m=R+$5LrKtHAuyPm#tNRvo1u0XM z7^&(uQ`oe&BUQIbT3y;I2Ng3JV35etev%to;4mjcO1Iz-?zb!0Fi!WtkCLr+`P`<- zRi_zVL91jG1V73W5)|NSBj;cqI>MXo&21+{!=uG7ed_np@SpCC!e7qx7vS0Z|4(Gn z;s10r9{2pegc#Ds)?oi1z=grUhr!<{NP9V(H2k;C;JN7kC-~pJ|4$avxaa>RetaTm#_kyJ4U2B_c zfyUl`XfA>%^5M*Io|&Oglw8vAe>rNK?6445UtbtwY(Aa(Cu6MpWaHWFYBZUTW^6PX zvDp}|$I@xcS%a#`I$sj?_n1uY=Awls_3FegzYCil-sqWcuWEi$UoDVaqy zI8NShn^&tORfV4)7HwNySTagj^xV$+7fQqbEsBcFnG(QL{AXj<<^O!ndj4NR-g#OU zyFtUu=hml}%YRD4e@jIv(2^O3fkCOVua*s-;Qx3s9e4OYn~r<_Uqm|f|CY;a0q<27 z6=X3(i;D;#)b4n{Pd<V(;Tc)qJM$PeDgsWAZ+-SB&5D+g}1g@ zysiYSl?KcTE)CSVf*PfDkcJ5A9Bl)ogBb=8O4OF8l|b$Ha!{H~sifg6K@KnRi@s#T z0v@>Ld(vB;5`2PRD`g1|hcCN=OJh-{6ho@ymZa;npuk%)z%3A(o%abRz*g@D&?-P7 zK&`>%1b^QgQJn#y!2+A3g_<-$stK)gp7AD!Rb7XC&eT@N6GPpRcddN9^w`4f_mG5Z z#?7(GeCQl*9$Sr7#%(xfs0?lz1>45be+YpYknh7Xyf@o~zyt_gjyK{YY$H=r>LRw$ z!{n+qkgMA1P#NcW!;4Z-KuE%@nhOC!soM~AP=BH^lnuBHvpigiLQv)o#G)hW~VDHU4s@zW`6(|4%2A z4*#cYe%D< cFzD&uOE10j@?VhO0{{U3|K`Na;{YH40C8q2mH+?% diff --git a/pkg/downloader/manager.go b/pkg/downloader/manager.go index b8b67790c..cb139f824 100644 --- a/pkg/downloader/manager.go +++ b/pkg/downloader/manager.go @@ -93,10 +93,10 @@ func (m *Manager) Build() error { if c.Metadata.APIVersion == chart.APIVersionV1 { log.Println("warning: a valid Helm v3 hash was not found. Checking against Helm v2 hash...") if sum, err := resolver.HashV2Req(req); err != nil || sum != lock.Digest { - return errors.New("the lock file is out of sync with the dependencies file. Please update the dependencies") + return errors.New("the lock file (requirements.lock) is out of sync with the dependencies file (requirements.yaml). Please update the dependencies") } } else { - return errors.New("the lock file is out of sync with the dependencies file. Please update the dependencies") + return errors.New("the lock file (Chart.lock) is out of sync with the dependencies file (Chart.yaml). Please update the dependencies") } }