Browse Source

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

* adapt breaking changes of dapr 1.0.0.rc.1

* fixes unit test for dapr 1.0.0-rc.1
pull/891/head
Thomas Freudenberg 6 years ago
committed by GitHub
parent
commit
938134532e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
  2. 8
      test/E2ETest/testassets/generate/dapr.yaml

4
src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs

@ -248,8 +248,8 @@ namespace Microsoft.Tye.Extensions.Dapr
} }
deployment.Annotations.Add("dapr.io/enabled", "true"); deployment.Annotations.Add("dapr.io/enabled", "true");
deployment.Annotations.Add("dapr.io/id", project.Name); deployment.Annotations.Add("dapr.io/app-id", project.Name);
deployment.Annotations.Add("dapr.io/port", (httpBinding.Port ?? 80).ToString(CultureInfo.InvariantCulture)); 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) if (config.Data.TryGetValue("config", out var obj) && obj?.ToString() is string daprConfig)
{ {

8
test/E2ETest/testassets/generate/dapr.yaml

@ -4,8 +4,8 @@ metadata:
name: dapr-test-project name: dapr-test-project
annotations: annotations:
dapr.io/enabled: 'true' dapr.io/enabled: 'true'
dapr.io/id: 'dapr-test-project' dapr.io/app-id: 'dapr-test-project'
dapr.io/port: '80' dapr.io/app-port: '80'
dapr.io/config: 'tracing' dapr.io/config: 'tracing'
dapr.io/log-level: 'debug' dapr.io/log-level: 'debug'
labels: labels:
@ -20,8 +20,8 @@ spec:
metadata: metadata:
annotations: annotations:
dapr.io/enabled: 'true' dapr.io/enabled: 'true'
dapr.io/id: 'dapr-test-project' dapr.io/app-id: 'dapr-test-project'
dapr.io/port: '80' dapr.io/app-port: '80'
dapr.io/config: 'tracing' dapr.io/config: 'tracing'
dapr.io/log-level: 'debug' dapr.io/log-level: 'debug'
labels: labels:

Loading…
Cancel
Save