* updated token refresh mechanism and uaago lib (#201)

added clientid and client-secret for refresh token mechanism.

Author: luckyj5

cache/boltdb.go

@@ -359,6 +359,7 @@ func (c *Boltdb) fromPCFApp(app *cfclient.App) *App {
 		Guid:       app.Guid,
 		SpaceGuid:  app.SpaceGuid,
 		IgnoredApp: c.isOptOut(app.Environment),
+		CfAppEnv:   app.Environment,
 	}
 
 	c.fillOrgAndSpace(cachedApp)

glide.lock

@@ -11,9 +11,11 @@ import (
 )
 
 type Config struct {
-	ApiEndpoint string `json:"api-endpoint"`
-	User        string `json:"-"`
-	Password    string `json:"-"`
+	ApiEndpoint  string `json:"api-endpoint"`
+	User         string `json:"-"`
+	Password     string `json:"-"`
+	ClientID     string `json:"-"`
+	ClientSecret string `json:"-"`
 
 	SplunkToken string `json:"-"`
 	SplunkHost  string `json:"splunk-host"`
@@ -67,9 +69,13 @@ func NewConfigFromCmdFlags(version, branch, commit, buildos string) *Config {
 	kingpin.Flag("api-endpoint", "API endpoint address").
 		OverrideDefaultFromEnvar("API_ENDPOINT").Required().StringVar(&c.ApiEndpoint)
 	kingpin.Flag("user", "Admin user.").
-		OverrideDefaultFromEnvar("API_USER").Required().StringVar(&c.User)
+		OverrideDefaultFromEnvar("API_USER").StringVar(&c.User)
 	kingpin.Flag("password", "Admin password.").
-		OverrideDefaultFromEnvar("API_PASSWORD").Required().StringVar(&c.Password)
+		OverrideDefaultFromEnvar("API_PASSWORD").StringVar(&c.Password)
+	kingpin.Flag("client-id", "Client ID.").
+		OverrideDefaultFromEnvar("CLIENT_ID").Required().StringVar(&c.ClientID)
+	kingpin.Flag("client-secret", "Client secret.").
+		OverrideDefaultFromEnvar("CLIENT_SECRET").Required().StringVar(&c.ClientSecret)
 
 	kingpin.Flag("splunk-host", "Splunk HTTP event collector host").
 		OverrideDefaultFromEnvar("SPLUNK_HOST").Required().StringVar(&c.SplunkHost)

splunknozzle/config.go

@@ -28,6 +28,8 @@ var _ = Describe("Config", func() {
 			os.Setenv("API_ENDPOINT", "api.bosh-lite.com")
 			os.Setenv("API_USER", "admin")
 			os.Setenv("API_PASSWORD", "abc123")
+			os.Setenv("CLIENT_ID", "client123")
+			os.Setenv("CLIENT_SECRET", "secret123")
 
 			os.Setenv("SPLUNK_TOKEN", "sometoken")
 			os.Setenv("SPLUNK_HOST", "splunk.example.com")
@@ -69,6 +71,8 @@ var _ = Describe("Config", func() {
 			Expect(c.ApiEndpoint).To(Equal("api.bosh-lite.com"))
 			Expect(c.User).To(Equal("admin"))
 			Expect(c.Password).To(Equal("abc123"))
+			Expect(c.ClientID).To(Equal("client123"))
+			Expect(c.ClientSecret).To(Equal("secret123"))
 
 			Expect(c.SplunkHost).To(Equal("splunk.example.com"))
 			Expect(c.SplunkToken).To(Equal("sometoken"))
@@ -160,6 +164,8 @@ var _ = Describe("Config", func() {
 				"--api-endpoint=api.bosh-lite.comc",
 				"--user=adminc",
 				"--password=abc123c",
+				"--client-id=client123",
+				"--client-secret=secret123",
 				"--splunk-host=splunk.example.comc",
 				"--splunk-token=sometokenc",
 				"--splunk-index=splunk_indexc",
@@ -196,6 +202,8 @@ var _ = Describe("Config", func() {
 			Expect(c.ApiEndpoint).To(Equal("api.bosh-lite.comc"))
 			Expect(c.User).To(Equal("adminc"))
 			Expect(c.Password).To(Equal("abc123c"))
+			Expect(c.ClientID).To(Equal("client123"))
+			Expect(c.ClientSecret).To(Equal("secret123"))
 
 			Expect(c.SplunkHost).To(Equal("splunk.example.comc"))
 			Expect(c.SplunkToken).To(Equal("sometokenc"))

splunknozzle/config_test.go

@@ -43,6 +43,8 @@ func (s *SplunkFirehoseNozzle) PCFClient() (*cfclient.Client, error) {
 		Username:          s.config.User,
 		Password:          s.config.Password,
 		SkipSslValidation: s.config.SkipSSLCF,
+		ClientID:          s.config.ClientID,
+		ClientSecret:      s.config.ClientSecret,
 	}
 
 	return cfclient.NewClient(cfConfig)
@@ -80,7 +82,6 @@ func (s *SplunkFirehoseNozzle) EventSink(logger lager.Logger) (eventsink.Sink, e
 		Logger:  logger,
 	}
 
-
 	var writers []eventwriter.Writer
 	for i := 0; i < s.config.HecWorkers+1; i++ {
 		splunkWriter := eventwriter.NewSplunk(writerConfig)

splunknozzle/nozzle.go

@@ -16,9 +16,11 @@ import (
 
 func newConfig() *Config {
 	return &Config{
-		ApiEndpoint: "http://localhost:9911",
-		User:        "admin",
-		Password:    "admin",
+		ApiEndpoint:  "http://localhost:9911",
+		User:         "admin",
+		Password:     "admin",
+		ClientID:     "admin",
+		ClientSecret: "admin",
 
 		SplunkToken: "token",
 		SplunkHost:  "localhost:8088",

splunknozzle/nozzle_test.go

@@ -5,4 +5,5 @@ history:
 - 1.0.1
 - 1.0.2
 - 1.1.0
-version: 1.1.1
+- 1.1.1
+version: 1.1.2

tile/tile-history.yml

@@ -52,14 +52,24 @@ forms:
     type: string
     label: API Endpoint
     description: Cloud Foundry API endpoint.
+  - name: client_id
+    type: string
+    label: Client ID
+    description: CF UAA client ID
+  - name: client_secret
+    type: secret
+    label: Client Secret
+    description: CF UAA client secret
   - name: api_user
     type: string
     label: API User
     description: API username
+    optional: true
   - name: api_password
     type: secret
     label: API Password
     description: Password for API user
+    optional: true
   - name: skip_ssl_validation_cf
     type: boolean
     label: Skip SSL Validation