Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1582)

Unified Diff: appengine/logdog/coordinator/endpoints/admin/setConfig.go

Issue 1863973002: LogDog: Update to archival V2. (Closed) Base URL: https://github.com/luci/luci-go@grpcutil-errors
Patch Set: Code review comments, use Pub/Sub, archival staging, quality of life. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: appengine/logdog/coordinator/endpoints/admin/setConfig.go
diff --git a/appengine/logdog/coordinator/endpoints/admin/setConfig.go b/appengine/logdog/coordinator/endpoints/admin/setConfig.go
index 028a5a8a5642836db2f707201d86729ba0daca30..fc20cba611798844fb10b4a3f9ab8fa142701712 100644
--- a/appengine/logdog/coordinator/endpoints/admin/setConfig.go
+++ b/appengine/logdog/coordinator/endpoints/admin/setConfig.go
@@ -5,13 +5,11 @@
package admin
import (
- "github.com/luci/gae/service/info"
"github.com/luci/luci-go/appengine/logdog/coordinator/config"
"github.com/luci/luci-go/common/api/logdog_coordinator/admin/v1"
"github.com/luci/luci-go/common/grpcutil"
log "github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/common/proto/google"
- "github.com/luci/luci-go/server/auth"
"golang.org/x/net/context"
"google.golang.org/grpc/codes"
)
@@ -19,25 +17,9 @@ import (
// SetConfig loads the supplied configuration into a config.GlobalConfig
// instance.
func (s *Server) SetConfig(c context.Context, req *logdog.SetConfigRequest) (*google.Empty, error) {
- // The user must be an administrator.
- if err := config.IsAdminUser(c); err != nil {
- log.Fields{
- log.ErrorKey: err,
- }.Warningf(c, "User is not an administrator.")
-
- // If we're on development server, any user can set the initial config.
- if !info.Get(c).IsDevAppServer() {
- u := auth.CurrentUser(c)
- if !(u != nil && u.Superuser) {
- return nil, grpcutil.PermissionDenied
- }
-
- log.Fields{
- "email": u.Email,
- "clientID": u.ClientID,
- "name": u.Name,
- }.Infof(c, "User is an AppEngine superuser. Granting access.")
- }
+ svc := s.GetServices()
+ if err := s.Auth(c, svc); err != nil {
+ return nil, err
}
gcfg := config.GlobalConfig{

Powered by Google App Engine
This is Rietveld 408576698