LogDog: Use server/auth for authentication.

logdog/server/cmd/logdog_collector/main.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package main
 
 import (
         "fmt"
         "time"
 
-        "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/errors"
         gcps "github.com/luci/luci-go/common/gcloud/pubsub"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/sync/parallel"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         "github.com/luci/luci-go/common/tsmon/types"
         "github.com/luci/luci-go/logdog/server/collector"
         "github.com/luci/luci-go/logdog/server/collector/coordinator"
         "github.com/luci/luci-go/logdog/server/service"
         "golang.org/x/net/context"
 
         "cloud.google.com/go/pubsub"
         "google.golang.org/api/iterator"
-        "google.golang.org/api/option"
 )
 
 var (
         errInvalidConfig = errors.New("invalid configuration")
 )
 
 const (
         pubsubPullErrorDelay = 10 * time.Second
 )
 
@@ skipping 35 matching lines @@
                 return errors.New("missing Pub/Sub configuration")
         }
 
         // Our Subscription must be a valid one.
         sub := gcps.NewSubscription(pscfg.Project, pscfg.Subscription)
         if err := sub.Validate(); err != nil {
                 return fmt.Errorf("invalid Pub/Sub subscription %q: %v", sub, err)
         }
 
         // New PubSub instance with the authenticated client.
-        tokenSource, err := a.TokenSource(c, func(o *auth.Options) {
-                o.Scopes = gcps.SubscriberScopes
-        })
-        if err != nil {
-                log.WithError(err).Errorf(c, "Failed to get Pub/Sub token source.")
-                return err
-        }
-        psClient, err := pubsub.NewClient(c, pscfg.Project, option.WithTokenSource(tokenSource))
+        psClient, err := a.Service.PubSubSubscriberClient(c, pscfg.Project)
         if err != nil {
                 log.Fields{
                         log.ErrorKey:   err,
                         "subscription": sub,
                 }.Errorf(c, "Failed to create Pub/Sub client.")
                 return err
         }
 
         psSub := psClient.Subscription(pscfg.Subscription)
         exists, err := psSub.Exists(c)
@@ skipping 119 matching lines @@
 
 // Entry point.
 func main() {
         a := application{
                 Service: service.Service{
                         Name: "collector",
                 },
         }
         a.Run(context.Background(), a.runCollector)
 }