[alerts-dispatcher] update to build again :) also fixes a concurrent map access

go/src/infra/monitoring/messages/gatekeeper.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // These structs are used for parsing gatekeeper.json files.
 
 package messages
 
 // MasterConfig represents filtering configurtaion for alerts
 // generated about a buildbot master.
 type MasterConfig struct {
-        Categories       []string                 `json:"categories"`
         TreeNotify       []string                 `json:"tree_notify"`
         SheriffClasses   []string                 `json:"sheriff_classes"`
         Builders         map[string]BuilderConfig `json:"builders"`
         ExcludedBuilders []string                 `json:"excluded_builders"`
         ExcludedSteps    []string                 `json:"excluded_steps"`
+        Categories       []string                 `json:"categories"`

[martiniss, 2016/04/11 21:33:34]

Move this back up, so no diff?

[seanmccullough, 2016/04/11 23:11:08]

Done.

 }
 
 // BuilderConfig represents filtering configuration for alerts
 // generated about a buildbot builder.
 type BuilderConfig struct {
         ExcludedSteps     []string `json:"excluded_steps"`
         ForgivingSteps    []string `json:"forgiving_steps"`
         ForgivingOptional []string `json:"forgiving_optional"`
         SheriffClasses    []string `json:"sheriff_classes"`
         ClosingSteps      []string `json:"closing_steps"`
         ClosingOptional   []string `json:"closing_optional"`
 }
 
+type GatekeeperConfig struct {
+        Categories map[string]BuilderConfig  `json:"categories"`
+        Masters    map[string][]MasterConfig `json:"masters"`
+}
+
 // TreeMasterConfig is a named group of masters. e.g. chromium, or blink.
 type TreeMasterConfig struct {
         BuildDB string   `json:"build-db"`
         Masters []string `json:"masters"`
 }