middleware/proxy: absorb httpproxy (#481)

* middleware/proxy: absorb httpproxy

Move the httproxy into proxy. This adds and Exchanger interface which
is used to exchange the messages with the upstream.

The https_google upstream will re-resolve itself and update the upstream
hosts used every 300s.

* Remove and add TODO

1 files changed, 0 insertions, 70 deletions

diff --git a/middleware/httpproxy/setup_test.go b/middleware/httpproxy/setup_test.go
deleted file mode 100644
index 82db40aff..000000000
--- a/middleware/httpproxy/setup_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package httpproxy
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/mholt/caddy"
-)
-
-func TestSetupHttpproxy(t *testing.T) {
-	log.SetOutput(ioutil.Discard)
-
-	tests := []struct {
-		input              string
-		shouldErr          bool
-		expectedFrom       string // expected from.
-		expectedErrContent string // substring from the expected error. Empty for positive cases.
-	}{
-		// ok
-		{
-			`httpproxy . dns.google.com`, false, "", "",
-		},
-		{
-			`httpproxy . dns.google.com {
-				upstream 8.8.8.8:53
-			}`, false, "", "",
-		},
-		{
-			`httpproxy . dns.google.com {
-				upstream resolv.conf
-			}`, false, "", "",
-		},
-		// fail
-		{
-			`httpproxy`, true, "", "Wrong argument count or unexpected line ending after",
-		},
-		{
-			`httpproxy . wns.google.com`, true, "", "unknown http proxy",
-		},
-	}
-
-	// Write fake resolv.conf for test
-	err := ioutil.WriteFile("resolv.conf", []byte("nameserver 127.0.0.1\n"), 0600)
-	if err != nil {
-		t.Fatalf("Failed to write test resolv.conf")
-	}
-	defer os.Remove("resolv.conf")
-
-	for i, test := range tests {
-		c := caddy.NewTestController("dns", test.input)
-		_, err := httpproxyParse(c)
-
-		if test.shouldErr && err == nil {
-			t.Errorf("Test %d: Expected error but found %s for input %s", i, err, test.input)
-		}
-
-		if err != nil {
-			if !test.shouldErr {
-				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
-			}
-
-			if !strings.Contains(err.Error(), test.expectedErrContent) {
-				t.Errorf("Test %d: Expected error to contain: %v, found error: %v, input: %s", i, test.expectedErrContent, err, test.input)
-			}
-		}
-	}
-}