From c50d613768f0ae3fd2510c95f7230c4be8f3e709 Mon Sep 17 00:00:00 2001 From: mikeykhalil Date: Thu, 1 Oct 2020 14:39:07 -0700 Subject: [PATCH] vendor: update metahelm --- .circleci/config.yml | 1 - Gopkg.lock | 6 +++--- Gopkg.toml | 2 +- .../metahelm/.circleci/config.yml | 1 + .../metahelm/pkg/metahelm/error.go | 21 +++++++++++-------- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d4e7f1cd0..fb205bde6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,6 @@ jobs: # - run: curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh # - run: dep status # - run: go get -v - - run: go vet - run: go build test: docker: diff --git a/Gopkg.lock b/Gopkg.lock index 068a0a4a2..b22b5fc26 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -414,7 +414,7 @@ revision = "fc7a351a8b58b63954c6651077ab65c49eae5c22" [[projects]] - digest = "1:b2b28b08d8873edbf9fe8e062c02c5ef1cee973f449321f10c6ca858d77ca0c1" + digest = "1:4ea07ddc6d4a33df73c88c1f1e33e58120d6e9864040c14bffe0f8ae137f82d4" name = "github.com/dollarshaveclub/metahelm" packages = [ "pkg/dag", @@ -422,8 +422,8 @@ "pkg/metahelm", ] pruneopts = "" - revision = "ef81a1501309f13f51a11ca49410d93e5f7f67cd" - version = "0.6.1" + revision = "a92ec8266953c7f8e6460594b7f3a40b02a6bf34" + version = "0.6.2" [[projects]] digest = "1:1ac97a557c4c5f6b95e634b51709f9530e661570d94bd6c5f0bbce4c7db9b52a" diff --git a/Gopkg.toml b/Gopkg.toml index 7622bb94d..88feac75f 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -31,7 +31,7 @@ [[constraint]] name = "github.com/dollarshaveclub/metahelm" - version = "=0.6.1" + version = "=0.6.2" [[constraint]] name = "github.com/golang/mock" diff --git a/vendor/github.com/dollarshaveclub/metahelm/.circleci/config.yml b/vendor/github.com/dollarshaveclub/metahelm/.circleci/config.yml index d29d837d3..f6eead03f 100644 --- a/vendor/github.com/dollarshaveclub/metahelm/.circleci/config.yml +++ b/vendor/github.com/dollarshaveclub/metahelm/.circleci/config.yml @@ -12,3 +12,4 @@ jobs: - checkout - run: go get -v -t -d ./... - run: go test -v ./... + - run: go vet ./... diff --git a/vendor/github.com/dollarshaveclub/metahelm/pkg/metahelm/error.go b/vendor/github.com/dollarshaveclub/metahelm/pkg/metahelm/error.go index bceeb226c..c43372d40 100644 --- a/vendor/github.com/dollarshaveclub/metahelm/pkg/metahelm/error.go +++ b/vendor/github.com/dollarshaveclub/metahelm/pkg/metahelm/error.go @@ -16,26 +16,29 @@ import ( // FailedPod models a single failed pod with metadata and logs type FailedPod struct { - Name, Phase, Message, Reason string - Conditions []corev1.PodCondition - ContainerStatuses []corev1.ContainerStatus + Name string `json:"name"` + Phase string `json:"phase"` + Message string `json:"message"` + Reason string `json:"reason"` + Conditions []corev1.PodCondition `json:"conditions"` + ContainerStatuses []corev1.ContainerStatus `json:"container_statuses"` // Logs is a map of container name to raw log (stdout/stderr) output - Logs map[string][]byte + Logs map[string][]byte `json:"logs"` } // ChartError is a chart install/upgrade error due to failing Kubernetes resources. It contains all Deployment, Job or DaemonSet-related pods that appear to // be in a failed state, including up to MaxPodLogLines of log data for each. type ChartError struct { // HelmError is the original error returned by Helm - HelmError error + HelmError error `json:"helm_error"` // Level is the chart level (zero-indexed) at which the error occurred - Level uint + Level uint `json:"level"` // FailedDaemonSets is map of DaemonSet name to failed pods - FailedDaemonSets map[string][]FailedPod + FailedDaemonSets map[string][]FailedPod `json:"failed_daemon_sets"` // FailedDeployments is map of Deployment name to failed pods - FailedDeployments map[string][]FailedPod + FailedDeployments map[string][]FailedPod `json:"failed_deployments"` // FailedJobs is map of Job name to failed pods - FailedJobs map[string][]FailedPod + FailedJobs map[string][]FailedPod `json:"failed_jobs"` } // NewChartError returns an initialized empty ChartError