TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

plugins: set upstream unconditionally (#2956)

Browse source 
`upstream` is not needed as a setting; just set if unconditionally and
remove all documentation and tests for it.

At some point we want remove the hanlding for `upstream` as well and
error out on seeing it.

Signed-off-by: Miek Gieben <miek@miek.nl>
This commit is contained in:
Miek Gieben 2019-07-02 16:23:47 +01:00 • committed by GitHub
parent 3a0c7c6153
commit 22c6e3e179
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
22 changed files with 28 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugin/auto/README.md
View file

@ -18,7 +18,6 @@ auto [ZONES...] {
directory DIR [REGEXP ORIGIN_TEMPLATE]
transfer to ADDRESS...
reload DURATION
upstream
}
~~~
@ -37,8 +36,6 @@ are used.
* `reload` interval to perform reloads of zones if SOA version changes and zonefiles. It specifies how often CoreDNS should scan the directory to watch for file removal and addition. Default is one minute.
Value of `0` means to not scan for changes and reload. eg. `30s` checks zonefile every 30 seconds
and reloads zone when serial changes.
* `upstream` defines upstream resolvers to be used resolve external names found (think CNAMEs)
pointing to external names. CoreDNS will resolve CNAMEs against itself.
All directives from the *file* plugin are supported. Note that *auto* will load all zones found,
even though the directive might only receive queries for a specific zone. I.e:

3
plugin/auto/setup.go
View file

@ -100,6 +100,7 @@ func autoParse(c *caddy.Controller) (Auto, error) {
for i := range a.Zones.origins {
a.Zones.origins[i] = plugin.Host(a.Zones.origins[i]).Normalize()
}
a.loader.upstream = upstream.New()
for c.NextBlock() {
switch c.Val() {
@ -148,8 +149,8 @@ func autoParse(c *caddy.Controller) (Auto, error) {
a.loader.ReloadInterval = d
case "upstream":
// remove soon
c.RemainingArgs() // eat remaining args
a.loader.upstream = upstream.New()
case "transfer":
t, _, e := parse.Transfer(c, false)

1
plugin/auto/setup_test.go
View file

@ -55,7 +55,6 @@ func TestAutoParse(t *testing.T) {
directory /tmp (.*) bliep
transfer to 127.0.0.1
transfer to 127.0.0.2
upstream 8.8.8.8
}`,
false, "/tmp", "bliep", `(.*)`, 60 * time.Second, []string{"127.0.0.1:53", "127.0.0.2:53"},
},