Milo: Move instance configuration to luci-config

milo/appengine/buildbucket/html.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 buildbucket
 
 import (
+        "context"
         "errors"
         "net/http"
 
         "github.com/julienschmidt/httprouter"
+        "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/milo/appengine/common"
+        "github.com/luci/luci-go/milo/common/config"
         "github.com/luci/luci-go/server/router"
         "github.com/luci/luci-go/server/templates"
 )
 
-// TODO(nodir): move this value to luci-config.
-const defaultServer = "cr-buildbucket.appspot.com"
+func parseBuilderQuery(c context.Context, r *http.Request, p httprouter.Params) (
+        query builderQuery, err error) {
 
-func parseBuilderQuery(r *http.Request, p httprouter.Params) (query builderQuery, err error) {
         query.Server = r.FormValue("server")
         if query.Server == "" {
-                query.Server = defaultServer
+                var settings *config.Settings
+                settings, err = common.GetSettings(c)
+                if err != nil || settings.Buildbucket == nil {
+                        logging.WithError(err).Errorf(c, "failed to get settings")

[nodir, 2017/03/28 18:25:49]

if err != nil, we didn't fail to get settings. This may be misleading

[hinoka, 2017/03/28 19:21:02]

We did tho

But anyways, this is split into two separate errors now.

+                        err = errors.New("no server specified and buildbucket settings not configured")
+                        return
+                }
+                query.Server = settings.Buildbucket.Host
         }
 
         query.Bucket = p.ByName("bucket")
         if query.Bucket == "" {
                 err = errors.New("No bucket")
                 return
         }
 
         query.Builder = p.ByName("builder")
         if query.Builder == "" {
                 err = errors.New("No builder")
                 return
         }
 
         // limit is a name of the query string parameter for specifying
         // maximum number of builds to show.
         query.Limit, err = common.GetLimit(r)
         return
 }
 
 // BuilderHandler renders the builder view page.
 // Note: The builder html template contains self links to "?limit=123", which could
 // potentially override any other request parameters set.
 func BuilderHandler(c *router.Context) {
-        query, err := parseBuilderQuery(c.Request, c.Params)
+        query, err := parseBuilderQuery(c.Context, c.Request, c.Params)
         if err != nil {
                 common.ErrorPage(c, http.StatusBadRequest, err.Error())
                 return
         }
 
         result, err := builderImpl(c.Context, query)
         if err != nil {
                 common.ErrorPage(c, http.StatusInternalServerError, err.Error())
                 return
         }
 
         templates.MustRender(c.Context, c.Writer, "pages/builder.html", templates.Args{
                 "Builder": result,
         })
 }