LogDog: Use server/auth for authentication.

logdog/server/cmd/logdog_archivist/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 (
         "time"
 
-        "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/gcloud/gs"
         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/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/server/archivist"
         "github.com/luci/luci-go/logdog/server/service"
         "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "cloud.google.com/go/pubsub"
         "golang.org/x/net/context"
         "google.golang.org/api/iterator"
-        "google.golang.org/api/option"
 )
 
 var (
         errInvalidConfig = errors.New("invalid configuration")
 
         // tsTaskProcessingTime measures the amount of time spent processing a single
         // task.
         //
         // The "consumed" field is true if the underlying task was consumed and
         // false if it was not.
@@ skipping 38 matching lines @@
         taskSub := gcps.Subscription(acfg.Subscription)
         if err := taskSub.Validate(); err != nil {
                 log.Fields{
                         log.ErrorKey: err,
                         "value":      taskSub,
                 }.Errorf(c, "Task subscription did not validate.")
                 return errors.New("invalid task subscription name")
         }
         psProject, psSubscriptionName := taskSub.Split()
 
-        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
-        }
-
-        // Pub/Sub: TokenSource => Client
-        psClient, err := pubsub.NewClient(c, psProject, option.WithTokenSource(tokenSource))
+        // New PubSub instance with the authenticated client.
+        psClient, err := a.Service.PubSubSubscriberClient(c, psProject)
         if err != nil {
                 log.WithError(err).Errorf(c, "Failed to create Pub/Sub client.")
                 return err
         }
         sub := psClient.Subscription(psSubscriptionName)
 
         // Initialize our Storage.
         st, err := a.IntermediateStorage(c)
         if err != nil {
                 log.WithError(err).Errorf(c, "Failed to get storage instance.")
@@ skipping 160 matching lines @@
 
 // Entry point.
 func main() {
         a := application{
                 Service: service.Service{
                         Name: "archivist",
                 },
         }
         a.Run(context.Background(), a.runArchivist)
 }