Converted MetricAggregationDeserializer

Part of tomkerkhove#592

src/Promitor.Core.Scraping/Configuration/Serialization/v1/Core/MetricAggregationDeserializer.cs

@@ -1,30 +1,14 @@
-using Microsoft.Azure.Management.Monitor.Fluent.Models;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Promitor.Core.Scraping.Configuration.Serialization.v1.Model;
-using YamlDotNet.RepresentationModel;
 
 namespace Promitor.Core.Scraping.Configuration.Serialization.v1.Core
 {
     public class MetricAggregationDeserializer : Deserializer<MetricAggregationV1>
     {
-        private const string TypeTag = "type";
-        private const string IntervalTag = "interval";
-
         public MetricAggregationDeserializer(ILogger<MetricAggregationDeserializer> logger) : base(logger)
         {
-        }
-
-        public override MetricAggregationV1 Deserialize(YamlMappingNode node, IErrorReporter errorReporter)
-        {
-            var aggregationType = node.GetEnum<AggregationType>(TypeTag);
-
-            var interval = node.GetTimeSpan(IntervalTag);
-
-            return new MetricAggregationV1
-            {
-                Type = aggregationType,
-                Interval = interval
-            };
+            MapRequired(aggregation => aggregation.Type);
+            MapOptional(aggregation => aggregation.Interval);
         }
     }
 }

src/Promitor.Scraper.Tests.Unit/Serialization/v1/Core/MetricAggregationDeserializerTests.cs

@@ -2,6 +2,8 @@
 using System.ComponentModel;
 using Microsoft.Azure.Management.Monitor.Fluent.Models;
 using Microsoft.Extensions.Logging.Abstractions;
+using Moq;
+using Promitor.Core.Scraping.Configuration.Serialization;
 using Promitor.Core.Scraping.Configuration.Serialization.v1.Core;
 using Xunit;
 
@@ -36,6 +38,20 @@ public void Deserialize_TypeNotSupplied_Null()
                 a => a.Type);
         }
 
+        [Fact]
+        public void Deserialize_TypeNotSupplied_ReportsError()
+        {
+            // Arrange
+            var errorReporter = new Mock<IErrorReporter>();
+            var node = YamlUtils.CreateYamlNode("resourceGroupName: promitor-group");
+
+            // Act
+            var result = _deserializer.Deserialize(node, errorReporter.Object);
+
+            // Assert
+            errorReporter.Verify(r => r.ReportError(node, It.Is<string>(m => m.Contains("type"))));
+        }
+
         [Fact]
         public void Deserialize_IntervalSupplied_SetsInterval()
         {