From 9f777ed43f0062f5c9f3d1881e5c059fa0e642da Mon Sep 17 00:00:00 2001 From: peimingming Date: Fri, 19 Jul 2019 17:04:40 +0800 Subject: [PATCH] Fix by comments Signed-off-by: peimingming --- src/replication/adapter/helmhub/chart_registry.go | 9 +++++---- src/replication/adapter/helmhub/client.go | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/replication/adapter/helmhub/chart_registry.go b/src/replication/adapter/helmhub/chart_registry.go index db4b79b74..daba32952 100644 --- a/src/replication/adapter/helmhub/chart_registry.go +++ b/src/replication/adapter/helmhub/chart_registry.go @@ -87,9 +87,10 @@ func (a *adapter) FetchCharts(filters []*model.Filter) ([]*model.Resource, error func (a *adapter) ChartExist(name, version string) (bool, error) { versionList, err := a.client.fetchChartDetail(name) - if err != nil && err == ErrHTTPNotFound { - return false, nil - } else if err != nil { + if err != nil { + if err == ErrHTTPNotFound { + return false, nil + } return false, err } @@ -116,7 +117,7 @@ func (a *adapter) DownloadChart(name, version string) (io.ReadCloser, error) { } func (a *adapter) download(version *chartVersion) (io.ReadCloser, error) { - if version.Attributes.URLs == nil || len(version.Attributes.URLs) == 0 || len(version.Attributes.URLs[0]) == 0 { + if len(version.Attributes.URLs) == 0 || len(version.Attributes.URLs[0]) == 0 { return nil, fmt.Errorf("cannot got the download url for chart %s", version.ID) } diff --git a/src/replication/adapter/helmhub/client.go b/src/replication/adapter/helmhub/client.go index a07ebb246..c69b0d7a7 100644 --- a/src/replication/adapter/helmhub/client.go +++ b/src/replication/adapter/helmhub/client.go @@ -76,10 +76,10 @@ func (c *Client) fetchChartDetail(chartName string) (*chartVersionList, error) { return nil, err } - if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound { - return nil, fmt.Errorf("fetch chart detail error %d: %s", resp.StatusCode, string(body)) - } else if resp.StatusCode == http.StatusNotFound { + if resp.StatusCode == http.StatusNotFound { return nil, ErrHTTPNotFound + } else if resp.StatusCode != http.StatusOK { + return nil, fmt.Errorf("fetch chart detail error %d: %s", resp.StatusCode, string(body)) } list := &chartVersionList{}