Merge pull request #20 from johnmaguire/config-dir

Expand ConfigDir env vars when config.yml is missing
lxc · Jan 17, 2024 · ab231e1 · ab231e1
2 parents 68e8e46 + 89f01eb
commit ab231e1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
@@ -143,10 +143,11 @@ func (p *IncusProvider) Configure(ctx context.Context, req provider.ConfigureReq
 	if configDir == "" {
 		configDir = "$HOME/.config/incus"
 	}
+	configDir = os.ExpandEnv(configDir)
 
 	// Try to load config.yml from determined configDir. If there's
 	// an error loading config.yml, default config will be used.
-	configPath := os.ExpandEnv(filepath.Join(configDir, "config.yml"))
+	configPath := filepath.Join(configDir, "config.yml")
 	config, err := incus_config.LoadConfig(configPath)
 	if err != nil {
 		config = incus_config.DefaultConfig()