Merge pull request #669 from openziti/edge-protobuf

use protobuf-defined protocol constants

Author: ekoby

build.gradle.kts

@@ -24,6 +24,7 @@ plugins {
     alias(libs.plugins.kotlin).apply(false)
     alias(libs.plugins.nexus.publish)
     alias(libs.plugins.semver.git)
+    alias(libs.plugins.download).apply(false)
 }
 
 semver {

gradle/libs.versions.toml

@@ -7,6 +7,7 @@ semver-git = "2.3.7"
 openapi-gen = "7.11.0"
 spotless = "7.0.2"
 shadow-jar = "8.3.5"
+download = "5.6.0"
 
 # OpenZiti Edge API
 ziti-api = "0.26.39"
@@ -26,6 +27,9 @@ springboot = "3.2.5"
 jackson = "2.18.2"
 jakarta-annotation = "1.3.5"
 okhttp3 = "4.12.0"
+protobuf = "4.28.2"
+metrics = "4.2.30"
+bouncycastle = "1.80"
 
 [libraries]
 
@@ -57,8 +61,10 @@ jackson-bind = { group = "com.fasterxml.jackson.core", name = "jackson-databind"
 jackson-datatype = { group = "com.fasterxml.jackson.datatype", name = "jackson-datatype-jsr310", version.ref = "jackson" }
 jackson-kotlin = { group = "com.fasterxml.jackson.module", name = "jackson-module-kotlin", version.ref = "jackson" }
 
-okhttp3 = { group = "com.squareup.okhttp3", name ="okhttp", version.ref = "okhttp3" }
-
+okhttp3 = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp3" }
+protobuf = { group = "com.google.protobuf", name = "protobuf-javalite", version.ref = "protobuf" }
+metrics = { group = "io.dropwizard.metrics", name = "metrics-core", version.ref = "metrics" }
+bouncycastle = { group = "org.bouncycastle", name = "bcpkix-jdk18on", version.ref = "bouncycastle" }
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
@@ -69,5 +75,5 @@ semver-git = { id = "io.wusa.semver-git-plugin", version.ref = "semver-git" }
 openapi = { id = "org.openapi.generator", version.ref = "openapi-gen" }
 spotless = { id = "com.diffplug.spotless", version.ref = "spotless" }
 shadow = { id = "com.gradleup.shadow", version.ref = "shadow-jar"}
-
+download = { id = "de.undercouch.download", version.ref = "download" }
 

ziti/build.gradle.kts

@@ -24,6 +24,7 @@ plugins {
     alias(libs.plugins.dokka)
     id("maven-publish")
     alias(libs.plugins.shadow)
+    alias(libs.plugins.download)
 }
 
 ext {
@@ -47,9 +48,9 @@ dependencies {
     implementation(libs.jjwt.api)
     implementation(libs.jjwt.impl)
     implementation(libs.jjwt.gson)
-
-    implementation("io.dropwizard.metrics:metrics-core:4.2.30")
-    implementation("org.bouncycastle:bcpkix-jdk18on:1.80")
+    implementation(libs.protobuf)
+    implementation(libs.metrics)
+    implementation(libs.bouncycastle)
 
     implementation(libs.sodium) {
         exclude(module = "slf4j-api")
@@ -75,8 +76,27 @@ tasks.register<WriteProperties>("versionProps") {
     property("branch", "$gitBranch")
 }
 
-sourceSets.main {
-    resources.srcDir(files(generatedResourcesDir).builtBy(tasks["versionProps"]))
+
+sourceSets {
+    main {
+        resources.srcDir(files(generatedResourcesDir).builtBy(tasks["versionProps"]))
+    }
+}
+
+tasks.register<Exec>("updateProtobuf") {
+    group = LifecycleBasePlugin.BUILD_GROUP
+    description = "updates generated protobuf sources in src/main/java. requires `protoc` on your path"
+    val protoDir = layout.buildDirectory.dir("proto")
+    download.run {
+        src("https://raw.githubusercontent.com/openziti/sdk-golang/refs/heads/main/pb/edge_client_pb/edge_client.proto")
+        dest(protoDir)
+    }
+
+    commandLine("protoc",
+        "-I", protoDir.get().asFile.absolutePath,
+        "--java_out=lite:src/main/java",
+        "edge_client.proto"
+    )
 }
 
 java {