Fix nullability issues

dotnet · Sep 28, 2020 · 1d31bba · 1d31bba
1 parent d6a273f
commit 1d31bba
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/Microsoft.Tye.Core/ConfigModel/ConfigApplication.cs b/src/Microsoft.Tye.Core/ConfigModel/ConfigApplication.cs
@@ -139,7 +139,7 @@ public void Validate()
                 var probes = new[] { (Name: "liveness", Probe: service.Liveness), (Name: "readiness", Probe: service.Readiness) }.Where(p => p.Probe != null).ToArray();
                 foreach (var probe in probes)
                 {
-                    context = new ValidationContext(probe.Probe);
+                    context = new ValidationContext(probe.Probe!);
                     if (!Validator.TryValidateObject(probe.Probe, context, results, validateAllProperties: true))
                     {
                         throw new TyeYamlException(

diff --git a/src/Microsoft.Tye.Hosting/HttpProxyService.cs b/src/Microsoft.Tye.Hosting/HttpProxyService.cs
@@ -154,7 +154,7 @@ public async Task StartAsync(Application application)
 
                             var uri = new UriBuilder(uris[next].Uri)
                             {
-                                Path = (string)context.Request.RouteValues["path"],
+                                Path = (string)context.Request.RouteValues["path"]!,
                                 Query = context.Request.QueryString.Value
                             };
 

diff --git a/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs b/src/Microsoft.Tye.Hosting/TyeDashboardApi.cs
@@ -77,10 +77,10 @@ private Task Service(HttpContext context)
         {
             var app = context.RequestServices.GetRequiredService<Application>();
 
-            var name = (string)context.Request.RouteValues["name"];
+            var name = (string?)context.Request.RouteValues["name"];
             context.Response.ContentType = "application/json";
 
-            if (!app.Services.TryGetValue(name, out var service))
+            if (string.IsNullOrEmpty(name) || !app.Services.TryGetValue(name, out var service))
             {
                 context.Response.StatusCode = 404;
                 return JsonSerializer.SerializeAsync(context.Response.Body, new
@@ -215,10 +215,10 @@ private Task Logs(HttpContext context)
         {
             var app = context.RequestServices.GetRequiredService<Tye.Hosting.Model.Application>();
 
-            var name = (string)context.Request.RouteValues["name"];
+            var name = (string?)context.Request.RouteValues["name"];
             context.Response.ContentType = "application/json";
 
-            if (!app.Services.TryGetValue(name, out var service))
+            if (string.IsNullOrEmpty(name) || !app.Services.TryGetValue(name, out var service))
             {
                 context.Response.StatusCode = 404;
                 return JsonSerializer.SerializeAsync(context.Response.Body, new
@@ -265,10 +265,10 @@ private Task Metrics(HttpContext context)
 
             var sb = new StringBuilder();
 
-            var name = (string)context.Request.RouteValues["name"];
+            var name = (string?)context.Request.RouteValues["name"];
             context.Response.ContentType = "application/json";
 
-            if (!app.Services.TryGetValue(name, out var service))
+            if (string.IsNullOrEmpty(name) || !app.Services.TryGetValue(name, out var service))
             {
                 context.Response.StatusCode = 404;
                 return JsonSerializer.SerializeAsync(context.Response.Body, new

diff --git a/src/Microsoft.Tye.Hosting/TyeHost.cs b/src/Microsoft.Tye.Hosting/TyeHost.cs
@@ -374,7 +374,7 @@ private static void DumpDiagnostics(HostOptions options, Microsoft.Extensions.Lo
             providerText.AddRange(
                 new[] { options.DistributedTraceProvider, options.LoggingProvider, options.MetricsProvider }
                 .Where(p => p is object)
-                .Cast<string>());
+                .Cast<string>()!);
 
             foreach (var text in providerText)
             {