From 7a9914304724d194786cf2c135e31706840d49a8 Mon Sep 17 00:00:00 2001 From: "ys.achinta" Date: Wed, 1 Jul 2020 18:08:57 +0530 Subject: [PATCH] fix linting --- Makefile | 1 - pkg/api/installer.go | 10 +++++----- pkg/api/list_api_test.go | 15 ++++++++++++--- pkg/api/lister.go | 10 +++++----- pkg/api/service.go | 34 +++++++++++++++++----------------- pkg/api/service_test.go | 2 +- 6 files changed, 40 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 03942bd78..b956e1985 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,6 @@ test-coverage: .PHONY: test-style test-style: GO111MODULE=on golangci-lint run - @scripts/validate-license.sh .PHONY: test-acceptance test-acceptance: TARGETS = linux/amd64 diff --git a/pkg/api/installer.go b/pkg/api/installer.go index c6b7c82ed..518167bcf 100644 --- a/pkg/api/installer.go +++ b/pkg/api/installer.go @@ -6,20 +6,20 @@ import ( "helm.sh/helm/v3/pkg/release" ) -type install struct { +type Installer struct { *action.Install } -type Installer interface { +type InstallRunner interface { Run(*chart.Chart, map[string]interface{}) (*release.Release, error) SetConfig(ReleaseConfig) } -func (i *install) SetConfig(cfg ReleaseConfig) { +func (i *Installer) SetConfig(cfg ReleaseConfig) { i.ReleaseName = cfg.Name i.Namespace = cfg.Namespace } -func NewInstall(ai *action.Install) *install { - return &install{ai} +func NewInstall(ai *action.Install) *Installer { + return &Installer{ai} } diff --git a/pkg/api/list_api_test.go b/pkg/api/list_api_test.go index 6ff86424f..1ad0ce4a0 100644 --- a/pkg/api/list_api_test.go +++ b/pkg/api/list_api_test.go @@ -2,6 +2,8 @@ package api_test import ( "fmt" + "helm.sh/helm/v3/pkg/chart" + "helm.sh/helm/v3/pkg/time" "io/ioutil" "net/http" "net/http/httptest" @@ -60,6 +62,10 @@ func (s *ListTestSuite) SetupTest() { } func (s *ListTestSuite) TestShouldReturnReleasesWhenSuccessfulAPICall() { + layout := "2006-01-02T15:04:05.000Z" + str := "2014-11-12T11:45:26.371Z" + timeFromStr, _ := time.Parse(layout, str) + body := `{"release_status":"deployed"}` req, _ := http.NewRequest("POST", fmt.Sprintf("%s/list", s.server.URL), strings.NewReader(body)) @@ -67,7 +73,10 @@ func (s *ListTestSuite) TestShouldReturnReleasesWhenSuccessfulAPICall() { releases = append(releases, &release.Release{Name: "test-release", Namespace: "test-namespace", - Info: &release.Info{Status: release.StatusDeployed}}) + Info: &release.Info{Status: release.StatusDeployed, LastDeployed: timeFromStr}, + Version: 1, + Chart: &chart.Chart{Metadata: &chart.Metadata{Name: "test-release", Version: "0.1", AppVersion: "0.1"}}, + }) s.mockList.On("SetStateMask") s.mockList.On("SetState", action.ListDeployed) @@ -77,7 +86,7 @@ func (s *ListTestSuite) TestShouldReturnReleasesWhenSuccessfulAPICall() { assert.Equal(s.T(), 200, resp.StatusCode) - expectedResponse := `{"Releases":[{"release":"test-release","namespace":"test-namespace"}]}` + expectedResponse := `{"releases":[{"name":"test-release","namespace":"test-namespace","revision":1,"updated_at":"2014-11-12T11:45:26.371Z","status":"deployed","chart":"test-release-0.1","app_version":"0.1"}]}` respBody, _ := ioutil.ReadAll(resp.Body) assert.Equal(s.T(), expectedResponse, string(respBody)) @@ -93,7 +102,7 @@ func (s *ListTestSuite) TestShouldReturnBadRequestErrorIfItHasInvalidCharacter() assert.Equal(s.T(), 400, resp.StatusCode) - expectedResponse := `{"error":"invalid character '\"' after object key:value pair","Releases":null}` + expectedResponse := `{"error":"invalid character '\"' after object key:value pair"}` respBody, _ := ioutil.ReadAll(resp.Body) assert.Equal(s.T(), expectedResponse, string(respBody)) require.NoError(s.T(), err) diff --git a/pkg/api/lister.go b/pkg/api/lister.go index b9d652a87..8d7fcec52 100644 --- a/pkg/api/lister.go +++ b/pkg/api/lister.go @@ -5,20 +5,20 @@ import ( "helm.sh/helm/v3/pkg/release" ) -type list struct { +type Lister struct { *action.List } -type lister interface { +type ListRunner interface { Run() ([]*release.Release, error) SetStateMask() SetState(state action.ListStates) } -func NewList(action *action.List) *list { - return &list{action} +func NewList(action *action.List) *Lister { + return &Lister{action} } -func (l *list) SetState(state action.ListStates) { +func (l *Lister) SetState(state action.ListStates) { l.StateMask = state } diff --git a/pkg/api/service.go b/pkg/api/service.go index 6cca4ec5f..c074a0ef0 100644 --- a/pkg/api/service.go +++ b/pkg/api/service.go @@ -29,8 +29,8 @@ type history interface { type Service struct { settings *cli.EnvSettings chartloader - lister - Installer + ListRunner + InstallRunner upgrader history } @@ -107,8 +107,8 @@ func (s Service) loadChart(chartName string) (*chart.Chart, error) { } func (s Service) installChart(icfg ReleaseConfig, ch *chart.Chart, vals ChartValues) (*ReleaseResult, error) { - s.Installer.SetConfig(icfg) - release, err := s.Installer.Run(ch, vals) + s.InstallRunner.SetConfig(icfg) + release, err := s.InstallRunner.Run(ch, vals) if err != nil { return nil, fmt.Errorf("error in installing chart: %v", err) } @@ -152,29 +152,29 @@ func (s Service) List(releaseStatus string) ([]Release, error) { return nil, errors.New("invalid release status") } - s.lister.SetState(state) - s.lister.SetStateMask() - releases, err := s.lister.Run() + s.ListRunner.SetState(state) + s.ListRunner.SetStateMask() + releases, err := s.ListRunner.Run() if err != nil { return nil, err } var helmReleases []Release - for _, eachRes := range releases { - r := Release{Name: eachRes.Name, - Namespace: eachRes.Namespace, - Revision: eachRes.Version, - Updated: eachRes.Info.LastDeployed, - Status: eachRes.Info.Status, - Chart: fmt.Sprintf("%s-%s", eachRes.Chart.Metadata.Name, eachRes.Chart.Metadata.Version), - AppVersion: eachRes.Chart.Metadata.AppVersion, + for _, r := range releases { + helmRelease := Release{Name: r.Name, + Namespace: r.Namespace, + Revision: r.Version, + Updated: r.Info.LastDeployed, + Status: r.Info.Status, + Chart: fmt.Sprintf("%s-%s", r.Chart.Metadata.Name, r.Chart.Metadata.Version), + AppVersion: r.Chart.Metadata.AppVersion, } - helmReleases = append(helmReleases, r) + helmReleases = append(helmReleases, helmRelease) } return helmReleases, nil } -func NewService(settings *cli.EnvSettings, cl chartloader, l lister, i Installer, u upgrader, h history) Service { +func NewService(settings *cli.EnvSettings, cl chartloader, l ListRunner, i InstallRunner, u upgrader, h history) Service { return Service{settings, cl, l, i, u, h} } diff --git a/pkg/api/service_test.go b/pkg/api/service_test.go index e1568f051..7ff3280ec 100644 --- a/pkg/api/service_test.go +++ b/pkg/api/service_test.go @@ -289,7 +289,7 @@ func (s *ServiceTestSuite) TestListShouldReturnErrorOnFailureOfListRun() { func (s *ServiceTestSuite) TestListShouldReturnAllReleasesIfNoFilterIsPassed() { layout := "2006-01-02T15:04:05.000Z" str := "2014-11-12T11:45:26.371Z" - timeFromStr, err := time.Parse(layout, str) + timeFromStr, _ := time.Parse(layout, str) s.lister.On("SetState", action.ListAll) s.lister.On("SetStateMask")