Reinstate "Provide path to uaa client""

This reverts commit 3e04b06.

Signed-off-by: Zachary Auerbach <zauerbach@pivotal.io>

Author: tylerschultz

uaa/factory.go

@@ -56,6 +56,7 @@ func (f Factory) httpClient(config Config) (Client, error) {
 		Scheme: "https",
 		Host:   fmt.Sprintf("%s:%d", config.Host, config.Port),
 		User:   url.UserPassword(config.Client, config.ClientSecret),
+		Path:   config.Path,
 	}
 
 	return NewClient(endpoint.String(), httpClient, f.logger), nil

uaa/factory_config.go

@@ -14,6 +14,7 @@ import (
 type Config struct {
 	Host string
 	Port int
+	Path string
 
 	Client       string
 	ClientSecret string
@@ -33,9 +34,11 @@ func NewConfigFromURL(url string) (Config, error) {
 
 	host := parsedURL.Host
 	port := 443
+	path := parsedURL.Path
 
 	if len(host) == 0 {
 		host = url
+		path = ""
 	}
 
 	if strings.Contains(host, ":") {
@@ -58,7 +61,7 @@ func NewConfigFromURL(url string) (Config, error) {
 		return Config{}, bosherr.Errorf("Expected to extract host from URL '%s'", url)
 	}
 
-	return Config{Host: host, Port: port}, nil
+	return Config{Host: host, Port: port, Path: path}, nil
 }
 
 func (c Config) Validate() error {

uaa/factory_config_test.go

@@ -32,6 +32,12 @@ var _ = Describe("NewConfigFromURL", func() {
 		Expect(config).To(Equal(Config{Host: "host", Port: 4443}))
 	})
 
+	It("extracts path if path is provided", func() {
+		config, err := NewConfigFromURL("httsp://host:4443/zakrules")
+		Expect(err).ToNot(HaveOccurred())
+		Expect(config).To(Equal(Config{Host: "host", Port: 4443, Path: "/zakrules"}))
+	})
+
 	It("returns error if url is empty", func() {
 		_, err := NewConfigFromURL("")
 		Expect(err).To(HaveOccurred())

uaa/factory_test.go

@@ -2,6 +2,7 @@ package uaa_test
 
 import (
 	"crypto/tls"
+	"fmt"
 	"net/http"
 
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
@@ -74,5 +75,44 @@ var _ = Describe("Factory", func() {
 			_, err = uaa.ClientCredentialsGrant()
 			Expect(err).ToNot(HaveOccurred())
 		})
+
+		Context("when the server url has a context path", func() {
+			It("properly follows that path", func() {
+				server := ghttp.NewUnstartedServer()
+
+				cert, err := tls.X509KeyPair(validCert, validKey)
+				Expect(err).ToNot(HaveOccurred())
+
+				server.HTTPTestServer.TLS = &tls.Config{
+					Certificates: []tls.Certificate{cert},
+				}
+
+				server.HTTPTestServer.StartTLS()
+
+				config, err := NewConfigFromURL(fmt.Sprintf("%s/test_path", server.URL()))
+				Expect(err).ToNot(HaveOccurred())
+
+				config.Client = "client"
+				config.ClientSecret = "client-secret"
+				config.CACert = validCACert
+
+				logger := boshlog.NewLogger(boshlog.LevelNone)
+
+				uaa, err := NewFactory(logger).New(config)
+				Expect(err).ToNot(HaveOccurred())
+
+				server.AppendHandlers(
+					ghttp.CombineHandlers(
+						ghttp.VerifyRequest("POST", "/test_path/oauth/token", "grant_type=client_credentials"),
+						ghttp.VerifyBasicAuth("client", "client-secret"),
+						ghttp.RespondWith(http.StatusOK, `{}`),
+					),
+				)
+
+				_, err = uaa.ClientCredentialsGrant()
+				Expect(err).ToNot(HaveOccurred())
+
+			})
+		})
 	})
 })