update dapr runtime + cli to latest rc: 1.14 (dapr#1078) (dapr#1094)

* update dapr runtime + cli to latest rc * update install url version * add back v * trying things for pom.xml * Fix sdk-autogen proto code gen * Use 1.14.0-rc.3 CLI for build.yaml * debug scheduler connection. * Update CLI to rc6 and runtime to rc4 * Update gRPC and proto dependency in sdk-tests too. * Update to runtime RC6 * Update error message expectations in 1.15 --------- Signed-off-by: Cassandra Coyle <cassie@diagrid.io> Signed-off-by: Artur Souza <asouza.pro@gmail.com> Signed-off-by: Artur Souza <artursouza.ms@outlook.com> Co-authored-by: Cassie Coyle <cassie@diagrid.io> Signed-off-by: salaboy <Salaboy@gmail.com>
salaboy · Aug 23, 2024 · 1d5499a · 1d5499a
1 parent faf061d
commit 1d5499a
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 27 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -38,9 +38,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.13.0-rc.1
-      DAPR_RUNTIME_VER: 1.13.0-rc.2
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.14.0-rc.6
+      DAPR_RUNTIME_VER: 1.14.0-rc.6
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -37,9 +37,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.13.0-rc.1
-      DAPR_RUNTIME_VER: 1.13.0-rc.5
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.14.0-rc.6
+      DAPR_RUNTIME_VER: 1.14.0-rc.6
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:
@@ -100,6 +100,8 @@ jobs:
           echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
           pip3 install setuptools wheel
           pip3 install mechanical-markdown
+      - name: Verify scheduler is listening on port.
+        run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
       - name: Clean up files
         run: ./mvnw clean
       - name: Build sdk

diff --git a/pom.xml b/pom.xml
@@ -14,11 +14,12 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.59.0</grpc.version>
-    <protobuf.version>3.17.3</protobuf.version>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto</dapr.proto.baseurl>
+    <grpc.version>1.64.0</grpc.version>
+    <protobuf.version>3.25.0</protobuf.version>
+    <protocCommand>protoc</protocCommand>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.14.0-rc.2/dapr/proto</dapr.proto.baseurl>
     <dapr.sdk.alpha.version>0.12.0-SNAPSHOT</dapr.sdk.alpha.version>
-    <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
+    <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
     <maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
     <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
     <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version>
@@ -50,7 +51,7 @@
       <url>https://oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <site>
-      <id>localDocsDirecty</id>
+      <id>localDocsDirectory</id>
       <url>file:${maven.multiModuleProjectDirectory}/docs/</url>
     </site>
     <!-- Use default repository -->

diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml
@@ -20,7 +20,9 @@
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
     <maven.deploy.skip>false</maven.deploy.skip>
-    <grpc.version>1.59.0</grpc.version>
+    <grpc.version>1.64.0</grpc.version>
+    <protocCommand>protoc</protocCommand>
+    <protobuf.version>3.25.0</protobuf.version>
   </properties>
 
   <dependencies>
@@ -62,29 +64,29 @@
         <version>1.6.0</version>
         <executions>
           <execution>
-            <id>getCommonProto</id>
+            <id>getDaprProto</id>
             <phase>initialize</phase>
             <goals>
               <goal>wget</goal>
             </goals>
             <configuration>
               <skipCache>true</skipCache>
-              <url>${dapr.proto.baseurl}/common/v1/common.proto</url>
-              <outputFileName>common.proto</outputFileName>
-              <outputDirectory>${protobuf.input.directory}/dapr/proto/common/v1</outputDirectory>
+              <url>${dapr.proto.baseurl}/runtime/v1/dapr.proto</url>
+              <outputFileName>dapr.proto</outputFileName>
+              <outputDirectory>${protobuf.input.directory}/dapr/proto/runtime/v1</outputDirectory>
             </configuration>
           </execution>
           <execution>
-            <id>getDaprProto</id>
+            <id>getCommonProto</id>
             <phase>initialize</phase>
             <goals>
               <goal>wget</goal>
             </goals>
             <configuration>
               <skipCache>true</skipCache>
-              <url>${dapr.proto.baseurl}/runtime/v1/dapr.proto</url>
-              <outputFileName>dapr.proto</outputFileName>
-              <outputDirectory>${protobuf.input.directory}</outputDirectory>
+              <url>${dapr.proto.baseurl}/common/v1/common.proto</url>
+              <outputFileName>common.proto</outputFileName>
+              <outputDirectory>${protobuf.input.directory}/dapr/proto/common/v1</outputDirectory>
             </configuration>
           </execution>
           <execution>
@@ -97,11 +99,23 @@
               <skipCache>true</skipCache>
               <url>${dapr.proto.baseurl}/runtime/v1/appcallback.proto</url>
               <outputFileName>appcallback.proto</outputFileName>
-              <outputDirectory>${protobuf.input.directory}</outputDirectory>
+              <outputDirectory>${protobuf.input.directory}/dapr/proto/runtime/v1</outputDirectory>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>kr.motd.maven</groupId>
+        <artifactId>os-maven-plugin</artifactId>
+        <version>1.7.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>detect</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>com.github.os72</groupId>
         <artifactId>protoc-jar-maven-plugin</artifactId>
@@ -113,14 +127,18 @@
               <goal>run</goal>
             </goals>
             <configuration>
+              <protocCommand>protoc</protocCommand>
               <protocVersion>${protobuf.version}</protocVersion>
+              <protocArtifact>com.google.protobuf:protoc:3.21.1</protocArtifact>
               <addProtoSources>inputs</addProtoSources>
               <includeMavenTypes>direct</includeMavenTypes>
               <includeStdTypes>true</includeStdTypes>
               <inputDirectories>
-                <include>${protobuf.input.directory}/dapr/proto/common/v1</include>
                 <include>${protobuf.input.directory}</include>
               </inputDirectories>
+              <includeDirectories>
+                <include>${protobuf.input.directory}</include>
+              </includeDirectories>
               <outputTargets>
                 <outputTarget>
                   <type>java</type>

diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
@@ -19,8 +19,8 @@
     <dapr.sdk.alpha.version>0.12.0-SNAPSHOT</dapr.sdk.alpha.version>
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
-    <grpc.version>1.59.0</grpc.version>
-    <protobuf.version>3.17.3</protobuf.version>
+    <grpc.version>1.64.0</grpc.version>
+    <protobuf.version>3.25.0</protobuf.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <spring-boot.version>3.3.1</spring-boot.version>
     <logback-classic.version>1.4.12</logback-classic.version>

diff --git a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java
@@ -30,7 +30,6 @@ public class MethodInvokeIT extends BaseIT {
     private static final int TIMEOUT_MS = 100;
     private static final ResiliencyOptions RESILIENCY_OPTIONS = new ResiliencyOptions()
         .setTimeout(Duration.ofMillis(TIMEOUT_MS));
-    private static final String EXCEPTION_MARKER = "DEADLINE_EXCEEDED: deadline exceeded after";
 
     /**
      * Run of a Dapr application.
@@ -92,7 +91,8 @@ public void testInvokeTimeout() throws Exception {
             String message = assertThrows(StatusRuntimeException.class, () -> stub.sleep(req)).getMessage();
             long delay = System.currentTimeMillis() - started;
             assertTrue(delay >= TIMEOUT_MS, "Delay: " + delay + " is not greater than timeout: " + TIMEOUT_MS);
-            assertTrue(message.startsWith(EXCEPTION_MARKER), "Message: " + message + " does not start with: " + EXCEPTION_MARKER);
+            assertTrue(message.contains("DEADLINE_EXCEEDED"));
+            assertTrue(message.contains("CallOptions deadline exceeded after"));
         }
     }
 
@@ -112,7 +112,8 @@ public void testInvokeException() throws Exception {
             // If this test fails, there might be a regression in runtime (like we had in 1.10.0).
             // The expectations below are as per 1.9 release and (later on) hotfixed in 1.10.
             assertEquals(Status.UNKNOWN.getCode(), exception.getStatus().getCode());
-            assertEquals("", exception.getStatus().getDescription());
+            // The error message below is added starting in Dapr 1.15.0
+            assertEquals("Application error processing RPC", exception.getStatus().getDescription());
         }
     }