From fc35549df3495f738434430115057d228fe42362 Mon Sep 17 00:00:00 2001 From: Marvin Huber Date: Wed, 25 Nov 2020 21:03:54 +0100 Subject: [PATCH] Refactore dapr extension (#813) --- .../Dapr/DaprExtension.cs | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs index 64f891aa..9738889f 100644 --- a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs +++ b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs @@ -25,7 +25,7 @@ namespace Microsoft.Tye.Extensions.Dapr foreach (var project in projects) { // Dapr requires http. If this project isn't listening to HTTP then it's not daprized. - var httpBinding = project.Bindings.Where(b => b.Protocol == "http").FirstOrDefault(); + var httpBinding = project.Bindings.FirstOrDefault(b => b.Protocol == "http"); if (httpBinding == null) { continue; @@ -180,27 +180,29 @@ namespace Microsoft.Tye.Extensions.Dapr foreach (var project in projects) { // Dapr requires http. If this project isn't listening to HTTP then it's not daprized. - var httpBinding = project.Bindings.Where(b => b.Protocol == "http").FirstOrDefault(); + var httpBinding = project.Bindings.FirstOrDefault(b => b.Protocol == "http"); if (httpBinding == null) { continue; } - if (project.ManifestInfo?.Deployment is DeploymentManifestInfo deployment) + if (!(project.ManifestInfo?.Deployment is { } deployment)) { - deployment.Annotations.Add("dapr.io/enabled", "true"); - deployment.Annotations.Add("dapr.io/id", project.Name); - deployment.Annotations.Add("dapr.io/port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture)); + continue; + } - if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig) - { - deployment.Annotations.TryAdd("dapr.io/config", daprConfig); - } + deployment.Annotations.Add("dapr.io/enabled", "true"); + deployment.Annotations.Add("dapr.io/id", project.Name); + deployment.Annotations.Add("dapr.io/port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture)); - if (config.Data.TryGetValue("log-level", out obj) && obj?.ToString() is string logLevel) - { - deployment.Annotations.TryAdd("dapr.io/log-level", logLevel); - } + if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig) + { + deployment.Annotations.TryAdd("dapr.io/config", daprConfig); + } + + if (config.Data.TryGetValue("log-level", out obj) && obj?.ToString() is string logLevel) + { + deployment.Annotations.TryAdd("dapr.io/log-level", logLevel); } } }