Milo: Internal buildbot masters support

milo/appengine/buildbot/pubsub.go

Index: milo/appengine/buildbot/pubsub.go
diff --git a/milo/appengine/buildbot/pubsub.go b/milo/appengine/buildbot/pubsub.go
index f7ba75748ee3aa3d7ab5daeb9c5f976f59bcb363..7a5a876e30aa870fdc32b05e50903e90f3089f3b 100644
--- a/milo/appengine/buildbot/pubsub.go
+++ b/milo/appengine/buildbot/pubsub.go
@@ -26,9 +26,10 @@ import (
 )
 
 var (
-	// subName is the name of the pubsub subscription that milo is expecting.
+	// publicSubName is the name of the pubsub subscription that milo is expecting.
 	// TODO(hinoka): This should be read from luci-config.
-	subName = "projects/luci-milo/subscriptions/buildbot-public"
+	publicSubName   = "projects/luci-milo/subscriptions/buildbot-public"

[Vadim Sh., 2016/08/23 18:53:06]

hardcoded project names :(

[Ryan Tseng, 2016/08/23 22:00:15]

Probably will move this to a settings page... wdyt? This is a global setting, so
I think settings might make more sense than luci-cfg.

on the other hand, luci-cfg is being used for acl'ing internal access, but
that's only because there's a pre-existing ACL mechanism via luci-cfg.

[Vadim Sh., 2016/08/23 22:35:46]

Don't know. I'd expect stuff like that to be in luci-config. It's different from
analytics, since it's not shared reusable code, but a thing specific to Milo,
and Milo has luci-config integration already.

+	internalSubName = "projects/luci-milo/subscriptions/buildbot-private"
 
 	// Metrics
 	buildCounter = metric.NewCounter(
@@ -145,9 +146,16 @@ func PubSubHandler(ctx *router.Context) {
 		h.WriteHeader(200) // This is a hard failure, we don't want PubSub to retry.
 		return
 	}
-	if msg.Subscription != subName {
+	internal := true
+	switch msg.Subscription {
+	case publicSubName:
+		internal = false
+	case internalSubName:
+		// internal = true, but that's already set.
+	default:
 		log.Errorf(
-			c, "Subscription name %s does not match %s", msg.Subscription, subName)
+			c, "Subscription name %s does not match %s or %s",
+			msg.Subscription, publicSubName, internalSubName)
 		h.WriteHeader(200)
 		return
 	}
@@ -191,11 +199,12 @@ func PubSubHandler(ctx *router.Context) {
 			}
 			buildExists = true
 		}
-		// Also set the finished bit.
+		// Also set the finished and internal bit.
 		build.Finished = false
 		if len(build.Times) == 2 && build.Times[1] != nil {
 			build.Finished = true
 		}
+		build.Internal = internal
 		err = ds.Put(&build)
 		if err != nil {
 			switch err {
@@ -224,8 +233,7 @@ func PubSubHandler(ctx *router.Context) {
 
 	}
 	if master != nil {
-		// TODO(hinoka): Internal builds.
-		err = putDSMasterJSON(c, master, false)
+		err = putDSMasterJSON(c, master, internal)
 		if err != nil {
 			log.WithError(err).Errorf(
 				c, "Could not save master in datastore %s", err)