caddyfile: Fix importing nested tokens for {block}#7189
caddyfile: Fix importing nested tokens for {block}#7189francislavoie merged 3 commits intocaddyserver:masterfrom
{block}#7189Conversation
|
|
|
Nice, thanks! Could you add some adapt tests to https://github.com/caddyserver/caddy/tree/master/caddytest/integration/caddyfile_adapt as well, to assert that the JSON output is as expected? |
Done! I just took what the current snapshpt looks like via |
francislavoie
left a comment
There was a problem hiding this comment.
Looks good to me! Thanks for working on this.
|
There's another related issue with |
Sure, I'd like to try my hand on it |
and add test for both actual error case and mistakenly assumed to be error case
{block}
Fixes #7083
Modifies parser to fix case of assuming a site-block + 2 arguments being an "anonymous block" and thusly invalid.
It also slightly streamlines indivisual steps by getting all remaining block-arguments at once.
Tests for both failure and success cases are also added.