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

Unified Diff: logdog/appengine/coordinator/hierarchy/project.go

Issue 2575383002: Add server/cache support to gaeconfig. (Closed)
Patch Set: Un-collapse. Created 3 years, 11 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
« no previous file with comments | « logdog/appengine/coordinator/hierarchy/hierarchy_test.go ('k') | logdog/appengine/coordinator/project.go » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: logdog/appengine/coordinator/hierarchy/project.go
diff --git a/logdog/appengine/coordinator/hierarchy/project.go b/logdog/appengine/coordinator/hierarchy/project.go
index 3d037d934a76210cd89e9f9854e320098d4bac50..d903891895660ac395e5033e522ccd16acffb4c5 100644
--- a/logdog/appengine/coordinator/hierarchy/project.go
+++ b/logdog/appengine/coordinator/hierarchy/project.go
@@ -5,11 +5,9 @@
package hierarchy
import (
- "sort"
-
log "github.com/luci/luci-go/common/logging"
"github.com/luci/luci-go/grpc/grpcutil"
- "github.com/luci/luci-go/logdog/appengine/coordinator"
+ "github.com/luci/luci-go/logdog/appengine/coordinator/config"
"github.com/luci/luci-go/luci_config/common/cfgtypes"
"golang.org/x/net/context"
@@ -23,19 +21,13 @@ func getProjects(c context.Context, r *Request) (*List, error) {
}
// Get all user-accessible active projects.
- allPcfgs, err := coordinator.ActiveUserProjects(c)
+ projects, err := config.ActiveUserProjects(c)
if err != nil {
// If there is an error, we will refrain from filtering projects.
log.WithError(err).Warningf(c, "Failed to get user project list.")
return nil, grpcutil.Internal
}
- projects := make(projectNameSlice, 0, len(allPcfgs))
- for project := range allPcfgs {
- projects = append(projects, project)
- }
- sort.Sort(projects)
-
next := cfgtypes.ProjectName(r.Next)
skip := r.Skip
for _, proj := range projects {
@@ -66,10 +58,3 @@ func getProjects(c context.Context, r *Request) (*List, error) {
return &l, nil
}
-
-// projectNameSlice is a sortable slice of cfgtypes.ProjectName.
-type projectNameSlice []cfgtypes.ProjectName
-
-func (s projectNameSlice) Len() int { return len(s) }
-func (s projectNameSlice) Less(i, j int) bool { return s[i] < s[j] }
-func (s projectNameSlice) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
« no previous file with comments | « logdog/appengine/coordinator/hierarchy/hierarchy_test.go ('k') | logdog/appengine/coordinator/project.go » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698