Uses gosteno logger for UaaTokenFetcher.

- Also creates a New constructor for UaaTokenFetcher

datadogfirehosenozzle/datadog_firehose_nozzle_test.go

@@ -43,10 +43,6 @@ var _ = Describe("Datadog Firehose Nozzle", func() {
 		fakeFirehose.Start()
 		fakeDatadogAPI.Start()
 
-		tokenFetcher := &uaatokenfetcher.UAATokenFetcher{
-			UaaUrl: fakeUAA.URL(),
-		}
-
 		config = &nozzleconfig.NozzleConfig{
 			UAAURL:               fakeUAA.URL(),
 			FlushDurationSeconds: 10,
@@ -65,6 +61,7 @@ var _ = Describe("Datadog Firehose Nozzle", func() {
 		}
 		gosteno.Init(c)
 		log = gosteno.NewLogger("test")
+		tokenFetcher := uaatokenfetcher.New(fakeUAA.URL(), "un", "pwd", true, log)
 		nozzle = datadogfirehosenozzle.NewDatadogFirehoseNozzle(config, tokenFetcher, log)
 	})
 

main.go

@@ -29,12 +29,7 @@ func main() {
 		log.Fatalf("Error parsing config: %s", err.Error())
 	}
 
-	tokenFetcher := &uaatokenfetcher.UAATokenFetcher{
-		UaaUrl:                config.UAAURL,
-		Username:              config.Username,
-		Password:              config.Password,
-		InsecureSSLSkipVerify: config.InsecureSSLSkipVerify,
-	}
+	tokenFetcher := uaatokenfetcher.New(config.UAAURL, config.Username, config.Password, config.InsecureSSLSkipVerify, log)
 
 	threadDumpChan := registerGoRoutineDumpSignalChannel()
 	defer close(threadDumpChan)

uaatokenfetcher/uaa_token_fetcher.go

@@ -2,26 +2,37 @@ package uaatokenfetcher
 
 import (
 	"github.com/cloudfoundry-incubator/uaago"
-	"log"
+	"github.com/cloudfoundry/gosteno"
 )
 
 type UAATokenFetcher struct {
-	UaaUrl                string
-	Username              string
-	Password              string
-	InsecureSSLSkipVerify bool
+	uaaUrl                string
+	username              string
+	password              string
+	insecureSSLSkipVerify bool
+	log                   *gosteno.Logger
+}
+
+func New(uaaUrl string, username string, password string, sslSkipVerify bool, logger *gosteno.Logger) *UAATokenFetcher {
+	return &UAATokenFetcher{
+		uaaUrl:                uaaUrl,
+		username:              username,
+		password:              password,
+		insecureSSLSkipVerify: sslSkipVerify,
+		log: logger,
+	}
 }
 
 func (uaa *UAATokenFetcher) FetchAuthToken() string {
-	uaaClient, err := uaago.NewClient(uaa.UaaUrl)
+	uaaClient, err := uaago.NewClient(uaa.uaaUrl)
 	if err != nil {
-		log.Fatalf("Error creating uaa client: %s", err.Error())
+		uaa.log.Fatalf("Error creating uaa client: %s", err.Error())
 	}
 
 	var authToken string
-	authToken, err = uaaClient.GetAuthToken(uaa.Username, uaa.Password, uaa.InsecureSSLSkipVerify)
+	authToken, err = uaaClient.GetAuthToken(uaa.username, uaa.password, uaa.insecureSSLSkipVerify)
 	if err != nil {
-		log.Fatalf("Error getting oauth token: %s. Please check your username and password.", err.Error())
+		uaa.log.Fatalf("Error getting oauth token: %s. Please check your username and password.", err.Error())
 	}
 	return authToken
 }

uaatokenfetcher/uaa_token_fetcher_test.go

@@ -2,25 +2,28 @@ package uaatokenfetcher_test
 
 import (
 	"github.com/cloudfoundry-incubator/datadog-firehose-nozzle/uaatokenfetcher"
+	"github.com/cloudfoundry/gosteno"
 
 	"github.com/cloudfoundry-incubator/datadog-firehose-nozzle/testhelpers"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("UaaTokenFetcher", func() {
-	var tokenFetcher *uaatokenfetcher.UAATokenFetcher
-	var fakeUAA *testhelpers.FakeUAA
-	var fakeToken string
+	var (
+		tokenFetcher *uaatokenfetcher.UAATokenFetcher
+		fakeUAA      *testhelpers.FakeUAA
+		fakeToken    string
+		fakeLogger   *gosteno.Logger
+	)
 
 	BeforeEach(func() {
+		fakeLogger = testhelpers.Logger()
 		fakeUAA = testhelpers.NewFakeUAA("bearer", "123456789")
 		fakeToken = fakeUAA.AuthToken()
 		fakeUAA.Start()
 
-		tokenFetcher = &uaatokenfetcher.UAATokenFetcher{
-			UaaUrl: fakeUAA.URL(),
-		}
+		tokenFetcher = uaatokenfetcher.New(fakeUAA.URL(), "username", "password", true, fakeLogger)
 	})
 
 	It("fetches a token from the UAA", func() {