Simplify error handling (#741)

## Summary

Remove unnecessary `if` check and `err` variable declaration.

## How was it tested?

tests.

Signed-off-by: Zhizhen He <[email protected]>

Author: hezhizhen

devbox.go

@@ -39,8 +39,7 @@ type Devbox interface {
 	RemoveGlobal(pkgs ...string) error
 	RunScript(scriptName string, scriptArgs []string) error
 	Services() (plugin.Services, error)
-	// Shell generates the devbox environment and launches nix-shell as a child
-	// process.
+	// Shell generates the devbox environment and launches nix-shell as a child process.
 	Shell() error
 	// ShellPlan creates a plan of the actions that devbox will take to generate its
 	// shell environment.
@@ -55,8 +54,7 @@ func Open(dir string, writer io.Writer) (Devbox, error) {
 	return impl.Open(dir, writer)
 }
 
-// InitConfig creates a default devbox config file if one doesn't already
-// exist.
+// InitConfig creates a default devbox config file if one doesn't already exist.
 func InitConfig(dir string, writer io.Writer) (bool, error) {
 	return impl.InitConfig(dir, writer)
 }

internal/boxcli/gen-docs.go

@@ -51,8 +51,7 @@ func genDocsCmd() *cobra.Command {
 			// ###### Auto generated by spf13/cobra on 18-Jul-2022
 			rootCmd.DisableAutoGenTag = true
 
-			err = doc.GenMarkdownTree(rootCmd, docsPath)
-			return errors.WithStack(err)
+			return errors.WithStack(doc.GenMarkdownTree(rootCmd, docsPath))
 		},
 	}
 

internal/boxcli/generate/devcontainer_util.go

@@ -45,11 +45,7 @@ func CreateDockerfile(tmplFS embed.FS, path string) error {
 	tmplName := "devcontainerDockerfile.tmpl"
 	t := template.Must(template.ParseFS(tmplFS, "tmpl/"+tmplName))
 	// write content into file
-	err = t.Execute(file, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
+	return errors.WithStack(t.Execute(file, nil))
 }
 
 // CreateDevcontainer creates a devcontainer.json in path and writes getDevcontainerContent's output into it
@@ -67,10 +63,7 @@ func CreateDevcontainer(path string, pkgs []string) error {
 	}
 	// writing devcontainer's content into json file
 	_, err = file.Write(devcontainerFileBytes)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
+	return errors.WithStack(err)
 }
 
 func CreateEnvrc(tmplFS embed.FS, path string) error {
@@ -83,11 +76,7 @@ func CreateEnvrc(tmplFS embed.FS, path string) error {
 	tmplName := "envrc.tmpl"
 	t := template.Must(template.ParseFS(tmplFS, "tmpl/"+tmplName))
 	// write content into file
-	err = t.Execute(file, nil)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
+	return errors.WithStack(t.Execute(file, nil))
 }
 
 func getDevcontainerContent(pkgs []string) *devcontainerObject {

internal/boxcli/init.go

@@ -34,9 +34,5 @@ func runInitCmd(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return errors.WithStack(err)
 	}
-	err = box.GenerateEnvrc(false, "init")
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
+	return errors.WithStack(box.GenerateEnvrc(false, "init"))
 }

internal/cloud/mutagen/forward.go

@@ -38,10 +38,5 @@ func ForwardList(env map[string]string, labels map[string]string) ([]Forward, er
 	}
 
 	list := []Forward{}
-
-	if err := json.Unmarshal(out, &list); err != nil {
-		return nil, errors.WithStack(err)
-	}
-
 	return list, errors.WithStack(json.Unmarshal(out, &list))
 }

internal/cloud/mutagenbox/mutagenbox.go

@@ -62,8 +62,5 @@ func createAndGetDataDir() (string, error) {
 	}
 
 	path := filepath.Join(home, dataDirPath)
-	if err := os.MkdirAll(path, 0700); err != nil {
-		return "", errors.WithStack(err)
-	}
-	return path, nil
+	return path, errors.WithStack(os.MkdirAll(path, 0700))
 }

internal/cloud/openssh/sshshim/generate.go

@@ -33,23 +33,17 @@ func Setup() error {
 
 	// create scp symlink
 	scpSymlink := filepath.Join(shimDir, "scp")
-	if err := makeSymlink(scpSymlink, devboxExecutablePath); err != nil {
-		return errors.WithStack(err)
-	}
-
-	return nil
+	return errors.WithStack(makeSymlink(scpSymlink, devboxExecutablePath))
 }
 
 func makeSymlink(from string, target string) error {
-
 	if err := os.Remove(from); err != nil && !os.IsNotExist(err) {
 		return errors.WithStack(err)
 	}
 
-	if err := os.Symlink(target, from); err != nil {
-		if !os.IsExist(err) {
-			return errors.WithStack(err)
-		}
+	err := os.Symlink(target, from)
+	if os.IsExist(err) {
+		err = nil
 	}
-	return nil
+	return errors.WithStack(err)
 }

internal/cloud/openssh/sshshim/mutagen.go

@@ -72,7 +72,6 @@ func checkActiveVMWithRetries(vmAddr string) (bool, error) {
 }
 
 func checkActiveVM(vmAddr string) (bool, error) {
-
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*2)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, "ssh", vmAddr, "echo 'alive'")

internal/cloud/openssh/username.go

@@ -31,8 +31,7 @@ func SaveGithubUsernameToLocalFile(username string) error {
 		return errors.WithStack(err)
 	}
 
-	err = os.WriteFile(filePath, []byte(username), 0600)
-	return errors.WithStack(err)
+	return errors.WithStack(os.WriteFile(filePath, []byte(username), 0600))
 }
 
 func usernameFilePath() (string, error) {

internal/cuecfg/cuecfg.go

@@ -35,29 +35,13 @@ func Marshal(valuePtr any, extension string) ([]byte, error) {
 func Unmarshal(data []byte, extension string, valuePtr any) error {
 	switch extension {
 	case ".json":
-		err := unmarshalJSON(data, valuePtr)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		return nil
+		return errors.WithStack(unmarshalJSON(data, valuePtr))
 	case ".yml", ".yaml":
-		err := unmarshalYaml(data, valuePtr)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		return nil
+		return errors.WithStack(unmarshalYaml(data, valuePtr))
 	case ".toml":
-		err := unmarshalToml(data, valuePtr)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		return nil
+		return errors.WithStack(unmarshalToml(data, valuePtr))
 	case ".xml":
-		err := unmarshalXML(data, valuePtr)
-		if err != nil {
-			return errors.WithStack(err)
-		}
-		return nil
+		return errors.WithStack(unmarshalXML(data, valuePtr))
 	}
 	return errors.Errorf("Unsupported file format '%s' for config file", extension)
 }
@@ -98,11 +82,7 @@ func WriteFile(path string, value any) error {
 		return errors.WithStack(err)
 	}
 
-	err = os.WriteFile(path, data, 0644)
-	if err != nil {
-		return errors.WithStack(err)
-	}
-	return nil
+	return errors.WithStack(os.WriteFile(path, data, 0644))
 }
 
 func IsSupportedExtension(ext string) bool {