tsai
/
tye
mirror of https://github.com/dotnet/tye.git
1
0
Fork 2
Code Issues Projects Releases Wiki Activity
Browse Source

Refactore dapr extension (#813)

pull/827/head
Marvin Huber 6 years ago
committed by GitHub
parent
bb49c16164
commit
fc35549df3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs

30
src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.Tye.Extensions.Dapr
foreach (var project in projects) foreach (var project in projects)
{ {
// Dapr requires http. If this project isn't listening to HTTP then it's not daprized. // 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) if (httpBinding == null)
{ {
continue; continue;
@ -180,27 +180,29 @@ namespace Microsoft.Tye.Extensions.Dapr
foreach (var project in projects) foreach (var project in projects)
{ {
// Dapr requires http. If this project isn't listening to HTTP then it's not daprized. // 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) if (httpBinding == null)
{ {
continue; continue;
} }
if (project.ManifestInfo?.Deployment is DeploymentManifestInfo deployment) if (!(project.ManifestInfo?.Deployment is { } deployment))
{ {
deployment.Annotations.Add("dapr.io/enabled", "true"); continue;
deployment.Annotations.Add("dapr.io/id", project.Name); }
deployment.Annotations.Add("dapr.io/port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture));
if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig) deployment.Annotations.Add("dapr.io/enabled", "true");
{ deployment.Annotations.Add("dapr.io/id", project.Name);
deployment.Annotations.TryAdd("dapr.io/config", daprConfig); 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) if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig)
{ {
deployment.Annotations.TryAdd("dapr.io/log-level", logLevel); 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);
} }
} }
} }

Write Preview
Loading…
Cancel
Save