LogDog: Update to archival V2.

appengine/logdog/coordinator/auth.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 config
+package coordinator
 
 import (
         "errors"
         "fmt"
 
         "github.com/luci/gae/service/info"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/logdog/svcconfig"
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/identity"
         "golang.org/x/net/context"
 )
 
 // IsAdminUser tests whether the current user belongs to the administrative
 // users group. It will return an error if the user does not.
-func IsAdminUser(c context.Context) error {
-        return isMember(c, func(cfg *svcconfig.Coordinator) string {
+func IsAdminUser(c context.Context, svc Services) error {
+        return isMember(c, svc, func(cfg *svcconfig.Coordinator) string {
                 return cfg.AdminAuthGroup
         })
 }
 
 // IsServiceUser tests whether the current user belongs to the backend services
 // users group. It will return an error if the user does not.
-func IsServiceUser(c context.Context) error {
-        return isMember(c, func(cfg *svcconfig.Coordinator) string {
+func IsServiceUser(c context.Context, svc Services) error {
+        return isMember(c, svc, func(cfg *svcconfig.Coordinator) string {
                 return cfg.ServiceAuthGroup
         })
 }
 
-func isMember(c context.Context, groupNameFunc func(*svcconfig.Coordinator) string) error {
-        cfg, err := Load(c)
+func isMember(c context.Context, svc Services, groupNameFunc func(*svcconfig.Coordinator) string) error {
+        _, cfg, err := svc.Config(c)
         if err != nil {
                 return err
         }
 
         // On dev-appserver, the superuser has implicit group membership to
         // everything.
         if info.Get(c).IsDevAppServer() {
                 if u := auth.CurrentUser(c); u.Superuser {
                         log.Fields{
                                 "identity": u.Identity,
@@ skipping 33 matching lines @@
 
 func (e *MembershipError) Error() string {
         return fmt.Sprintf("user %q is not a member of group %q", e.Identity, e.Group)
 }
 
 // IsMembershipError returns whether a given error is a membership error.
 func IsMembershipError(e error) bool {
         _, ok := e.(*MembershipError)
         return ok
 }