diff options
| author | Matthew Holt <[email protected]> | 2021-01-19 14:21:11 -0700 |
|---|---|---|
| committer | Matthew Holt <[email protected]> | 2021-01-19 14:21:11 -0700 |
| commit | 160d19999982c4facd32c4bddced5a7dc91e8a40 (patch) | |
| tree | 41ce7b2f8ab1672f7685a9ac29565a66cf0a7fc0 /cmd | |
| parent | d68cff8eb6211be10fc79d3e8d469562420b78cd (diff) | |
| download | caddy-160d19999982c4facd32c4bddced5a7dc91e8a40.tar.gz caddy-160d19999982c4facd32c4bddced5a7dc91e8a40.zip | |
caddytest: Update Caddyfile tests for formatting, HTTP-only blocks
Previous commit improved the Caddyfile adapter so it doesn't unnecessarily add names to "skip" in "auto_https" when the server is already HTTP-only.
This commit updates the tests to reflect that change, while also fixing the Caddyfile formatting in many of the tests.
We also print the line number of the divergence between input and formatted version in Caddyfile adapt warnings - very useful for finding initial formatting problems.
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commandfuncs.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index bf24c240f..3bf4b8df3 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -529,6 +529,9 @@ func cmdAdaptConfig(fl Flags) (int, error) { adaptedConfig = prettyBuf.Bytes() } + // print result to stdout + fmt.Println(string(adaptedConfig)) + // print warnings to stderr for _, warn := range warnings { msg := warn.Message @@ -538,9 +541,6 @@ func cmdAdaptConfig(fl Flags) (int, error) { fmt.Fprintf(os.Stderr, "[WARNING][%s] %s:%d: %s\n", adaptCmdAdapterFlag, warn.File, warn.Line, msg) } - // print result to stdout - fmt.Println(string(adaptedConfig)) - // validate output if requested if adaptCmdValidateFlag { var cfg *caddy.Config |