git.iko.soy/crush
on main help sign in
fix(config): individual errors on json parse
61a9fceKieran Klukas
internal/config/load.go+6
compare with main
unifiedsplit
@@ -55,6 +55,9 @@ func Load(workingDir, dataDir string, debug bool) (*ConfigStore, error) {
55
55
56 // Load workspace config last so it has highest priority.
56 // Load workspace config last so it has highest priority.
57 if wsData, err := os.ReadFile(store.workspacePath); err == nil && len(wsData) > 0 {
57 if wsData, err := os.ReadFile(store.workspacePath); err == nil && len(wsData) > 0 {
58+ if !json.Valid(wsData) {
59+ return nil, fmt.Errorf("invalid JSON in config file %s", store.workspacePath)
60+ }
58 merged, mergeErr := loadFromBytes(append([][]byte{mustMarshalConfig(cfg)}, wsData))
61 merged, mergeErr := loadFromBytes(append([][]byte{mustMarshalConfig(cfg)}, wsData))
59 if mergeErr == nil {
62 if mergeErr == nil {
60 // Preserve defaults that setDefaults already applied.
63 // Preserve defaults that setDefaults already applied.
@@ -734,6 +737,9 @@ func loadFromConfigPaths(configPaths []string) (*Config, []string, error) {
734 if len(data) == 0 {
737 if len(data) == 0 {
735 continue
738 continue
736 }
739 }
740+ if !json.Valid(data) {
741+ return nil, nil, fmt.Errorf("invalid JSON in config file %s", path)
742+ }
737 configs = append(configs, data)
743 configs = append(configs, data)
738 loaded = append(loaded, path)
744 loaded = append(loaded, path)
739 }
745 }
internal/config/load_test.go+32
@@ -36,6 +36,38 @@ func TestConfig_LoadFromBytes(t *testing.T) {
36 require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
36 require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
37}
37}
38
38
39+func TestLoadFromConfigPaths_InvalidJSON(t *testing.T) {
40+ t.Parallel()
41+
42+ t.Run("identifies the offending file", func(t *testing.T) {
43+ t.Parallel()
44+ tmpDir := t.TempDir()
45+ good := filepath.Join(tmpDir, "good.json")
46+ bad := filepath.Join(tmpDir, "bad.json")
47+ require.NoError(t, os.WriteFile(good, []byte(`{"providers":{}}`), 0o644))
48+ require.NoError(t, os.WriteFile(bad, []byte(`{not valid json}`), 0o644))
49+
50+ _, _, err := loadFromConfigPaths([]string{good, bad})
51+ require.Error(t, err)
52+ require.Contains(t, err.Error(), "invalid JSON in config file")
53+ require.Contains(t, err.Error(), "bad.json")
54+ })
55+
56+ t.Run("skips missing and empty files", func(t *testing.T) {
57+ t.Parallel()
58+ tmpDir := t.TempDir()
59+ empty := filepath.Join(tmpDir, "empty.json")
60+ require.NoError(t, os.WriteFile(empty, []byte(""), 0o644))
61+
62+ cfg, _, err := loadFromConfigPaths([]string{
63+ filepath.Join(tmpDir, "nonexistent.json"),
64+ empty,
65+ })
66+ require.NoError(t, err)
67+ require.NotNil(t, cfg)
68+ })
69+}
70+
39// testStore wraps a Config in a minimal ConfigStore for testing.
71// testStore wraps a Config in a minimal ConfigStore for testing.
40func testStore(cfg *Config) *ConfigStore {
72func testStore(cfg *Config) *ConfigStore {
41 return &ConfigStore{config: cfg}
73 return &ConfigStore{config: cfg}
internal/config/store.go+3
@@ -647,6 +647,9 @@ func (s *ConfigStore) ReloadFromDisk(ctx context.Context) error {
647 // Merge workspace config if present
647 // Merge workspace config if present
648 workspacePath := filepath.Join(cfg.Options.DataDirectory, fmt.Sprintf("%s.json", appName))
648 workspacePath := filepath.Join(cfg.Options.DataDirectory, fmt.Sprintf("%s.json", appName))
649 if wsData, err := os.ReadFile(workspacePath); err == nil && len(wsData) > 0 {
649 if wsData, err := os.ReadFile(workspacePath); err == nil && len(wsData) > 0 {
650+ if !json.Valid(wsData) {
651+ return fmt.Errorf("invalid JSON in config file %s", workspacePath)
652+ }
650 merged, mergeErr := loadFromBytes(append([][]byte{mustMarshalConfig(cfg)}, wsData))
653 merged, mergeErr := loadFromBytes(append([][]byte{mustMarshalConfig(cfg)}, wsData))
651 if mergeErr == nil {
654 if mergeErr == nil {
652 dataDir := cfg.Options.DataDirectory
655 dataDir := cfg.Options.DataDirectory