fix golint

softleader · Feb 20, 2019 · 9089d6b · 9089d6b
1 parent 1c051bd
commit 9089d6b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 25 deletions.
diff --git a/cmd/capctl/app/delete.go b/cmd/capctl/app/delete.go
@@ -80,8 +80,5 @@ func (c *deleteCmd) run() error {
 		ChartName:    c.chartName,
 		ChartVersion: c.chartVersion,
 	}
-	if err := captain.CallDeleteChart(logrus.StandardLogger(), c.endpoint.String(), &request, settings.TimeoutDuration()); err != nil {
-		return err
-	}
-	return nil
+	return captain.CallDeleteChart(logrus.StandardLogger(), c.endpoint.String(), &request, settings.TimeoutDuration())
 }
diff --git a/cmd/capctl/app/install.go b/cmd/capctl/app/install.go
@@ -192,9 +192,5 @@ func (c *installCmd) install(path string) error {
 		}
 	}
 
-	if err := captain.CallInstallChart(logrus.StandardLogger(), c.endpoint.String(), &request, settings.TimeoutDuration()); err != nil {
-		return err
-	}
-
-	return nil
+	return captain.CallInstallChart(logrus.StandardLogger(), c.endpoint.String(), &request, settings.TimeoutDuration())
 }
diff --git a/cmd/capctl/app/script.go b/cmd/capctl/app/script.go
@@ -186,10 +186,7 @@ func (c *scriptCmd) runScript(log *logrus.Logger, path string) error {
 			request.Chart.Content = bytes
 		}
 
-		if err := captain.CallGenerateScript(log, c.endpoint.String(), &request, settings.TimeoutDuration()); err != nil {
-			return err
-		}
-		return nil
+		return captain.CallGenerateScript(log, c.endpoint.String(), &request, settings.TimeoutDuration())
 	}
 
 	return c.runScriptOnClient(log, abs)

diff --git a/cmd/captain/app/server/captain_delete_chart.go b/cmd/captain/app/server/captain_delete_chart.go
@@ -24,8 +24,5 @@ func (s *CaptainServer) DeleteChart(req *captainkube_v2.DeleteChartRequest, stre
 	if err != nil {
 		return err
 	}
-	if err := d.Delete(log); err != nil {
-		return err
-	}
-	return nil
+	return d.Delete(log)
 }
diff --git a/pkg/helm/chart/deleter_icp.go b/pkg/helm/chart/deleter_icp.go
@@ -22,10 +22,7 @@ func (i *icpDeleter) Delete(log *logrus.Logger) error {
 	if err := loginBxPr(log, i.endpoint, i.username, i.password, i.account, i.skipSslValidation); err != nil {
 		return err
 	}
-	if err := deleteHelmChart(log, i.endpoint, i.chartName, i.chartVersion); err != nil {
-		return err
-	}
-	return nil
+	return deleteHelmChart(log, i.endpoint, i.chartName, i.chartVersion)
 }
 
 func deleteHelmChart(log *logrus.Logger, endpoint, chartName, chartVersion string) error {

diff --git a/pkg/helm/chart/installer_icp.go b/pkg/helm/chart/installer_icp.go
@@ -21,10 +21,7 @@ func (i *icpInstaller) Install(log *logrus.Logger) error {
 	if err := loginBxPr(log, i.endpoint, i.username, i.password, i.account, i.skipSslValidation); err != nil {
 		return err
 	}
-	if err := loadHelmChart(log, i.endpoint, i.chart); err != nil {
-		return err
-	}
-	return nil
+	return loadHelmChart(log, i.endpoint, i.chart)
 }
 
 func loadHelmChart(log *logrus.Logger, endpoint, chart string) error {