validate config updates via cmd and api with schema

This commit is contained in:
Joel Wetzell
2026-03-23 20:12:26 -05:00
parent 9a50ca8cfe
commit 13f7b9e927
4 changed files with 71 additions and 21 deletions

View File

@@ -1,10 +1,7 @@
package schema
import (
"encoding/json"
"github.com/google/jsonschema-go/jsonschema"
"github.com/jwetzell/showbridge-go/internal/config"
)
var ConfigSchema = jsonschema.Schema{
@@ -24,22 +21,19 @@ var ConfigSchema = jsonschema.Schema{
},
}
func ValidateConfig(config config.Config) error {
func ApplyDefaults(cfg *map[string]any) error {
resolvedSchema, err := GetResolvedConfigSchema()
if err != nil {
return err
}
jsonBytes, err := json.Marshal(config)
if err != nil {
return err
}
jsonMap := make(map[string]any)
err = json.Unmarshal(jsonBytes, &jsonMap)
if err != nil {
return err
}
return resolvedSchema.Validate(jsonMap)
return resolvedSchema.ApplyDefaults(cfg)
}
func ValidateConfig(cfg map[string]any) error {
resolvedSchema, err := GetResolvedConfigSchema()
if err != nil {
return err
}
return resolvedSchema.Validate(cfg)
}

View File

@@ -8,9 +8,7 @@ import (
)
func GetResolvedConfigSchema() (*jsonschema.Resolved, error) {
configSchema := ConfigSchema
return configSchema.Resolve(&jsonschema.ResolveOptions{
return ConfigSchema.Resolve(&jsonschema.ResolveOptions{
Loader: func(uri *url.URL) (*jsonschema.Schema, error) {
switch uri.String() {
case "https://showbridge.io/modules.schema.json":
@@ -23,5 +21,6 @@ func GetResolvedConfigSchema() (*jsonschema.Resolved, error) {
return nil, fmt.Errorf("unknown schema reference: %s", uri.String())
}
},
ValidateDefaults: true,
})
}