logdog: Use gRPC credentials when creating PubSub client, not http.Client.

logdog/appengine/coordinator/service.go

 // Copyright 2015 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 coordinator
 
 import (
-        "net/http"
         "sync"
         "sync/atomic"
         "time"
 
         "github.com/luci/luci-go/appengine/gaeauth/server/gaesigner"
         "github.com/luci/luci-go/appengine/gaemiddleware"
         "github.com/luci/luci-go/common/clock"
         luciConfig "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/gcloud/gs"
@@ skipping 305 matching lines @@
         if err := fullTopic.Validate(); err != nil {
                 log.Fields{
                         log.ErrorKey: err,
                         "topic":      fullTopic,
                 }.Errorf(c, "Failed to validate archival topic.")
                 return nil, errors.New("invalid archival topic")
         }
         project, topic := fullTopic.Split()
 
         // Create an authenticated Pub/Sub client.
-        transport, err := auth.GetRPCTransport(c, auth.AsSelf, auth.WithScopes(pubsub.PublisherScopes...))
+        creds, err := auth.GetPerRPCCredentials(auth.AsSelf, auth.WithScopes(pubsub.PublisherScopes...))
         if err != nil {
-                log.WithError(err).Errorf(c, "Failed to create Pub/Sub authenticator.")
-                return nil, errors.New("failed to create Pub/Sub authenticator")
+                log.WithError(err).Errorf(c, "Failed to create Pub/Sub credentials.")
+                return nil, errors.New("failed to create Pub/Sub credentials")
         }
-        client := &http.Client{Transport: transport}
-        psClient, err := gcps.NewClient(c, project, option.WithHTTPClient(client))
+        // Don't pass gRPC metadata to PubSub.
+        psClient, err := gcps.NewClient(
+                metadata.NewContext(c, nil), project,
+                option.WithGRPCDialOption(grpc.WithPerRPCCredentials(creds)))
         if err != nil {
                 log.WithError(err).Errorf(c, "Failed to create Pub/Sub client.")
                 return nil, errors.New("failed to create Pub/Sub client")
         }
 
         return &pubsubArchivalPublisher{
+                client:           psClient,
                 topic:            psClient.Topic(topic),
                 publishIndexFunc: s.nextArchiveIndex,
         }, nil
 }
 
 func (s *prodServicesInst) nextArchiveIndex() uint64 {
         // We use a 32-bit value for this because it avoids atomic memory bounary
         // issues. Furthermore, we constrain it to be positive, using a negative
         // value as a sentinel that the archival index has wrapped.
         //
@@ skipping 136 matching lines @@
 
         // Sign index URL.
         if req.Index {
                 if resp.Index, err = doSign(si.index); err != nil {
                         return nil, errors.Annotate(err).InternalReason("failed to sign index URL").Err()
                 }
         }
 
         return &resp, nil
 }