Allow missing config file if OPENRUN_HOME is set

Author: akclace

cmd/openrun/main.go

@@ -75,7 +75,7 @@ func globalFlags(globalConfig *types.GlobalConfig) ([]cli.Flag, error) {
 // the easiest way to configure. Uses some extra heuristics to help avoid having to setup
 // OPENRUN_HOME in the env, by using the binaries parent folder as the default.
 // On mac, looks for brew install locations also.
-func getConfigPath(cCtx *cli.Context) (string, string, error) {
+func getConfigPath(cCtx *cli.Context) (string, string, bool, error) {
 	configFile := cCtx.String(configFileFlagName)
 	clHome := os.Getenv(types.OPENRUN_HOME)
 	if configFile == "" {
@@ -86,21 +86,21 @@ func getConfigPath(cCtx *cli.Context) (string, string, error) {
 	}
 	if clHome != "" {
 		// Found OPENRUN_HOME
-		return clHome, configFile, nil
+		return clHome, configFile, true, nil
 	}
 	if configFile != "" {
 		// OPENRUN_HOME not set and config file is set, use config dir path as OPENRUN_HOME
 		clHome = filepath.Dir(configFile)
-		return clHome, configFile, nil
+		return clHome, configFile, false, nil
 	}
 
 	binFile, err := os.Executable()
 	if err != nil {
-		return "", "", fmt.Errorf("unable to find executable path: %w", err)
+		return "", "", false, fmt.Errorf("unable to find executable path: %w", err)
 	}
 	binAbsolute, err := filepath.EvalSymlinks(binFile)
 	if err != nil {
-		return "", "", fmt.Errorf("unable to resolve symlink: %w", err)
+		return "", "", false, fmt.Errorf("unable to resolve symlink: %w", err)
 	}
 
 	binParent := filepath.Dir(binAbsolute)
@@ -112,31 +112,31 @@ func getConfigPath(cCtx *cli.Context) (string, string, error) {
 	if system.FileExists(binParentConfig) && (strings.Contains(binParent, "openrun") || strings.Contains(binParent, "clhome")) {
 		// Config file found in parent directory of the executable, use that as path
 		// To avoid clobbering /usr, check if the path contains the string openrun/clhome
-		return binParent, binParentConfig, nil
+		return binParent, binParentConfig, false, nil
 	}
 
 	// Running `brew --prefix` would be another option
 	if runtime.GOOS == "darwin" { //nolint:staticcheck
 		// brew OSX specific checks
 		if system.FileExists("/opt/homebrew/etc/openrun.toml") {
-			return "/opt/homebrew/var/openrun", "/opt/homebrew/etc/openrun.toml", nil
+			return "/opt/homebrew/var/openrun", "/opt/homebrew/etc/openrun.toml", false, nil
 		} else if system.FileExists("/usr/local/etc/openrun.toml") {
-			return "/usr/local/var/openrun", "/usr/local/etc/openrun.toml", nil
+			return "/usr/local/var/openrun", "/usr/local/etc/openrun.toml", false, nil
 		}
 	} else if runtime.GOOS == "linux" {
 		// brew linux specific checks
 		if system.FileExists("/home/linuxbrew/.linuxbrew/etc/openrun.toml") {
-			return "/home/linuxbrew/.linuxbrew/var/openrun", "/home/linuxbrew/.linuxbrew/etc/openrun.toml", nil
+			return "/home/linuxbrew/.linuxbrew/var/openrun", "/home/linuxbrew/.linuxbrew/etc/openrun.toml", false, nil
 		} else if system.FileExists("/usr/local/etc/openrun.toml") {
-			return "/usr/local/var/openrun", "/usr/local/etc/openrun.toml", nil
+			return "/usr/local/var/openrun", "/usr/local/etc/openrun.toml", false, nil
 		}
 	}
-	return "", "", fmt.Errorf("unable to find OPENRUN_HOME or config file")
+	return "", "", false, fmt.Errorf("unable to find OPENRUN_HOME or config file")
 }
 
 func parseConfig(cCtx *cli.Context, globalConfig *types.GlobalConfig, clientConfig *types.ClientConfig, serverConfig *types.ServerConfig) error {
 	// Find OPENRUN_HOME and config file, update OPENRUN_HOME in env
-	clHome, filePath, err := getConfigPath(cCtx)
+	clHome, filePath, clHomeEnvSet, err := getConfigPath(cCtx)
 	if err != nil {
 		return err
 	}
@@ -149,6 +149,10 @@ func parseConfig(cCtx *cli.Context, globalConfig *types.GlobalConfig, clientConf
 	//fmt.Fprintf(os.Stderr, "Loading config file: %s, clHome %s\n", filePath, clHome)
 	buf, err := os.ReadFile(filePath)
 	if err != nil {
+		if clHomeEnvSet {
+			fmt.Fprintf(os.Stderr, "Warning: unable to read config file %s, using default config\n", err)
+			return nil
+		}
 		return err
 	}