From 8fef13fa241a73b4ea95014d76af4701652fff39 Mon Sep 17 00:00:00 2001 From: Matt Butcher Date: Mon, 30 Mar 2020 15:43:03 -0600 Subject: [PATCH] changed strategy based on conversation with Adam Signed-off-by: Matt Butcher --- pkg/getter/httpgetter.go | 6 +----- pkg/repo/chartrepo_test.go | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/getter/httpgetter.go b/pkg/getter/httpgetter.go index 3b4913780..695a87743 100644 --- a/pkg/getter/httpgetter.go +++ b/pkg/getter/httpgetter.go @@ -18,7 +18,6 @@ package getter import ( "bytes" "crypto/tls" - "fmt" "io" "net/http" @@ -68,10 +67,7 @@ func (g *HTTPGetter) get(href string) (*bytes.Buffer, error) { resp, err := client.Do(req) if err != nil { - // In Go 1.14, the error returned from client.Do changed. - // This is for backward compatibility, so that tests will pass - // for Go 1.13 and before as well as 1.14 and beyond. - return buf, fmt.Errorf("Get %s: %s", href, err) + return buf, err } if resp.StatusCode != 200 { return buf, errors.Errorf("failed to fetch %s : %s", href, resp.Status) diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go index c6b227acf..f50d6a2b6 100644 --- a/pkg/repo/chartrepo_test.go +++ b/pkg/repo/chartrepo_test.go @@ -308,7 +308,7 @@ func TestErrorFindChartInRepoURL(t *testing.T) { if _, err := FindChartInRepoURL("http://someserver/something", "nginx", "", "", "", "", g); err == nil { t.Errorf("Expected error for bad chart URL, but did not get any errors") - } else if !strings.Contains(err.Error(), `looks like "http://someserver/something" is not a valid chart repository or cannot be reached: Get http://someserver/something/index.yaml`) { + } else if !strings.Contains(err.Error(), `looks like "http://someserver/something" is not a valid chart repository or cannot be reached`) { t.Errorf("Expected error for bad chart URL, but got a different error (%v)", err) }