Merge pull request #380 from databacker/native-yaml-support

native yaml support based on api

Author: deitch

go.mod

@@ -31,7 +31,7 @@ require (
 )
 
 require (
-	github.com/databacker/api/go/api v0.0.0-20241107135529-dabd5b1d3c68
+	github.com/databacker/api/go/api v0.0.0-20241128084006-ed33dc044eaa
 	github.com/google/go-cmp v0.6.0
 	go.opentelemetry.io/otel v1.31.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0

go.sum

@@ -70,8 +70,8 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/databacker/api/go/api v0.0.0-20241107135529-dabd5b1d3c68 h1:xxLIWTReBE6tS0TrVbrGIPhuoaIbtB9hHOhe887EUTQ=
-github.com/databacker/api/go/api v0.0.0-20241107135529-dabd5b1d3c68/go.mod h1:bQhbl71Lk1ATni0H+u249hjoQ8ShAdVNcNjnw6z+SbE=
+github.com/databacker/api/go/api v0.0.0-20241128084006-ed33dc044eaa h1:cDI48+AG1mPMdvgGWz/SLpNKhzDiGZwfSSww9VvvWuI=
+github.com/databacker/api/go/api v0.0.0-20241128084006-ed33dc044eaa/go.mod h1:bQhbl71Lk1ATni0H+u249hjoQ8ShAdVNcNjnw6z+SbE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

pkg/config/process.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -47,8 +46,7 @@ func ProcessConfig(r io.Reader) (actualConfig *api.ConfigSpec, err error) {
 			// is incorrect.
 			// We fix this by converting the spec part of the config into json,
 			// as yaml is a valid subset of json, and then unmarshalling that.
-			jsonBytes := yamlToJSON(specBytes)
-			if err := json.Unmarshal(jsonBytes, &spec); err != nil {
+			if err := yaml.Unmarshal(specBytes, &spec); err != nil {
 				return nil, fmt.Errorf("parsed yaml had kind local, but spec invalid")
 			}
 			actualConfig = &spec
@@ -93,15 +91,3 @@ func getRemoteConfig(spec api.RemoteSpec) (conf api.Config, err error) {
 
 	return baseConf, nil
 }
-
-func yamlToJSON(yamlBytes []byte) []byte {
-	var m map[string]interface{}
-	if err := yaml.Unmarshal(yamlBytes, &m); err != nil {
-		return nil
-	}
-	jsonBytes, err := json.Marshal(m)
-	if err != nil {
-		return nil
-	}
-	return jsonBytes
-}