Enables warnings as errors.

alanedwardes · Nov 14, 2023 · cafdbb8 · cafdbb8
1 parent 60b0424
commit cafdbb8
Show file tree

Hide file tree

Showing 44 changed files with 358 additions and 136 deletions.
diff --git a/misc/Ae.Dns.Console/Ae.Dns.Console.csproj b/misc/Ae.Dns.Console/Ae.Dns.Console.csproj
@@ -1,33 +1,34 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <OutputType>Exe</OutputType>
-    <IsPackable>false</IsPackable>
-    <WarningsAsErrors>true</WarningsAsErrors>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<OutputType>Exe</OutputType>
+		<IsPackable>false</IsPackable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="AK.App.Metrics.Reporting.InfluxDB2" Version="4.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-    <PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
-    <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-    <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="AK.App.Metrics.Reporting.InfluxDB2" Version="4.2.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+		<PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
+		<PackageReference Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
+		<PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
+		<PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Ae.Dns.AppMetrics\Ae.Dns.AppMetrics.csproj" />
-    <ProjectReference Include="..\..\src\Ae.Dns.Client\Ae.Dns.Client.csproj" />
-    <ProjectReference Include="..\..\src\Ae.Dns.Server.Http\Ae.Dns.Server.Http.csproj" />
-    <ProjectReference Include="..\..\src\Ae.Dns.Server\Ae.Dns.Server.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\Ae.Dns.AppMetrics\Ae.Dns.AppMetrics.csproj" />
+		<ProjectReference Include="..\..\src\Ae.Dns.Client\Ae.Dns.Client.csproj" />
+		<ProjectReference Include="..\..\src\Ae.Dns.Server.Http\Ae.Dns.Server.Http.csproj" />
+		<ProjectReference Include="..\..\src\Ae.Dns.Server\Ae.Dns.Server.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <None Update="config.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+	<ItemGroup>
+		<None Update="config.json">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</None>
+	</ItemGroup>
 
-</Project>
+</Project>
diff --git a/misc/Ae.Dns.Console/DnsConfiguration.cs b/misc/Ae.Dns.Console/DnsConfiguration.cs
@@ -11,9 +11,9 @@ public sealed class DnsConfiguration
         public string[] DisallowedDomainSuffixes { get; set; } = new string[0];
         public string[] DisallowedQueryTypes { get; set; } = new string[0];
         public string[] HostFiles { get; set; } = new string[0];
-        public string DhcpdLeasesFile { get; set; }
-        public string DhcpdConfigFile { get; set; }
-        public string DhcpdLeasesHostnameSuffix { get; set; }
-        public DnsInfluxDbConfiguration InfluxDbMetrics { get; set; }
+        public string? DhcpdLeasesFile { get; set; }
+        public string? DhcpdConfigFile { get; set; }
+        public string? DhcpdLeasesHostnameSuffix { get; set; }
+        public DnsInfluxDbConfiguration? InfluxDbMetrics { get; set; }
     }
 }
diff --git a/misc/Ae.Dns.Console/DnsInfluxDbConfiguration.cs b/misc/Ae.Dns.Console/DnsInfluxDbConfiguration.cs
@@ -4,9 +4,9 @@ namespace Ae.Dns.Console
 {
     public sealed class DnsInfluxDbConfiguration
     {
-        public Uri BaseUri { get; set; }
-        public string Organization { get; set; }
-        public string Bucket { get; set; }
-        public string Token { get; set; }
+        public Uri? BaseUri { get; set; }
+        public string? Organization { get; set; }
+        public string? Bucket { get; set; }
+        public string? Token { get; set; }
     }
 }
diff --git a/misc/Ae.Dns.Console/Program.cs b/misc/Ae.Dns.Console/Program.cs
@@ -174,12 +174,12 @@ async Task ReportStats(CancellationToken token)
 
             if (!string.IsNullOrWhiteSpace(dnsConfiguration.DhcpdConfigFile))
             {
-                staticLookupSources.Add(ActivatorUtilities.CreateInstance<DhcpdConfigDnsLookupSource>(provider, new FileInfo(dnsConfiguration.DhcpdConfigFile), dnsConfiguration.DhcpdLeasesHostnameSuffix));
+                staticLookupSources.Add(ActivatorUtilities.CreateInstance<DhcpdConfigDnsLookupSource>(provider, new FileInfo(dnsConfiguration.DhcpdConfigFile), dnsConfiguration.DhcpdLeasesHostnameSuffix ?? throw new NullReferenceException("DhcpdLeasesHostnameSuffix is null")));
             }
 
             if (!string.IsNullOrWhiteSpace(dnsConfiguration.DhcpdLeasesFile))
             {
-                staticLookupSources.Add(ActivatorUtilities.CreateInstance<DhcpdLeasesDnsLookupSource>(provider, new FileInfo(dnsConfiguration.DhcpdLeasesFile), dnsConfiguration.DhcpdLeasesHostnameSuffix));
+                staticLookupSources.Add(ActivatorUtilities.CreateInstance<DhcpdLeasesDnsLookupSource>(provider, new FileInfo(dnsConfiguration.DhcpdLeasesFile), dnsConfiguration.DhcpdLeasesHostnameSuffix ?? throw new NullReferenceException("DhcpdLeasesHostnameSuffix is null")));
             }
 
             if (staticLookupSources.Count > 0)

diff --git a/misc/Ae.Dns.Console/Startup.cs b/misc/Ae.Dns.Console/Startup.cs
@@ -39,14 +39,6 @@ public void Configure(IApplicationBuilder app)
 
             app.Run(async context =>
             {
-                async Task WriteHeader(string header)
-                {
-                    await context.Response.WriteAsync(header);
-                    await context.Response.WriteAsync(Environment.NewLine);
-                    await context.Response.WriteAsync(new string('=', header.Length));
-                    await context.Response.WriteAsync(Environment.NewLine);
-                }
-
                 async Task WriteTable(DataTable table)
                 {
                     await context.Response.WriteAsync("<table>");
@@ -73,7 +65,7 @@ async Task WriteTable(DataTable table)
                     await context.Response.WriteAsync("</table>");
                 }
 
-                async Task GroupToTable(IEnumerable<IGrouping<string, DnsQuery>> groups, params string[] headings)
+                async Task GroupToTable(IEnumerable<IGrouping<string?, DnsQuery>> groups, params string[] headings)
                 {
                     var table = new DataTable();
 
@@ -84,7 +76,7 @@ async Task GroupToTable(IEnumerable<IGrouping<string, DnsQuery>> groups, params
 
                     table.Columns.Add("Percentage");
 
-                    var itemCounts = groups.Select(x => KeyValuePair.Create(x.Key, x.Count())).OrderByDescending(x => x.Value).ToList();
+                    var itemCounts = groups.Select(x => KeyValuePair.Create<string?, int>(x.Key, x.Count())).OrderByDescending(x => x.Value).ToList();
                     var totalCount = itemCounts.Sum(x => x.Value);
 
                     int CalculatePercentage(int count) => (int)(count / (double)totalCount * (double)100d);
@@ -165,10 +157,14 @@ async Task GroupToTable(IEnumerable<IGrouping<string, DnsQuery>> groups, params
                     context.Response.StatusCode = StatusCodes.Status200OK;
                     context.Response.ContentType = "text/html; charset=utf-8";
 
-                    string CreateQueryString(string name, object value)
+                    string CreateQueryString(string name, object? value)
                     {
-                        var filters = context.Request.Query.ToDictionary(x => x.Key, x => x.Value.ToString());
-                        filters[name] = value.ToString();
+                        IDictionary<string, string?> filters = context.Request.Query.ToDictionary(x => x.Key, x => (string?)x.Value.ToString());
+                        var valueString = value?.ToString();
+                        if (valueString != null)
+                        {
+                            filters[name] = valueString;
+                        }
                         return QueryHelpers.AddQueryString(context.Request.Path, filters);
                     }
 
@@ -179,7 +175,7 @@ string CreateQueryStringWithout(string name)
 
                     IEnumerable<DnsQuery> query = _queries.OrderByDescending(x => x.Created);
 
-                    if (context.Request.Query.ContainsKey("sender") && IPAddress.TryParse(context.Request.Query["sender"], out IPAddress sender))
+                    if (context.Request.Query.ContainsKey("sender") && IPAddress.TryParse(context.Request.Query["sender"], out IPAddress? sender))
                     {
                         query = query.Where(x => x.Sender.Equals(sender));
                     }
@@ -242,11 +238,11 @@ string SenderFilter(DnsQuery dnsQuery)
                         return $"<a href=\"{CreateQueryString("sender", dnsQuery.Sender)}\">{reverseLookups[dnsQuery.Sender] ?? dnsQuery.Sender.ToString()}</a>";
                     }
 
-                    string ResponseFilter(DnsQuery dnsQuery)
+                    string? ResponseFilter(DnsQuery dnsQuery)
                     {
                         if (dnsQuery.Answer == null)
                         {
-                            return dnsQuery.Answer?.ResponseCode.ToString();
+                            return null;
                         }
                         else
                         {
@@ -259,11 +255,11 @@ string QueryTypeFilter(DnsQuery dnsQuery)
                         return $"<a href=\"{CreateQueryString("type", dnsQuery.Query.QueryType)}\">{dnsQuery.Query.QueryType}</a>";
                     }
 
-                    string ResolverFilter(DnsQuery dnsQuery)
+                    string? ResolverFilter(DnsQuery dnsQuery)
                     {
                         if (dnsQuery.Answer == null)
                         {
-                            return dnsQuery.Answer.Resolver;
+                            return null;
                         }
                         else
                         {
@@ -334,9 +330,9 @@ public DnsHeaderLight(DnsHeader header)
                 ResponseCode = header.ResponseCode;
                 QueryType = header.QueryType;
                 Host = header.Host;
-                Resolver = header.Tags.ContainsKey("Resolver") ? header.Tags["Resolver"].ToString() : "Unknown";
-                BlockReason = header.Tags.ContainsKey("BlockReason") ? header.Tags["BlockReason"].ToString() : "None";
-                Server = header.Tags.ContainsKey("Server") ? header.Tags["Server"].ToString() : "Unknown";
+                Resolver = (header.Tags.ContainsKey("Resolver") ? header.Tags["Resolver"].ToString() : null) ?? "Unknown";
+                BlockReason = (header.Tags.ContainsKey("BlockReason") ? header.Tags["BlockReason"].ToString() : null) ?? "None";
+                Server = (header.Tags.ContainsKey("Server") ? header.Tags["Server"].ToString() : null) ?? "Unknown";
             }
 
             public DnsResponseCode ResponseCode { get; }
@@ -349,24 +345,30 @@ public DnsHeaderLight(DnsHeader header)
 
         private sealed class DnsQuery
         {
-            public DnsHeaderLight Query { get; set; }
+            public DnsQuery(DnsHeaderLight query, IPAddress sender)
+            {
+                Query = query;
+                Sender = sender;
+            }
+
+            public DnsHeaderLight Query { get; }
             public DnsHeaderLight? Answer { get; set; }
-            public IPAddress Sender { get; set; }
+            public IPAddress Sender { get; }
             public TimeSpan? Elapsed { get; set; }
-            public DateTime Created { get; set; }
+            public DateTime Created { get; } = DateTime.UtcNow;
         }
 
         private readonly ConcurrentQueue<DnsQuery> _queries = new();
 
-        private void OnMeasurementRecorded(Instrument instrument, int measurement, ReadOnlySpan<KeyValuePair<string, object>> tags, object state)
+        private void OnMeasurementRecorded(Instrument instrument, int measurement, ReadOnlySpan<KeyValuePair<string, object?>> tags, object? state)
         {
-            static TObject? GetObjectFromTags<TObject>(ReadOnlySpan<KeyValuePair<string, object>> _tags, string name)
+            static TObject? GetObjectFromTags<TObject>(ReadOnlySpan<KeyValuePair<string, object?>> _tags, string name)
             {
                 foreach (var tag in _tags)
                 {
                     if (tag.Key == name)
                     {
-                        return (TObject)tag.Value;
+                        return (TObject?)tag.Value;
                     }
                 }
 
@@ -375,19 +377,16 @@ private void OnMeasurementRecorded(Instrument instrument, int measurement, ReadO
 
             if (instrument.Meter.Name == DnsMetricsClient.MeterName)
             {
-                var query = GetObjectFromTags<DnsMessage>(tags, "Query");
+                var query = GetObjectFromTags<DnsMessage>(tags, "Query") ?? throw new NullReferenceException("No query specified");
                 var answer = GetObjectFromTags<DnsMessage>(tags, "Answer");
                 var elapsed = GetObjectFromTags<TimeSpan?>(tags, "Elapsed");
                 var sender = query.Header.Tags.TryGetValue("Sender", out var rawEndpoint) && rawEndpoint is not null && rawEndpoint is IPEndPoint endpoint ? endpoint.Address : null;
                 if (sender != null)
                 {
-                    _queries.Enqueue(new DnsQuery
+                    _queries.Enqueue(new DnsQuery(new DnsHeaderLight(query.Header), sender)
                     {
-                        Query = new DnsHeaderLight(query.Header),
                         Answer = answer != null ? new DnsHeaderLight(answer.Header) : null,
-                        Sender = sender,
-                        Elapsed = elapsed,
-                        Created = DateTime.UtcNow
+                        Elapsed = elapsed
                     });
 
                     if (_queries.Count > 100_000)

diff --git a/samples/AdvancedHttpClient/AdvancedHttpClient.csproj b/samples/AdvancedHttpClient/AdvancedHttpClient.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/AdvancedHttpClientMiddleware/AdvancedHttpClientMiddleware.csproj b/samples/AdvancedHttpClientMiddleware/AdvancedHttpClientMiddleware.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/AdvancedUdpServer/AdvancedUdpServer.csproj b/samples/AdvancedUdpServer/AdvancedUdpServer.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/BasicHttpClient/BasicHttpClient.csproj b/samples/BasicHttpClient/BasicHttpClient.csproj
@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
-    <ImplicitUsings>enable</ImplicitUsings>
-	<LangVersion>10.0</LangVersion>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<LangVersion>10.0</LangVersion>
+		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Ae.Dns.Client\Ae.Dns.Client.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\src\Ae.Dns.Client\Ae.Dns.Client.csproj" />
+	</ItemGroup>
 
 </Project>
diff --git a/samples/BasicHttpClientMiddleware/BasicHttpClientMiddleware.csproj b/samples/BasicHttpClientMiddleware/BasicHttpClientMiddleware.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/BasicHttpServer/BasicHttpServer.csproj b/samples/BasicHttpServer/BasicHttpServer.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/BasicUdpClient/BasicUdpClient.csproj b/samples/BasicUdpClient/BasicUdpClient.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/BasicUdpServer/BasicUdpServer.csproj b/samples/BasicUdpServer/BasicUdpServer.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/CachingClient/CachingClient.csproj b/samples/CachingClient/CachingClient.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/RacerClient/RacerClient.csproj b/samples/RacerClient/RacerClient.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/samples/RandomClient/RandomClient.csproj b/samples/RandomClient/RandomClient.csproj
@@ -6,6 +6,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<LangVersion>10.0</LangVersion>
 		<Nullable>enable</Nullable>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/Ae.Dns.AppMetrics/Ae.Dns.AppMetrics.csproj b/src/Ae.Dns.AppMetrics/Ae.Dns.AppMetrics.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
 		<Version>2.0.0</Version>
-		<WarningsAsErrors>true</WarningsAsErrors>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Authors>alanedwardes</Authors>
 		<Description>AppMetrics support for Ae.Dns.</Description>

diff --git a/src/Ae.Dns.Client/Ae.Dns.Client.csproj b/src/Ae.Dns.Client/Ae.Dns.Client.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
 		<Version>2.0.0</Version>
-		<WarningsAsErrors>true</WarningsAsErrors>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<Authors>alanedwardes</Authors>
 		<Description>DNS over HTTPS (DoH) client, DNS UDP client and DNS caching client for .NET Core</Description>