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

go/src/infra/monitoring/analyzer/analyzer_test.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.
 
 package analyzer
 
 import (
         "fmt"
         "infra/libs/testing/ansidiff"
         "infra/monitoring/client"
@@ skipping 1082 matching lines @@
                 }
                 if gotErr != test.wantErr {
                         t.Errorf("%s failed. Got %s, want %s.", test.name, gotErr, test.wantErr)
                 }
         }
 }
 
 func TestExcludeFailure(t *testing.T) {
         tests := []struct {
                 name                  string
-                cfgs                  map[string]messages.MasterConfig
+                gk                    messages.GatekeeperConfig
                 master, builder, step string
                 want                  bool
         }{
                 {
                         name:    "empty config",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
                         want:    false,
                 },
                 {
                         name:    "specifically excluded builder",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
-                        cfgs: map[string]messages.MasterConfig{
-                                "fake.master": {
+                        gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
+                                "fake.master": {{
                                         ExcludedBuilders: []string{"fake.builder"},
-                                },
-                        },
+                                }},
+                        }},
                         want: true,
                 },
                 {
                         name:    "specifically excluded master step",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
-                        cfgs: map[string]messages.MasterConfig{
-                                "fake.master": {
+                        gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
+                                "fake.master": {{
                                         ExcludedSteps: []string{"fake_step"},
-                                },
-                        },
+                                }},
+                        }},
                         want: true,
                 },
                 {
                         name:    "specifically excluded builder step",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
-                        cfgs: map[string]messages.MasterConfig{
-                                "fake.master": {
+                        gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
+                                "fake.master": {{
                                         Builders: map[string]messages.BuilderConfig{
                                                 "fake.builder": {
                                                         ExcludedSteps: []string{"fake_step"},
                                                 },
-                                        },
-                                },
+                                        }},
+                                }},
                         },
                         want: true,
                 },
                 {
                         name:    "wildcard builder excluded",
                         master:  "fake.master",
                         builder: "fake.builder",
                         step:    "fake_step",
-                        cfgs: map[string]messages.MasterConfig{
-                                "fake.master": {
+                        gk: messages.GatekeeperConfig{Masters: map[string][]messages.MasterConfig{
+                                "fake.master": {{
                                         ExcludedBuilders: []string{"*"},
-                                },
-                        },
+                                }},
+                        }},
                         want: true,
                 },
         }
 
         a := New(&mockReader{}, 0, 10)
         for _, test := range tests {
-                a.MasterCfgs = test.cfgs
-                got := a.excludeFailure(test.master, test.builder, test.step)
+                a.Gatekeeper = NewGatekeeperRules(test.gk)
+                got := a.Gatekeeper.ExcludeFailure(test.master, test.builder, test.step)
                 if got != test.want {
                         t.Errorf("%s failed. Got: %+v, want: %+v", test.name, got, test.want)
                 }
         }
 }