fix: ensure config dir exists before reading tunnel config (coder#2259)

coadler · web-flow · commit de6f86bf7aa6 · 2022-06-10T21:42:55.000Z
diff --git a/coderd/devtunnel/tunnel.go b/coderd/devtunnel/tunnel.go
@@ -177,7 +177,13 @@ func cfgPath() (string, error) {
 		return "", xerrors.Errorf("get user config dir: %w", err)
 	}
 
-	return filepath.Join(cfgDir, "coderv2", "devtunnel"), nil
+	cfgDir = filepath.Join(cfgDir, "coderv2")
+	err = os.MkdirAll(cfgDir, 0750)
+	if err != nil {
+		return "", xerrors.Errorf("mkdirall config dir %q: %w", cfgDir, err)
+	}
+
+	return filepath.Join(cfgDir, "devtunnel"), nil
 }
 
 func readOrGenerateConfig() (Config, error) {

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,13 @@ func cfgPath() (string, error) {`
`177`	`177`	`return "", xerrors.Errorf("get user config dir: %w", err)`
`178`	`178`	`}`
`179`	`179`
`180`		`- return filepath.Join(cfgDir, "coderv2", "devtunnel"), nil`
	`180`	`+ cfgDir = filepath.Join(cfgDir, "coderv2")`
	`181`	`+ err = os.MkdirAll(cfgDir, 0750)`
	`182`	`+ if err != nil {`
	`183`	`+ return "", xerrors.Errorf("mkdirall config dir %q: %w", cfgDir, err)`
	`184`	`+ }`
	`185`	`+`
	`186`	`+ return filepath.Join(cfgDir, "devtunnel"), nil`
`181`	`187`	`}`
`182`	`188`
`183`	`189`	`func readOrGenerateConfig() (Config, error) {`