Skip to content
This repository has been archived by the owner on Nov 20, 2023. It is now read-only.

adapt breaking changes of dapr 1.0.0.rc.1 #883

Merged
merged 2 commits into from
Jan 7, 2021
Merged

adapt breaking changes of dapr 1.0.0.rc.1 #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7230b8e
adapt breaking changes of dapr 1.0.0.rc.1
thoemmi Jan 7, 2021
3d183c4
fixes unit test for dapr 1.0.0-rc.1
thoemmi Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,8 +248,8 @@ public override Task ProcessAsync(ExtensionContext context, ExtensionConfigurati
}

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));
deployment.Annotations.Add("dapr.io/app-id", project.Name);
deployment.Annotations.Add("dapr.io/app-port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture));

if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig)
{
Expand Down
8 changes: 4 additions & 4 deletions test/E2ETest/testassets/generate/dapr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ metadata:
name: dapr-test-project
annotations:
dapr.io/enabled: 'true'
dapr.io/id: 'dapr-test-project'
dapr.io/port: '80'
dapr.io/app-id: 'dapr-test-project'
dapr.io/app-port: '80'
dapr.io/config: 'tracing'
dapr.io/log-level: 'debug'
labels:
Expand All @@ -20,8 +20,8 @@ spec:
metadata:
annotations:
dapr.io/enabled: 'true'
dapr.io/id: 'dapr-test-project'
dapr.io/port: '80'
dapr.io/app-id: 'dapr-test-project'
dapr.io/app-port: '80'
dapr.io/config: 'tracing'
dapr.io/log-level: 'debug'
labels:
Expand Down