Add server/cache support to gaeconfig.

dm/appengine/deps/auth.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 deps
 
 import (
-        "fmt"
-        "strings"
-
-        "google.golang.org/grpc/codes"
-
-        "github.com/golang/protobuf/proto"
-        "github.com/luci/gae/service/info"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/dm/api/acls"
         "github.com/luci/luci-go/grpc/grpcutil"
+        "github.com/luci/luci-go/luci_config/server/cfgclient"
+        "github.com/luci/luci-go/luci_config/server/cfgclient/textproto"
         "github.com/luci/luci-go/server/auth"
+
         "golang.org/x/net/context"
+        "google.golang.org/grpc/codes"
 )
 
-func getTrimmedAppID(c context.Context) string {
-        // custom domains show up as "foo.com:appid"
-        toks := strings.Split(info.AppID(c), ":")
-        return toks[len(toks)-1]
-}
+func loadAcls(c context.Context) (ret *acls.Acls, err error) {
+        cSet := cfgclient.CurrentServiceConfigSet(c)
+        file := "acls.cfg"
 
-func loadAcls(c context.Context) (ret *acls.Acls, err error) {
-        aid := getTrimmedAppID(c)
-        cSet := fmt.Sprintf("services/%s", aid)
-        file := "acls.cfg"
-        aclCfg, err := config.GetConfig(c, cSet, file, false)
-        if err != nil {
+        ret = &acls.Acls{}
+        if err := cfgclient.Get(c, cfgclient.AsService, cSet, file, textproto.Message(ret), nil); err != nil {
                 return nil, errors.Annotate(err).Transient().
                         D("cSet", cSet).D("file", file).InternalReason("loading config").Err()
         }
-
-        ret = &acls.Acls{}
-        err = proto.UnmarshalText(aclCfg.Content, ret)
         return
 }
 
 func inGroups(c context.Context, groups []string) error {
         for _, grp := range groups {
                 ok, err := auth.IsMember(c, grp)
                 if err != nil {
                         return grpcutil.Annotate(err, codes.Internal).Reason("failed group check").Err()
                 }
                 if ok {
@@ skipping 18 matching lines @@
         return
 }
 
 func canWrite(c context.Context) (err error) {
         acl, err := loadAcls(c)
         if err != nil {
                 return
         }
         return inGroups(c, acl.Writers)
 }