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

Unified Diff: appengine/logdog/coordinator/endpoints/logs/query.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/logs/query.go
diff --git a/appengine/logdog/coordinator/endpoints/logs/query.go b/appengine/logdog/coordinator/endpoints/logs/query.go
index 924d453dd245ac157fc612db555e7d7356df340c..3d0ff5c49e09d34aa2837e54655198755b74748c 100644
--- a/appengine/logdog/coordinator/endpoints/logs/query.go
+++ b/appengine/logdog/coordinator/endpoints/logs/query.go
@@ -7,7 +7,6 @@ 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"
@@ -45,9 +44,11 @@ func applyTrinary(q *ds.Query, v logdog.QueryRequest_Trinary, f func(*ds.Query,
// 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.

Powered by Google App Engine
This is Rietveld 408576698