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>

plugin/etcd/README.md

@@ -32,7 +32,6 @@ etcd [ZONES...] {
     path PATH
     endpoint ENDPOINT...
     credentials USERNAME PASSWORD
-    upstream
     tls CERT KEY CACERT
 }
 ~~~
@@ -44,9 +43,6 @@ etcd [ZONES...] {
 * **PATH** the path inside etcd. Defaults to "/skydns".
 * **ENDPOINT** the etcd endpoints. Defaults to "http://localhost:2379".
 * `credentials` is used to set the **USERNAME** and **PASSWORD** for accessing the etcd cluster.
-* `upstream` upstream resolvers to be used resolve external names found in etcd (think CNAMEs)
-  pointing to external names. If you want CoreDNS to act as a proxy for clients, you'll need to add
-  the *forward* plugin.
 * `tls` followed by:
 
     * no arguments, if the server certificate is signed by a system-installed CA and no client cert is needed
@@ -78,7 +74,6 @@ This is the default SkyDNS setup, with everything specified in full:
     etcd skydns.local {
         path /skydns
         endpoint http://localhost:2379
-        upstream
     }
     prometheus
     cache 160 skydns.local
@@ -94,7 +89,6 @@ when resolving external pointing CNAMEs.
 . {
     etcd skydns.local {
         path /skydns
-        upstream
     }
     cache 160 skydns.local
     forward . /etc/resolv.conf

plugin/etcd/setup.go

@@ -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...)

plugin/etcd/setup_test.go

@@ -34,20 +34,6 @@ func TestSetupEtcd(t *testing.T) {
 	endpoint localhost:300
 }
 `, false, "skydns", []string{"localhost:300"}, "", "", "",
-		},
-		//test for upstream
-		{
-			`etcd {
-	endpoint localhost:300
-	upstream 8.8.8.8:53 8.8.4.4:53
-}`, false, "skydns", []string{"localhost:300"}, "", "", "",
-		},
-		//test for optional upstream address
-		{
-			`etcd {
-	endpoint localhost:300
-	upstream
-}`, false, "skydns", []string{"localhost:300"}, "", "", "",
 		},
 		// negative
 		{