MINOR: go: Remove unnecessary nil err checks on return

Author: dkorunic

configuration/cluster_sync.go

@@ -448,11 +448,7 @@ func (c *ClusterSync) issueJoinRequest(url, port, basePath string, registerPath
 	if err != nil {
 		return err
 	}
-	err = c.cfg.Save()
-	if err != nil {
-		return err
-	}
-	return nil
+	return c.cfg.Save()
 }
 
 // checkCertificate checks if we have received valid certificate or we just got CSR back

configuration/file-storage-hcl.go

@@ -102,11 +102,7 @@ func (s *StorageHCL) SaveAs(filename string) error {
 		return err
 	}
 
-	err = ioutil.WriteFile(filename, hcl, 0644) //nolint:gosec
-	if err != nil {
-		return err
-	}
-	return nil
+	return ioutil.WriteFile(filename, hcl, 0644) //nolint:gosec
 }
 
 func (s *StorageHCL) Save() error {

configuration/file-storage-yml.go

@@ -62,11 +62,7 @@ func (s *StorageYML) SaveAs(filename string) error {
 		return err
 	}
 
-	err = renameio.WriteFile(filename, data, 0644)
-	if err != nil {
-		return err
-	}
-	return nil
+	return renameio.WriteFile(filename, data, 0644)
 }
 
 func (s *StorageYML) Save() error {

haproxy/reload_agent.go

@@ -232,10 +232,7 @@ func (ra *ReloadAgent) reloadHAProxy(id string) (string, error) {
 
 func (ra *ReloadAgent) restartHAProxy() error {
 	_, err := execCmd(ra.restartCmd)
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }
 
 func execCmd(cmd string) (string, error) {