Skip to content

refactor(config): clean up BurntSushi/toml usage in LoadFromFile #4483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lpcox merged 3 commits into from
Apr 24, 2026
+18 −8
Merged

refactor(config): clean up BurntSushi/toml usage in LoadFromFile #4483

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3208c9c
Initial plan
Copilot Apr 24, 2026
cc7d931
refactor(config): clean up BurntSushi/toml usage in LoadFromFile
Copilot Apr 24, 2026
93dd347
refactor(config): fix godoc indentation and expand error summary
Copilot Apr 24, 2026
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
26 changes: 18 additions & 8 deletions internal/config/config_core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,11 @@ func isDynamicTOMLPath(key toml.Key) bool {
return false
}

// LoadFromFile parses a TOML configuration file at path and returns the
// validated Config, or an error if the file cannot be opened, parsed,
// contains unknown fields, or fails schema/field-level validation (e.g. no
// servers defined, containerization, auth, tracing, or trusted_bots checks).
//
// This function uses the BurntSushi/toml v1.6.0+ parser with TOML 1.1 support,
// which enables modern syntax features like newlines in inline tables and
// improved duplicate key detection.
Expand All @@ -310,13 +315,21 @@ func isDynamicTOMLPath(key toml.Key) bool {
// - Unknown fields are rejected with an error per spec §4.3.1
// - Metadata tracks all decoded keys for validation purposes
//
// Callers that need structured parse-error details (line, column, source
// snippet) can extract the original toml.ParseError via errors.As:
//
// var perr toml.ParseError
// if errors.As(err, &perr) {
// fmt.Println(perr.Position())
// }
Comment on lines +321 to +324
Copy link

Copilot AI Apr 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Within the new godoc code blocks, some lines are indented using spaces (e.g., the fmt.Println(...) line in the errors.As snippet). Other godoc examples in the repo use tab indentation (e.g., internal/auth/header.go:24-34), which also aligns with gofmt-style formatting and consistent rendering in godoc. Consider switching these code-block indents to tabs.

Copilot uses AI. Check for mistakes.
//
// Example usage with TOML 1.1 multi-line arrays:
//
// [servers.github]
// command = "docker"
// args = [
// "run", "--rm", "-i",
// "--name", "awmg-github-mcp"
// "run", "--rm", "-i",
// "--name", "awmg-github-mcp"
// ]
func LoadFromFile(path string) (*Config, error) {
logConfig.Printf("Loading configuration from file: %s", path)
Expand All @@ -333,12 +346,9 @@ func LoadFromFile(path string) (*Config, error) {
decoder := toml.NewDecoder(file)
md, err := decoder.Decode(&cfg)
if err != nil {
// toml.Decode returns ParseError as a value type. Wrap with %w to preserve
// the structured error for callers while surfacing the full source context
// (line snippet + column pointer) via ParseError.Error().
if perr, ok := err.(toml.ParseError); ok {
return nil, fmt.Errorf("failed to parse TOML: %w", perr)
}
// decoder.Decode returns ParseError as a value type. Wrap with %w to
// preserve the structured error for callers while surfacing the full
// source context (line snippet + column pointer) via ParseError.Error().
return nil, fmt.Errorf("failed to parse TOML: %w", err)
}

Expand Down
Loading