caddyhttp: Support single-line not matcher shortcut

[francislavoie]

Simple addition to make it possible to have not negate a matcher on the same line instead of requiring it to be contained in a block.

E.g. before:

@notStatic {
    not {
        path /static*
    }
}

after:

@notStatic {
    not path /static*
}

[sarge]

Nice, I wonder what a good testing approach is for this?

Perhaps a usecase in here

caddy/caddyconfig/httpcaddyfile/httptype_test.go

Lines 9 to 33 in 84c729e

	func TestServerType(t *testing.T) {
	for i, tc := range []struct {
	input string
	expectWarn bool
	expectError bool
	}{
	{
	input: `http://localhost
	@debug {
	query showdebug=1
	}
	`,
	expectWarn: false,
	expectError: false,
	},
	{
	input: `http://localhost
	@debug {
	query bad format
	}
	`,
	expectWarn: false,
	expectError: true,
	},
	} {

[francislavoie]

I don't think TestServerType is the right place for testing matchers. We don't have any tests for Caddyfile matchers currently as far as I can tell, so I didn't bother making any - my experience in Go is extremely limited. I can read the code, but barely write anything 😛

[sarge]

Understood, I think that test name is bit misleading because it is actually testing the parsing of a matcher.
[edit]
It isn't a great test (I wrote it) as it doesn't test the actual outcome, but it does validate if is valid syntax.

ps: I think you are underating yourself :)

[francislavoie]

I'll rename TestServerType to TestMatcherSyntax and add some tests 👍

[francislavoie]

Added a couple test cases, but I don't think there's a huge amount of value here because it didn't return a warning or error before with not path /somepath*, it just generated bad JSON.

"match": [
        {
                "not": [
                        {},
                        {},
                        {}
                ]
        }
],

[mholt]

Looks good, thanks @francislavoie ! Congrats on your first Go-centric PR. 😃

[mholt]

This is clever, but I do admit I think it's kinda weird. We can go with it for now and fix it later if people complain.

[francislavoie]

What about it do you find weird?

[mholt]

It's just an unusual condition for a parsing loop.

[francislavoie]

Idk, reads perfectly fine to me. 🤷‍♂

"While there's still an arg or a block ahead, loop to read for additional matchers"