Milo: Store console defs as their own entities

milo/buildsource/console.go

 // Copyright 2017 The LUCI Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 package buildsource
 
 import (
         "encoding/hex"
 
         "golang.org/x/net/context"
 
         "github.com/luci/gae/service/datastore"
 
         "github.com/luci/luci-go/common/data/stringset"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/sync/parallel"
 
-        "github.com/luci/luci-go/milo/api/config"
+        "github.com/luci/luci-go/milo/common"
         "github.com/luci/luci-go/milo/common/model"
 )
 
 // ConsoleRow is one row of a particular console.
 //
 // It has the git commit for the row, as well as a mapping of BuilderID to any
 // BuildSummaries which reported using this commit.
 type ConsoleRow struct {
         Commit string
         Builds map[BuilderID][]*model.BuildSummary
 }
 
 // GetConsoleRows returns a row-oriented collection of BuildSummary
 // objects. Each row corresponds to the similarly-indexed commit in the
 // `commits` slice.
-func GetConsoleRows(c context.Context, project string, console *config.Console, commits, builders []string) ([]*ConsoleRow, error) {
+func GetConsoleRows(c context.Context, project string, console *common.Console, commits, builders []string) ([]*ConsoleRow, error) {
         rawCommits := make([][]byte, len(commits))
         for i, c := range commits {
                 var err error
                 if rawCommits[i], err = hex.DecodeString(c); err != nil {
                         return nil, errors.Annotate(err, "bad commit[%d]: %q", i, c).Err()
                 }
         }
 
         builderSet := stringset.NewFromSlice(builders...)
 
         ret := make([]*ConsoleRow, len(commits))
         url := console.RepoURL
         // HACK(iannucci): This little hack should be removed when console definitions
         // no longer use a manifest name of "REVISION". REVISION was used to index the
         // 'got_revision' value before manifests were implemented.
         if console.ManifestName == "REVISION" {
                 url = ""
         }
-        partialKey := model.NewPartialManifestKey(project, console.Name, console.ManifestName, url)
+        partialKey := model.NewPartialManifestKey(project, console.ID, console.ManifestName, url)
         q := datastore.NewQuery("BuildSummary").KeysOnly(true)
         err := parallel.WorkPool(4, func(ch chan<- func() error) {
                 for i := range rawCommits {
                         i := i
                         r := &ConsoleRow{Commit: commits[i]}
                         ret[i] = r
                         ch <- func() error {
                                 fullQ := q.Eq("ManifestKey", partialKey.AddRevision(rawCommits[i]))
                                 return datastore.Run(c, fullQ, func(bs *model.BuildSummary) {
                                         if builderSet.Has(bs.BuilderID) {
                                                 bid := BuilderID(bs.BuilderID)
                                                 if r.Builds == nil {
                                                         r.Builds = map[BuilderID][]*model.BuildSummary{}
                                                 }
                                                 r.Builds[bid] = append(r.Builds[bid], bs)
                                         }
                                 })
                         }
                 }
         })
 
         return ret, err
 }