Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions internal/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,24 @@ func TestLoadUnknownSchemaVersion(t *testing.T) {
}
}

func TestLoadRejectsUnknownFields(t *testing.T) {
content := `{"version":1,"default":{"baseBranch":"main"}}`
f, err := os.CreateTemp("", "taskcapsule-*.json")
if err != nil {
t.Fatal(err)
}
defer os.Remove(f.Name())
if _, err := f.Write([]byte(content)); err != nil {
t.Fatal(err)
}
if err := f.Close(); err != nil {
t.Fatal(err)
}
if _, err := Load(f.Name()); err == nil {
t.Fatal("expected unknown configuration field to be rejected")
}
}

func TestLoadDuplicateService(t *testing.T) {
content := `{
"version": 1,
Expand Down
12 changes: 11 additions & 1 deletion internal/config/load.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
package config

import (
"bytes"
"encoding/json"
"fmt"
"io"
"os"
)

Expand All @@ -13,7 +15,15 @@ func Load(path string) (*Config, error) {
}

var cfg Config
if err := json.Unmarshal(data, &cfg); err != nil {
decoder := json.NewDecoder(bytes.NewReader(data))
decoder.DisallowUnknownFields()
if err := decoder.Decode(&cfg); err != nil {
return nil, fmt.Errorf("invalid configuration: %v", err)
}
if err := decoder.Decode(&struct{}{}); err != io.EOF {
if err == nil {
err = fmt.Errorf("multiple JSON values")
}
return nil, fmt.Errorf("invalid configuration: %v", err)
}

Expand Down
Loading