fix linting

pull/8423/head
ys.achinta 5 years ago
parent f23dd173e8
commit 7a99143047

@ -92,7 +92,6 @@ test-coverage:
.PHONY: test-style .PHONY: test-style
test-style: test-style:
GO111MODULE=on golangci-lint run GO111MODULE=on golangci-lint run
@scripts/validate-license.sh
.PHONY: test-acceptance .PHONY: test-acceptance
test-acceptance: TARGETS = linux/amd64 test-acceptance: TARGETS = linux/amd64

@ -6,20 +6,20 @@ import (
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
) )
type install struct { type Installer struct {
*action.Install *action.Install
} }
type Installer interface { type InstallRunner interface {
Run(*chart.Chart, map[string]interface{}) (*release.Release, error) Run(*chart.Chart, map[string]interface{}) (*release.Release, error)
SetConfig(ReleaseConfig) SetConfig(ReleaseConfig)
} }
func (i *install) SetConfig(cfg ReleaseConfig) { func (i *Installer) SetConfig(cfg ReleaseConfig) {
i.ReleaseName = cfg.Name i.ReleaseName = cfg.Name
i.Namespace = cfg.Namespace i.Namespace = cfg.Namespace
} }
func NewInstall(ai *action.Install) *install { func NewInstall(ai *action.Install) *Installer {
return &install{ai} return &Installer{ai}
} }

@ -2,6 +2,8 @@ package api_test
import ( import (
"fmt" "fmt"
"helm.sh/helm/v3/pkg/chart"
"helm.sh/helm/v3/pkg/time"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
@ -60,6 +62,10 @@ func (s *ListTestSuite) SetupTest() {
} }
func (s *ListTestSuite) TestShouldReturnReleasesWhenSuccessfulAPICall() { 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"}` body := `{"release_status":"deployed"}`
req, _ := http.NewRequest("POST", fmt.Sprintf("%s/list", s.server.URL), strings.NewReader(body)) 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, releases = append(releases,
&release.Release{Name: "test-release", &release.Release{Name: "test-release",
Namespace: "test-namespace", 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("SetStateMask")
s.mockList.On("SetState", action.ListDeployed) s.mockList.On("SetState", action.ListDeployed)
@ -77,7 +86,7 @@ func (s *ListTestSuite) TestShouldReturnReleasesWhenSuccessfulAPICall() {
assert.Equal(s.T(), 200, resp.StatusCode) 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) respBody, _ := ioutil.ReadAll(resp.Body)
assert.Equal(s.T(), expectedResponse, string(respBody)) assert.Equal(s.T(), expectedResponse, string(respBody))
@ -93,7 +102,7 @@ func (s *ListTestSuite) TestShouldReturnBadRequestErrorIfItHasInvalidCharacter()
assert.Equal(s.T(), 400, resp.StatusCode) 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) respBody, _ := ioutil.ReadAll(resp.Body)
assert.Equal(s.T(), expectedResponse, string(respBody)) assert.Equal(s.T(), expectedResponse, string(respBody))
require.NoError(s.T(), err) require.NoError(s.T(), err)

@ -5,20 +5,20 @@ import (
"helm.sh/helm/v3/pkg/release" "helm.sh/helm/v3/pkg/release"
) )
type list struct { type Lister struct {
*action.List *action.List
} }
type lister interface { type ListRunner interface {
Run() ([]*release.Release, error) Run() ([]*release.Release, error)
SetStateMask() SetStateMask()
SetState(state action.ListStates) SetState(state action.ListStates)
} }
func NewList(action *action.List) *list { func NewList(action *action.List) *Lister {
return &list{action} return &Lister{action}
} }
func (l *list) SetState(state action.ListStates) { func (l *Lister) SetState(state action.ListStates) {
l.StateMask = state l.StateMask = state
} }

@ -29,8 +29,8 @@ type history interface {
type Service struct { type Service struct {
settings *cli.EnvSettings settings *cli.EnvSettings
chartloader chartloader
lister ListRunner
Installer InstallRunner
upgrader upgrader
history 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) { func (s Service) installChart(icfg ReleaseConfig, ch *chart.Chart, vals ChartValues) (*ReleaseResult, error) {
s.Installer.SetConfig(icfg) s.InstallRunner.SetConfig(icfg)
release, err := s.Installer.Run(ch, vals) release, err := s.InstallRunner.Run(ch, vals)
if err != nil { if err != nil {
return nil, fmt.Errorf("error in installing chart: %v", err) 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") return nil, errors.New("invalid release status")
} }
s.lister.SetState(state) s.ListRunner.SetState(state)
s.lister.SetStateMask() s.ListRunner.SetStateMask()
releases, err := s.lister.Run() releases, err := s.ListRunner.Run()
if err != nil { if err != nil {
return nil, err return nil, err
} }
var helmReleases []Release var helmReleases []Release
for _, eachRes := range releases { for _, r := range releases {
r := Release{Name: eachRes.Name, helmRelease := Release{Name: r.Name,
Namespace: eachRes.Namespace, Namespace: r.Namespace,
Revision: eachRes.Version, Revision: r.Version,
Updated: eachRes.Info.LastDeployed, Updated: r.Info.LastDeployed,
Status: eachRes.Info.Status, Status: r.Info.Status,
Chart: fmt.Sprintf("%s-%s", eachRes.Chart.Metadata.Name, eachRes.Chart.Metadata.Version), Chart: fmt.Sprintf("%s-%s", r.Chart.Metadata.Name, r.Chart.Metadata.Version),
AppVersion: eachRes.Chart.Metadata.AppVersion, AppVersion: r.Chart.Metadata.AppVersion,
} }
helmReleases = append(helmReleases, r) helmReleases = append(helmReleases, helmRelease)
} }
return helmReleases, nil 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} return Service{settings, cl, l, i, u, h}
} }

@ -289,7 +289,7 @@ func (s *ServiceTestSuite) TestListShouldReturnErrorOnFailureOfListRun() {
func (s *ServiceTestSuite) TestListShouldReturnAllReleasesIfNoFilterIsPassed() { func (s *ServiceTestSuite) TestListShouldReturnAllReleasesIfNoFilterIsPassed() {
layout := "2006-01-02T15:04:05.000Z" layout := "2006-01-02T15:04:05.000Z"
str := "2014-11-12T11:45:26.371Z" 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("SetState", action.ListAll)
s.lister.On("SetStateMask") s.lister.On("SetStateMask")

Loading…
Cancel
Save