StatusAggregator should treat V2 Restore and Search as Active-Active components (#674)

Scott Bommarito · web-flow · commit 529603829c07 · 2018-11-16T12:54:23.000-08:00
diff --git a/src/StatusAggregator/Export/ComponentExporter.cs b/src/StatusAggregator/Export/ComponentExporter.cs
@@ -71,7 +71,7 @@ public IComponent Export()
                 foreach (var activeEntity in activeEntities)
                 {
                     using (_logger.Scope("Applying active entity affecting {AffectedComponentPath} of severity {AffectedComponentStatus} at {StartTime} to root component",
-                        activeEntity.AffectedComponentPath, activeEntity.AffectedComponentStatus, activeEntity.StartTime))
+                        activeEntity.AffectedComponentPath, (ComponentStatus)activeEntity.AffectedComponentStatus, activeEntity.StartTime))
                     {
                         var currentComponent = rootComponent.GetByPath(activeEntity.AffectedComponentPath);
 
diff --git a/src/StatusAggregator/Factory/NuGetServiceComponentFactory.cs b/src/StatusAggregator/Factory/NuGetServiceComponentFactory.cs
@@ -34,7 +34,7 @@ public IComponent Create()
                 "",
                 new IComponent[]
                 {
-                    new PrimarySecondaryComponent(
+                    new ActivePassiveComponent(
                         GalleryName,
                         "Browsing the Gallery website",
                         new[]
@@ -55,7 +55,7 @@ public IComponent Create()
                                     new LeafComponent(GlobalRegionName, "V3 restore for users outside of China"),
                                     new LeafComponent(ChinaRegionName, "V3 restore for users inside China")
                                 }),
-                            new PrimarySecondaryComponent(
+                            new ActiveActiveComponent(
                                 V2ProtocolName,
                                 "Restore using the V2 API",
                                 new[]
@@ -69,15 +69,15 @@ public IComponent Create()
                         "Searching for new and existing packages in Visual Studio or the Gallery website",
                         new[]
                         {
-                            new PrimarySecondaryComponent(
+                            new ActiveActiveComponent(
                                 GlobalRegionName,
                                 "Search for packages outside China",
                                 new[]
                                 {
                                     new LeafComponent(UsncInstanceName, "Primary region"),
                                     new LeafComponent(UsscInstanceName, "Backup region")
                                 }),
-                            new PrimarySecondaryComponent(
+                            new ActiveActiveComponent(
                                 ChinaRegionName,
                                 "Search for packages inside China",
                                 new[]
diff --git a/src/StatusAggregator/Parse/IncidentRegexParser.cs b/src/StatusAggregator/Parse/IncidentRegexParser.cs
@@ -56,7 +56,7 @@ public bool TryParseIncident(Incident incident, out ParsedIncident parsedInciden
                     return false;
                 }
 
-                _logger.LogInformation("RegEx match result: {MatchResult}", title, match.Success);
+                _logger.LogInformation("RegEx match result: {MatchResult}", match.Success);
                 return match.Success && TryParseIncident(incident, match.Groups, out parsedIncident);
             }
         }
diff --git a/src/StatusAggregator/StatusAggregator.csproj b/src/StatusAggregator/StatusAggregator.csproj
@@ -157,13 +157,13 @@
       <Version>1.1.1</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Incidents">
-      <Version>2.33.0</Version>
+      <Version>2.38.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status">
-      <Version>2.37.0-sb-statusfb-2205681</Version>
+      <Version>2.38.0</Version>
     </PackageReference>
     <PackageReference Include="NuGet.Services.Status.Table">
-      <Version>2.37.0-sb-statusfb-2205681</Version>
+      <Version>2.38.0</Version>
     </PackageReference>
     <PackageReference Include="WindowsAzure.Storage">
       <Version>9.2.0</Version>
diff --git a/tests/StatusAggregator.Tests/Messages/MessageChangeEventProcessorTests.cs b/tests/StatusAggregator.Tests/Messages/MessageChangeEventProcessorTests.cs
@@ -122,7 +122,7 @@ public async Task IgnoresStartMessageWhereComponentDoesntAffectStatus()
             public async Task CreatesStartMessageFromNullContextForHiddenComponent(ComponentStatus status)
             {
                 var child = new TestComponent("child");
-                var root = new PrimarySecondaryComponent("hi", "", new[] { child });
+                var root = new ActivePassiveComponent("hi", "", new[] { child });
 
                 var change = new MessageChangeEvent(
                     DefaultTimestamp,
@@ -313,7 +313,7 @@ public async Task CreatesEndMessageWithContext(ComponentStatus changeStatus, Com
             {
                 var child = new TestComponent("child");
                 child.Status = changeStatus;
-                var root = new PrimarySecondaryComponent("hi", "", new[] { child });
+                var root = new ActiveActiveComponent("hi", "", new[] { child });
 
                 var affectedComponent = root.GetByNames<IComponent>(root.Name, child.Name);
                 var change = new MessageChangeEvent(
diff --git a/tests/StatusAggregator.Tests/Messages/MessageContentBuilderTests.cs b/tests/StatusAggregator.Tests/Messages/MessageContentBuilderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public IComponent Export()`
`71`	`71`	`foreach (var activeEntity in activeEntities)`
`72`	`72`	`{`
`73`	`73`	`using (_logger.Scope("Applying active entity affecting {AffectedComponentPath} of severity {AffectedComponentStatus} at {StartTime} to root component",`
`74`		`- activeEntity.AffectedComponentPath, activeEntity.AffectedComponentStatus, activeEntity.StartTime))`
	`74`	`+ activeEntity.AffectedComponentPath, (ComponentStatus)activeEntity.AffectedComponentStatus, activeEntity.StartTime))`
`75`	`75`	`{`
`76`	`76`	`var currentComponent = rootComponent.GetByPath(activeEntity.AffectedComponentPath);`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public bool TryParseIncident(Incident incident, out ParsedIncident parsedInciden`
`56`	`56`	`return false;`
`57`	`57`	`}`
`58`	`58`
`59`		`- _logger.LogInformation("RegEx match result: {MatchResult}", title, match.Success);`
	`59`	`+ _logger.LogInformation("RegEx match result: {MatchResult}", match.Success);`
`60`	`60`	`return match.Success && TryParseIncident(incident, match.Groups, out parsedIncident);`
`61`	`61`	`}`
`62`	`62`	`}`