safe assign

mafredri · mafredri · commit ef089be64243 · 2025-03-26T14:09:45.000Z
diff --git a/agent/agentcontainers/devcontainer.go b/agent/agentcontainers/devcontainer.go
@@ -64,13 +64,16 @@ func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script co
 }
 
 func expandDevcontainerPaths(logger slog.Logger, expandPath func(string) (string, error), dc codersdk.WorkspaceAgentDevcontainer) codersdk.WorkspaceAgentDevcontainer {
-	var err error
-	if dc.WorkspaceFolder, err = expandPath(dc.WorkspaceFolder); err != nil {
+	if wf, err := expandPath(dc.WorkspaceFolder); err != nil {
 		logger.Warn(context.Background(), "expand devcontainer workspace folder failed", slog.Error(err))
+	} else {
+		dc.WorkspaceFolder = wf
 	}
 	if dc.ConfigPath != "" {
-		if dc.ConfigPath, err = expandPath(dc.ConfigPath); err != nil {
+		if cp, err := expandPath(dc.ConfigPath); err != nil {
 			logger.Warn(context.Background(), "expand devcontainer config path failed", slog.Error(err))
+		} else {
+			dc.ConfigPath = cp
 		}
 	}
 	return dc

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,16 @@ func devcontainerStartupScript(dc codersdk.WorkspaceAgentDevcontainer, script co`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func expandDevcontainerPaths(logger slog.Logger, expandPath func(string) (string, error), dc codersdk.WorkspaceAgentDevcontainer) codersdk.WorkspaceAgentDevcontainer {`
`67`		`- var err error`
`68`		`- if dc.WorkspaceFolder, err = expandPath(dc.WorkspaceFolder); err != nil {`
	`67`	`+ if wf, err := expandPath(dc.WorkspaceFolder); err != nil {`
`69`	`68`	`logger.Warn(context.Background(), "expand devcontainer workspace folder failed", slog.Error(err))`
	`69`	`+ } else {`
	`70`	`+ dc.WorkspaceFolder = wf`
`70`	`71`	`}`
`71`	`72`	`if dc.ConfigPath != "" {`
`72`		`- if dc.ConfigPath, err = expandPath(dc.ConfigPath); err != nil {`
	`73`	`+ if cp, err := expandPath(dc.ConfigPath); err != nil {`
`73`	`74`	`logger.Warn(context.Background(), "expand devcontainer config path failed", slog.Error(err))`
	`75`	`+ } else {`
	`76`	`+ dc.ConfigPath = cp`
`74`	`77`	`}`
`75`	`78`	`}`
`76`	`79`	`return dc`