Milo: Move instance configuration to luci-config

milo/appengine/buildbot/pubsub.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 buildbot
 
 import (
         "bytes"
         "compress/gzip"
         "compress/zlib"
         "encoding/base64"
         "encoding/json"
         "fmt"
         "net/http"
         "strings"
         "time"
 
         ds "github.com/luci/gae/service/datastore"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/iotools"
         "github.com/luci/luci-go/common/logging"
+        "github.com/luci/luci-go/milo/appengine/common"
         "github.com/luci/luci-go/server/router"
 
         "golang.org/x/net/context"
 
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
 )
 
 var (
-        // publicSubName is the name of the pubsub subscription that milo is expecting.
-        // TODO(hinoka): This should be read from luci-config.
-        publicSubName   = "projects/luci-milo/subscriptions/buildbot-public"
-        internalSubName = "projects/luci-milo/subscriptions/buildbot-private"
-
         // Metrics
         buildCounter = metric.NewCounter(
                 "luci/milo/buildbot_pubsub/builds",
                 "The number of buildbot builds received by Milo from PubSub",
                 nil,
                 field.Bool("internal"),
                 field.String("master"),
                 field.String("builder"),
                 field.Bool("finished"),
                 // Status can be one of 3 options.  "New", "Replaced", "Rejected".
@@ skipping 254 matching lines @@
         msg := pubSubSubscription{}
         now := int(clock.Now(c).Unix())
         defer r.Body.Close()
         dec := json.NewDecoder(r.Body)
         if err := dec.Decode(&msg); err != nil {
                 logging.WithError(err).Errorf(
                         c, "Could not decode message.  %s", err)
                 return 200 // This is a hard failure, we don't want PubSub to retry.
         }
         internal := true
+        // Get the name of the subscription on luci-config
+        settings, err := common.GetSettings(c)
+        if err != nil {
+                logging.WithError(err).Errorf(c,
+                        "Cannot load settings to check subscription name.")
+                // This is a configuration error. Tell PubSub to retry until we fix our
+                // configs.
+                return 500

[nodir, 2017/03/24 08:41:15]

please use http.Status* contants
In unchanged code too

[hinoka, 2017/03/28 17:47:20]

Done.

+        }
         switch msg.Subscription {
-        // TODO(hinoka): Move these names to luci-config
-        case publicSubName, publicSubName + "-dev":
+        case settings.Buildbot.PublicTopic:
                 internal = false
-        case internalSubName, internalSubName + "-dev":
+        case settings.Buildbot.InternalTopic:
                 // internal = true, but that's already set.
         default:
                 logging.Errorf(
                         c, "Subscription name %s does not match %s or %s",
-                        msg.Subscription, publicSubName, internalSubName)
-                return 200
+                        msg.Subscription, settings.Buildbot.PublicTopic,
+                        settings.Buildbot.InternalTopic)
+                // This is a configuration error. Tell PubSub to retry until we fix our
+                // configs.
+                return 500
         }
         logging.Infof(
                 c, "Message ID \"%s\" from subscription %s is %d bytes long",
                 msg.Message.MessageID, msg.Subscription, r.ContentLength)
         bbMsg, err := msg.GetData()
         if err != nil {
                 logging.WithError(err).Errorf(c, "Could not base64 decode message %s", err)
                 return 200
         }
         builds, master, err := unmarshal(c, bbMsg)
@@ skipping 67 matching lines @@
 
         }
         if master != nil {
                 code := doMaster(c, master, internal)
                 if code != 0 {
                         return code
                 }
         }
         return 200
 }