Generate java client for proto at build

Stop using pre-generated protobuf client libraries, just use the proto files directly when generating clients. This allows us to update proto-gen versions without worrying about conflicts. Signed-off-by: Appu Goundan <[email protected]>
sigstore · Apr 6, 2024 · 38b27b2 · 38b27b2
1 parent 1a175b4
commit 38b27b2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/cifuzz.yaml b/.github/workflows/cifuzz.yaml
@@ -20,7 +20,10 @@ jobs:
         language: jvm
     - name: Upload Crash
       uses: actions/upload-artifact@v4
-      if: failure() && steps.build.outcome == 'success'
+      if: failure() # && steps.build.outcome == 'success'
       with:
         name: artifacts
-        path: ./out/artifacts
+        path: |
+          ./out/artifacts
+          ./**/crash-*
+          ./**/Crash_*
diff --git a/fuzzing/oss_fuzz_build.sh b/fuzzing/oss_fuzz_build.sh
@@ -37,6 +37,7 @@ LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \
 --cp=$RUNTIME_CLASSPATH \
 --target_class=$fuzzer_target \
 --jvm_args=\"\$mem_settings\" \
+--instrumentation_excludes=com.google.protobuf.** \
 \$@" > $OUT/$fuzzer_basename
   chmod u+x $OUT/$fuzzer_basename
 done
diff --git a/sigstore-java/build.gradle.kts b/sigstore-java/build.gradle.kts
@@ -20,13 +20,11 @@ dependencies {
 
     implementation("io.github.erdtman:java-json-canonicalization:1.1")
 
-    implementation("dev.sigstore:protobuf-specs:0.3.0") {
-        because("It generates Sigstore Bundle file")
-    }
-    implementation(platform("com.google.protobuf:protobuf-bom:3.25.3"))
-    implementation("com.google.protobuf:protobuf-java-util") {
-        because("It converts protobuf to json")
-    }
+    protobuf("dev.sigstore:protobuf-specs:0.3.0")
+    protobuf("com.google.api.grpc:proto-google-common-protos:2.37.1")
+
+    implementation(platform("com.google.protobuf:protobuf-bom:4.26.1"))
+    implementation("com.google.protobuf:protobuf-java-util")
 
     // grpc deps
     implementation(platform("io.grpc:grpc-bom:1.62.2"))
@@ -64,7 +62,7 @@ dependencies {
 
 protobuf {
     protoc {
-        artifact = "com.google.protobuf:protoc:3.25.3"
+        artifact = "com.google.protobuf:protoc:4.26.1"
     }
     plugins {
         id("grpc") {