From 288b521d5eda8a3bde7fef81a462bf7b22d2d873 Mon Sep 17 00:00:00 2001
From: Matt Butcher <matt.butcher@microsoft.com>
Date: Wed, 1 Apr 2020 13:32:02 -0600
Subject: [PATCH] fix: fixes for Go 1.14 (#7848)
Signed-off-by: Matt Butcher <matt.butcher@microsoft.com>
(cherry picked from commit 5f6269d00852c471b6f951e501d017a7eb2f95d6)
---
pkg/repo/chartrepo_test.go | 2 +-
scripts/validate-go.sh | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/pkg/repo/chartrepo_test.go b/pkg/repo/chartrepo_test.go
index ed09b5c6d..7286a4d9e 100644
--- a/pkg/repo/chartrepo_test.go
+++ b/pkg/repo/chartrepo_test.go
@@ -243,7 +243,7 @@ func TestErrorFindChartInRepoURL(t *testing.T) {
if err == nil {
t.Errorf("Expected error for bad chart URL, but did not get any errors")
}
- if err != nil && !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`) {
+ if err != nil && !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)
}
diff --git a/scripts/validate-go.sh b/scripts/validate-go.sh
index 328ce40f9..8c993060d 100755
--- a/scripts/validate-go.sh
+++ b/scripts/validate-go.sh
@@ -36,6 +36,7 @@ gometalinter.v1 \
--tests \
--vendor \
--deadline 60s \
+ --skip proto \
./... || exit_code=1
echo
--
GitLab