mirror of
https://github.com/coredns/coredns.git
synced 2025-10-27 16:24:19 -04:00
plugin/header: Remove deprecated syntax (#7436)
Signed-off-by: Qasim Sarfraz <qasimsarfraz@microsoft.com>
This commit is contained in:
@@ -13,12 +13,12 @@ The modifications are made transparently for the client and subsequent plugins.
|
|||||||
|
|
||||||
~~~
|
~~~
|
||||||
header {
|
header {
|
||||||
[SELECTOR] ACTION FLAGS...
|
SELECTOR ACTION FLAGS...
|
||||||
[SELECTOR] ACTION FLAGS...
|
SELECTOR ACTION FLAGS...
|
||||||
}
|
}
|
||||||
~~~
|
~~~
|
||||||
|
|
||||||
* **SELECTOR** defines if the action should be applied on `query` or `response`. In future CoreDNS version the selector will be mandatory. For backwards compatibility the action will be applied on `response` if the selector is undefined.
|
* **SELECTOR** defines if the action should be applied on `query` or `response`.
|
||||||
|
|
||||||
* **ACTION** defines the state for DNS message header flags. Actions are evaluated in the order they are defined so last one has the
|
* **ACTION** defines the state for DNS message header flags. Actions are evaluated in the order they are defined so last one has the
|
||||||
most precedence. Allowed values are:
|
most precedence. Allowed values are:
|
||||||
|
|||||||
@@ -38,14 +38,6 @@ func parse(c *caddy.Controller) ([]Rule, []Rule, error) {
|
|||||||
|
|
||||||
var action string
|
var action string
|
||||||
switch selector {
|
switch selector {
|
||||||
case "set", "clear":
|
|
||||||
log.Warningf("The selector for header rule in line %d isn't explicit defined. "+
|
|
||||||
"Assume rule applies for selector 'response'. This syntax is deprecated. "+
|
|
||||||
"In future versions of CoreDNS the selector must be explicit defined.",
|
|
||||||
c.Line())
|
|
||||||
|
|
||||||
action = selector
|
|
||||||
selector = "response"
|
|
||||||
case "query", "response":
|
case "query", "response":
|
||||||
if c.NextArg() {
|
if c.NextArg() {
|
||||||
action = c.Val()
|
action = c.Val()
|
||||||
|
|||||||
@@ -14,24 +14,18 @@ func TestSetupHeader(t *testing.T) {
|
|||||||
expectedErrContent string
|
expectedErrContent string
|
||||||
}{
|
}{
|
||||||
{`header {}`, true, "Wrong argument count or unexpected line ending after"},
|
{`header {}`, true, "Wrong argument count or unexpected line ending after"},
|
||||||
{`header {
|
|
||||||
set
|
|
||||||
}`, true, "invalid length for flags, at least one should be provided"},
|
|
||||||
{`header {
|
{`header {
|
||||||
foo
|
foo
|
||||||
}`, true, "invalid selector=foo should be query or response"},
|
}`, true, "invalid selector=foo should be query or response"},
|
||||||
|
{`header {
|
||||||
|
response set
|
||||||
|
}`, true, "invalid length for flags, at least one should be provided"},
|
||||||
{`header {
|
{`header {
|
||||||
query foo
|
query foo
|
||||||
}`, true, "invalid length for flags, at least one should be provided"},
|
}`, true, "invalid length for flags, at least one should be provided"},
|
||||||
{`header {
|
{`header {
|
||||||
query foo rd
|
query foo rd
|
||||||
}`, true, "unknown flag action=foo, should be set or clear"},
|
}`, true, "unknown flag action=foo, should be set or clear"},
|
||||||
{`header {
|
|
||||||
set ra
|
|
||||||
}`, false, ""},
|
|
||||||
{`header {
|
|
||||||
clear ra
|
|
||||||
}`, false, ""},
|
|
||||||
{`header {
|
{`header {
|
||||||
query set rd
|
query set rd
|
||||||
}`, false, ""},
|
}`, false, ""},
|
||||||
@@ -39,8 +33,8 @@ func TestSetupHeader(t *testing.T) {
|
|||||||
response set aa
|
response set aa
|
||||||
}`, false, ""},
|
}`, false, ""},
|
||||||
{`header {
|
{`header {
|
||||||
set ra aa
|
response set ra aa
|
||||||
clear rd
|
query clear rd
|
||||||
}`, false, ""},
|
}`, false, ""},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user