diff options
author | Matt Holt <mholt@users.noreply.github.com> | 2021-01-04 11:11:36 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-04 11:11:36 -0700 |
commit | c8557dc00bd93ce8ecf0bb724856a320e129c71b (patch) | |
tree | 0310586287637c9114228452c6620aa5a84c736a /cmd | |
parent | 1b453dd4fbea2f3a54362fb4c2115bab85cad1b7 (diff) |
caddyfile: Introduce basic linting and fmt check (#3923)
* caddyfile: Introduce basic linting and fmt check
This will help encourage people to keep their Caddyfiles tidy.
* Remove unrelated tests
I am not sure that testing the output of warnings here is quite the
right idea; these tests are just for syntax and parsing success.
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/commandfuncs.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index 28fa26e..20c662b 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -463,17 +463,22 @@ func cmdAdaptConfig(fl Flags) (int, error) { fmt.Errorf("reading input file: %v", err) } - opts := make(map[string]interface{}) - if adaptCmdPrettyFlag { - opts["pretty"] = "true" - } - opts["filename"] = adaptCmdInputFlag + opts := map[string]interface{}{"filename": adaptCmdInputFlag} adaptedConfig, warnings, err := cfgAdapter.Adapt(input, opts) if err != nil { return caddy.ExitCodeFailedStartup, err } + if adaptCmdPrettyFlag { + var prettyBuf bytes.Buffer + err = json.Indent(&prettyBuf, adaptedConfig, "", "\t") + if err != nil { + return caddy.ExitCodeFailedStartup, err + } + adaptedConfig = prettyBuf.Bytes() + } + // print warnings to stderr for _, warn := range warnings { msg := warn.Message |