Milo: Fix naming of pubsub settings

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"
@@ skipping 295 matching lines @@
         // 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 http.StatusInternalServerError
         }
         switch msg.Subscription {
-        case settings.Buildbot.PublicTopic:
+        case settings.Buildbot.PublicSubscription:
                 internal = false
-        case settings.Buildbot.InternalTopic:
+        case settings.Buildbot.InternalSubscription:
                 // internal = true, but that's already set.
         default:
                 logging.Errorf(
                         c, "Subscription name %s does not match %s or %s",
-                        msg.Subscription, settings.Buildbot.PublicTopic,
-                        settings.Buildbot.InternalTopic)
+                        msg.Subscription, settings.Buildbot.PublicSubscription,
+                        settings.Buildbot.InternalSubscription)
                 // This is a configuration error. Tell PubSub to retry until we fix our
                 // configs.
                 return http.StatusInternalServerError
         }
         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)
@@ skipping 70 matching lines @@
 
         }
         if master != nil {
                 code := doMaster(c, master, internal)
                 if code != 0 {
                         return code
                 }
         }
         return http.StatusOK
 }