plugins: set upstream unconditionally (#2956)

`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

View file

@ -45,6 +45,9 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) {
username string
password string
)
etc.Upstream = upstream.New()
for c.Next() {
etc.Zones = c.RemainingArgs()
if len(etc.Zones) == 0 {
@ -75,9 +78,8 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) {
}
endpoints = args
case "upstream":
// check args != 0 and error in the future
c.RemainingArgs() // clear buffer
etc.Upstream = upstream.New()
// remove soon
c.RemainingArgs()
case "tls": // cert key cacertfile
args := c.RemainingArgs()
tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...)