Merge branch 'main' into xmin-ci

PeerDB-io · Dec 5, 2023 · 6b33eaf · 6b33eaf
2 parents 80ba2d9 + 5f44454
commit 6b33eaf
Show file tree

Hide file tree

Showing 12 changed files with 795 additions and 157 deletions.
diff --git a/dev-peerdb.sh b/dev-peerdb.sh
@@ -7,5 +7,6 @@ then
     exit 1
 fi
 
+export PEERDB_VERSION_SHA_SHORT=local-$(git rev-parse --short HEAD)
 docker compose -f docker-compose-dev.yml up --build \
  --no-attach temporal --no-attach pyroscope --no-attach temporal-ui
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -28,6 +28,9 @@ target "flow-api" {
     "linux/amd64",
     "linux/arm64",
   ]
+  args = {
+    PEERDB_VERSION_SHA_SHORT = "${SHA_SHORT}"
+  }
   tags = [
     "${REGISTRY}/flow-api:${TAG}",
     "${REGISTRY}/flow-api:${SHA_SHORT}",

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -8,7 +8,7 @@ x-catalog-config: &catalog-config
   PEERDB_CATALOG_DATABASE: postgres
 
 x-flow-worker-env: &flow-worker-env
-  # For Temporal Cloud, this will look like: 
+  # For Temporal Cloud, this will look like:
   # <yournamespace>.<id>.tmprl.cloud:7233
   TEMPORAL_HOST_PORT: temporal:7233
   PEERDB_TEMPORAL_NAMESPACE: default
@@ -115,6 +115,8 @@ services:
       context: .
       dockerfile: stacks/flow.Dockerfile
       target: flow-api
+      args:
+        PEERDB_VERSION_SHA_SHORT: ${PEERDB_VERSION_SHA_SHORT:-}
     ports:
       - 8112:8112
       - 8113:8113

diff --git a/flow/generated/protos/route.pb.go b/flow/generated/protos/route.pb.go
diff --git a/flow/generated/protos/route.pb.gw.go b/flow/generated/protos/route.pb.gw.go
diff --git a/flow/generated/protos/route_grpc.pb.go b/flow/generated/protos/route_grpc.pb.go
diff --git a/nexus/pt/src/peerdb_route.rs b/nexus/pt/src/peerdb_route.rs
@@ -278,6 +278,16 @@ pub struct FlowStateChangeResponse {
     #[prost(string, tag="2")]
     pub error_message: ::prost::alloc::string::String,
 }
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PeerDbVersionRequest {
+}
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Clone, PartialEq, ::prost::Message)]
+pub struct PeerDbVersionResponse {
+    #[prost(string, tag="1")]
+    pub version: ::prost::alloc::string::String,
+}
 #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)]
 #[repr(i32)]
 pub enum ValidatePeerStatus {