LogDog: Update to archival V2.

appengine/logdog/coordinator/endpoints/logs/query.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package logs
 
 import (
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/luci-go/appengine/logdog/coordinator"
-        "github.com/luci/luci-go/appengine/logdog/coordinator/config"
         "github.com/luci/luci-go/common/api/logdog_coordinator/logs/v1"
         "github.com/luci/luci-go/common/grpcutil"
         "github.com/luci/luci-go/common/logdog/types"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/logdog/logpb"
         "golang.org/x/net/context"
         "google.golang.org/grpc/codes"
 )
 
 const (
@@ skipping 17 matching lines @@
                 return f(q, false)
 
         default:
                 // Default is "both".
                 return q
         }
 }
 
 // Query returns log stream paths that match the requested query.
 func (s *Server) Query(c context.Context, req *logdog.QueryRequest) (*logdog.QueryResponse, error) {
+        svc := s.GetServices()
+
         // Non-admin users may not request purged results.
         canSeePurged := true
-        if err := config.IsAdminUser(c); err != nil {
+        if err := coordinator.IsAdminUser(c, svc); err != nil {
                 canSeePurged = false
 
                 // Non-admin user.
                 if req.Purged == logdog.QueryRequest_YES {
                         log.Fields{
                                 log.ErrorKey: err,
                         }.Errorf(c, "Non-superuser requested to see purged logs. Denying.")
                         return nil, grpcutil.Errf(codes.InvalidArgument, "non-admin user cannot request purged log streams")
                 }
         }
@@ skipping 169 matching lines @@
                 return grpcutil.Internal
         }
 
         resp.Streams = streams
         if cursor != nil {
                 resp.Next = cursor.String()
         }
 
         return nil
 }