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

go/src/infra/monitoring/analyzer/analyzer_test.go

Index: go/src/infra/monitoring/analyzer/analyzer_test.go
diff --git a/go/src/infra/monitoring/analyzer/analyzer_test.go b/go/src/infra/monitoring/analyzer/analyzer_test.go
index b59ca284464ba45acc15c105fb7906c7e44cebbc..ca5867397c8136e2d21d9c6eb0d3f0c98df73cf9 100644
--- a/go/src/infra/monitoring/analyzer/analyzer_test.go
+++ b/go/src/infra/monitoring/analyzer/analyzer_test.go
@@ -922,7 +922,8 @@ func TestStepFailureAlerts(t *testing.T) {
 			alerts: []messages.Alert{
 				{
 					Key:   "fake.master.fake.builder.fake_tests",
-					Title: "Builder step failure: fake.master.fake.builder",
+					Title: "fake.builder step failure: fake.master.fake.builder",
+					Body:  "fake_tests failing on fake.master/fake.builder",
 					Type:  "buildfailure",
 					Extension: messages.BuildFailure{
 						Builders: []messages.AlertedBuilder{
@@ -954,7 +955,8 @@ func TestStepFailureAlerts(t *testing.T) {
 		mc.testResults = &test.testResults
 		alerts, err := a.stepFailureAlerts(test.failures)
 		if !reflect.DeepEqual(alerts, test.alerts) {
-			t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v", test.name, alerts, test.alerts)
+			t.Errorf("%s failed. Got:\n\t%+v, want:\n\t%+v\nDiff: %s", test.name, alerts, test.alerts,
+				ansidiff.Diff(alerts, test.alerts))
 		}
 		if !reflect.DeepEqual(err, test.err) {
 			t.Errorf("%s failed. Got %+v, want %+v", test.name, err, test.err)
@@ -1100,7 +1102,7 @@ func TestLatestBuildStep(t *testing.T) {
 func TestExcludeFailure(t *testing.T) {
 	tests := []struct {
 		name                  string
-		cfgs                  map[string]messages.MasterConfig
+		gk                    messages.GatekeeperConfig
 		master, builder, step string
 		want                  bool
 	}{
@@ -1116,11 +1118,11 @@ func TestExcludeFailure(t *testing.T) {
 			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,
 		},
 		{
@@ -1128,11 +1130,11 @@ func TestExcludeFailure(t *testing.T) {
 			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,
 		},
 		{
@@ -1140,14 +1142,14 @@ func TestExcludeFailure(t *testing.T) {
 			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,
 		},
@@ -1156,19 +1158,19 @@ func TestExcludeFailure(t *testing.T) {
 			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)
 		}