Merge pull request #139 from coreos/webhook_proxy

Add proxy parameter to webhook notifier

config.example.yaml

@@ -72,3 +72,6 @@ clair:
       cafile:
       keyfile:
       certfile:
+
+      # Optional HTTP Proxy: must be a valid URL (including the scheme).
+      proxy:

notifier/notifiers/webhook.go

@@ -49,6 +49,7 @@ type WebhookNotifierConfiguration struct {
 	CertFile   string
 	KeyFile    string
 	CAFile     string
+	Proxy      string
 }
 
 func init() {
@@ -77,23 +78,33 @@ func (h *WebhookNotifier) Configure(config *config.NotifierConfig) (bool, error)
 	if httpConfig.Endpoint == "" {
 		return false, nil
 	}
-	if _, err := url.Parse(httpConfig.Endpoint); err != nil {
+	if _, err := url.ParseRequestURI(httpConfig.Endpoint); err != nil {
-		return false, errors.New("invalid endpoint URL")
+		return false, fmt.Errorf("could not parse endpoint URL: %s\n", err)
 	}
 	h.endpoint = httpConfig.Endpoint
 
+	// Setup HTTP client.
+	transport := &http.Transport{}
+	h.client = &http.Client{
+		Transport: transport,
+		Timeout:   timeout,
+	}
+
 	// Initialize TLS.
-	tlsConfig, err := loadTLSClientConfig(&httpConfig)
+	transport.TLSClientConfig, err = loadTLSClientConfig(&httpConfig)
 	if err != nil {
 		return false, fmt.Errorf("could not initialize client cert auth: %s\n", err)
 	}
 
-	h.client = &http.Client{
+	// Set proxy.
-		Transport: &http.Transport{
+	if httpConfig.Proxy != "" {
-			TLSClientConfig: tlsConfig,
+		proxyURL, err := url.ParseRequestURI(httpConfig.Proxy)
-		},
+		if err != nil {
-		Timeout: timeout,
+			return false, fmt.Errorf("could not parse proxy URL: %s\n", err)
 		}
+		transport.Proxy = http.ProxyURL(proxyURL)
+	}
+
 	return true, nil
 }