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
dotnet · Jan 7, 2021 · 9381345 · 9381345
1 parent 1342e86
commit 9381345
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs b/src/Microsoft.Tye.Extensions/Dapr/DaprExtension.cs
@@ -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)
                     {

diff --git a/test/E2ETest/testassets/generate/dapr.yaml b/test/E2ETest/testassets/generate/dapr.yaml
@@ -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:
@@ -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: