diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2021-04-20 14:29:47 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2021-04-28 07:08:41 +0200 |
| commit | 77e2b66864e69c17416614228723a1ebd3581ddc (patch) | |
| tree | 871c35ea161f54935cc6906b8a6f55fed10fd91c /pkg | |
| parent | de0456bb5ab22e568b8a3ffcce6bf85e2a7de164 (diff) | |
pkg/config: support comments
Strip lines starting with # before json deserialization.
This allows to have comments!
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/config/config.go | 3 | ||||
| -rw-r--r-- | pkg/mgrconfig/testdata/gce1.cfg | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/config/config.go b/pkg/config/config.go index a4f56c225..9ff25ecd7 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,6 +8,7 @@ import ( "encoding/json" "fmt" "io/ioutil" + "regexp" "github.com/google/syzkaller/pkg/osutil" ) @@ -24,6 +25,8 @@ func LoadFile(filename string, cfg interface{}) error { } func LoadData(data []byte, cfg interface{}) error { + // Remove comment lines starting with #. + data = regexp.MustCompile(`(^|\n)\s*#.*?\n`).ReplaceAll(data, nil) dec := json.NewDecoder(bytes.NewReader(data)) dec.DisallowUnknownFields() if err := dec.Decode(cfg); err != nil { diff --git a/pkg/mgrconfig/testdata/gce1.cfg b/pkg/mgrconfig/testdata/gce1.cfg index 44b4eae12..805a1f418 100644 --- a/pkg/mgrconfig/testdata/gce1.cfg +++ b/pkg/mgrconfig/testdata/gce1.cfg @@ -1,4 +1,6 @@ +# This is a test comment in the config. { + # This is a test comment in the config. "name": "windows-gce", "target": "windows/amd64", "http": ":10000", |