Accommodate Dapr 0.5.0 breaking changes. (#66) (#67)

microsoft · Mar 12, 2020 · 8dc2742 · 8dc2742
1 parent 8e5e242
commit 8dc2742
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/services/daprApplicationProvider.ts b/src/services/daprApplicationProvider.ts
@@ -18,7 +18,7 @@ export interface DaprApplicationProvider {
 }
 
 function getAppId(cmd: string): string | undefined {
-    const appIdRegEx = /--dapr-id "?(?<appId>[a-zA-Z0-9_-]+)"?/g;
+    const appIdRegEx = /--app-id "?(?<appId>[a-zA-Z0-9_-]+)"?/g;
 
     const appIdMatch = appIdRegEx.exec(cmd);
 

diff --git a/src/tasks/daprdCommandTaskProvider.ts b/src/tasks/daprdCommandTaskProvider.ts
@@ -47,13 +47,13 @@ export default class DaprdCommandTaskProvider extends CommandTaskProvider {
                                 .create('daprd')
                                 .withNamedArg('--allowed-origins', daprDefinition.allowedOrigins)
                                 .withFlagArg('--alsoLogToStdErr', daprDefinition.alsoLogToStdErr)
+                                .withNamedArg('--app-id', daprDefinition.appId)
                                 .withNamedArg('--app-port', daprDefinition.appPort)
                                 .withNamedArg('--components-path', daprDefinition.componentsPath)
                                 .withNamedArg('--config', daprDefinition.config)
                                 .withNamedArg('--control-plane-address', daprDefinition.controlPlaneAddress)
                                 .withNamedArg('--dapr-grpc-port', daprDefinition.grcpPort)
                                 .withNamedArg('--dapr-http-port', daprDefinition.httpPort)
-                                .withNamedArg('--dapr-id', daprDefinition.appId)
                                 .withFlagArg('--enable-profiling', daprDefinition.enableProfiling)
                                 .withNamedArg('--log-level', daprDefinition.logLevel)
                                 .withNamedArg('--log_backtrace_at', daprDefinition.logBacktraceAt)