From 543a784d572a50b1af7996cef08028e3897d6df8 Mon Sep 17 00:00:00 2001 From: Ilan Zerath Date: Tue, 9 Jun 2020 21:42:08 +0200 Subject: [PATCH] feat(get-dependencies): Feedback Github (#8081) Signed-off-by: Ilan Zerath --- cmd/helm/get_dependencies.go | 6 ++---- cmd/helm/get_dependencies_test.go | 4 ++-- cmd/helm/testdata/output/get-dependencies-empty.txt | 2 +- cmd/helm/testdata/output/get-dependencies.json | 2 +- cmd/helm/testdata/output/get-dependencies.txt | 6 +++--- cmd/helm/testdata/output/get-dependencies.yaml | 6 ++---- 6 files changed, 11 insertions(+), 15 deletions(-) diff --git a/cmd/helm/get_dependencies.go b/cmd/helm/get_dependencies.go index a990348ee..80cffbd1a 100644 --- a/cmd/helm/get_dependencies.go +++ b/cmd/helm/get_dependencies.go @@ -37,7 +37,6 @@ type dependencyElement struct { Name string `json:"name"` Version string `json:"version,omitempty"` Repository string `json:"repository"` - Enabled bool `json:"enabled,omitempty"` } type dependencyListWriter struct { @@ -99,7 +98,6 @@ func newDependenciesListWriter(dependencies []*chart.Dependency) *dependencyList Name: d.Name, Version: d.Version, Repository: d.Repository, - Enabled: d.Enabled, } elements = append(elements, element) @@ -111,10 +109,10 @@ func newDependenciesListWriter(dependencies []*chart.Dependency) *dependencyList func (d dependencyListWriter) WriteTable(out io.Writer) error { table := uitable.New() - table.AddRow("NAME", "VERSION", "REPOSITORY", "ENABLED") + table.AddRow("NAME", "VERSION", "REPOSITORY") for _, r := range d.dependencies { - table.AddRow(r.Name, r.Version, r.Repository, r.Enabled) + table.AddRow(r.Name, r.Version, r.Repository) } return output.EncodeTable(out, table) diff --git a/cmd/helm/get_dependencies_test.go b/cmd/helm/get_dependencies_test.go index 6804269ce..1d144a6d5 100644 --- a/cmd/helm/get_dependencies_test.go +++ b/cmd/helm/get_dependencies_test.go @@ -36,8 +36,8 @@ func TestGetDependencies(t *testing.T) { Version: "4.7.7-beta.1", AppVersion: "1.0", Dependencies: []*chart.Dependency{ - {Name: "fuego", Version: "7.7.0", Repository: "https://prims47-fuego.com", Enabled: true}, - {Name: "pepito", Version: "4.2.7'", Repository: "https://pepito.com", Enabled: true}, + {Name: "fuego", Version: "7.7.0", Repository: "https://prims47-fuego.com"}, + {Name: "pepito", Version: "4.2.7'", Repository: "https://pepito.com"}, }, }, Templates: []*chart.File{ diff --git a/cmd/helm/testdata/output/get-dependencies-empty.txt b/cmd/helm/testdata/output/get-dependencies-empty.txt index fd93bd395..e5afb56b8 100644 --- a/cmd/helm/testdata/output/get-dependencies-empty.txt +++ b/cmd/helm/testdata/output/get-dependencies-empty.txt @@ -1 +1 @@ -NAME VERSION REPOSITORY ENABLED +NAME VERSION REPOSITORY diff --git a/cmd/helm/testdata/output/get-dependencies.json b/cmd/helm/testdata/output/get-dependencies.json index c26bf9f97..9b2ca8354 100644 --- a/cmd/helm/testdata/output/get-dependencies.json +++ b/cmd/helm/testdata/output/get-dependencies.json @@ -1 +1 @@ -[{"name":"fuego","version":"7.7.0","repository":"https://prims47-fuego.com","enabled":true},{"name":"pepito","version":"4.2.7'","repository":"https://pepito.com","enabled":true}] +[{"name":"fuego","version":"7.7.0","repository":"https://prims47-fuego.com"},{"name":"pepito","version":"4.2.7'","repository":"https://pepito.com"}] diff --git a/cmd/helm/testdata/output/get-dependencies.txt b/cmd/helm/testdata/output/get-dependencies.txt index 5df64b0e3..b7b56aa45 100644 --- a/cmd/helm/testdata/output/get-dependencies.txt +++ b/cmd/helm/testdata/output/get-dependencies.txt @@ -1,3 +1,3 @@ -NAME VERSION REPOSITORY ENABLED -fuego 7.7.0 https://prims47-fuego.com true -pepito 4.2.7' https://pepito.com true +NAME VERSION REPOSITORY +fuego 7.7.0 https://prims47-fuego.com +pepito 4.2.7' https://pepito.com diff --git a/cmd/helm/testdata/output/get-dependencies.yaml b/cmd/helm/testdata/output/get-dependencies.yaml index e2dc0685e..464d2ac9b 100644 --- a/cmd/helm/testdata/output/get-dependencies.yaml +++ b/cmd/helm/testdata/output/get-dependencies.yaml @@ -1,8 +1,6 @@ -- enabled: true - name: fuego +- name: fuego repository: https://prims47-fuego.com version: 7.7.0 -- enabled: true - name: pepito +- name: pepito repository: https://pepito.com version: 4.2.7'