feat: expose run(), Args, GIT_HASH, init_observability() as public lib API

.github/workflows/notify-ee-build.yaml

@@ -0,0 +1,32 @@
+# Triggers a build in api7/aisix-ee whenever this repo is pushed to main or tagged.
+# On main push: dev-build event (aisix-ee uses branch="main" in Cargo.toml)
+# On v* tag: release-build event (aisix-ee CI patches Cargo.toml to use the tag)
+name: Notify EE Build
+
+on:
+  push:
+    branches: ["main"]
+    tags: ["v*"]
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Dispatch to aisix-ee (dev build)
+        if: github.ref == 'refs/heads/main'
+        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # 4.0.1
+        with:
+          # PAT with repo scope for api7/aisix-ee, stored in api7/aisix secrets
+          token: ${{ secrets.EE_DISPATCH_TOKEN }}
+          repository: api7/aisix-ee
+          event-type: dev-build
+          client-payload: '{"sha": "${{ github.sha }}"}'
+
+      - name: Dispatch to aisix-ee (release build)
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # 4.0.1
+        with:
+          token: ${{ secrets.EE_DISPATCH_TOKEN }}
+          repository: api7/aisix-ee
+          event-type: release-build
+          client-payload: '{"tag": "${{ github.ref_name }}"}'

Cargo.toml

@@ -33,7 +33,7 @@ axum = { version = "0.8.9", features = [
 ], default-features = false }
 serde = "1.0.228"
 serde_json = "1.0"
-etcd-client = "0.18.0"
+etcd-client = { version = "0.18.0", features = ["tls-openssl"] }
 async-trait = "0.1"
 futures = "0.3"
 bytes = "1.0"
@@ -80,6 +80,11 @@ axum-server = { version = "0.8.0", default-features = false, features = [
 backon = { version = "1.6.0", default-features = false, features = [
   "tokio-sleep",
 ] }
+base64 = "0.22"
+
+[build-dependencies]
+vergen-git2 = { version = "9.1.0" }
+anyhow = "1"
 
 [dev-dependencies]
 tokio-test = "0.4"
@@ -88,10 +93,6 @@ pretty_assertions = "1.4"
 rstest = "0.26"
 tempfile = "3"
 
-[build-dependencies]
-anyhow = "1"
-vergen-git2 = { version = "9.1.0" }
-
 [patch.crates-io]
 opentelemetry = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "965078315b58ae14725721735f1c8e2bc2d3b445" }
 opentelemetry_sdk = { git = "https://github.com/open-telemetry/opentelemetry-rust.git", rev = "965078315b58ae14725721735f1c8e2bc2d3b445" }

build.rs

@@ -1,27 +1,37 @@
 use std::{env, fs, process};
 
-use anyhow::{Result, anyhow};
+use anyhow::{anyhow, Result};
 use vergen_git2::{Emitter, Git2Builder};
 
 fn main() -> Result<()> {
     build_ui()?;
 
-    Emitter::default()
+    // When built as a git dependency (no .git directory present), vergen_git2
+    // cannot read the SHA. We emit a fallback value and continue rather than
+    // failing the build.
+    let result = Emitter::default()
         .add_instructions(&Git2Builder::default().sha(true).build()?)?
-        .emit()?;
+        .emit();
+
+    if result.is_err() {
+        // Emit a placeholder so that code referencing VERGEN_GIT_SHA compiles.
+        println!("cargo:rustc-env=VERGEN_GIT_SHA=unknown");
+    }
 
     println!("cargo:rerun-if-changed=build.rs");
 
     Ok(())
 }
 
 fn build_ui() -> Result<()> {
+    let manifest_dir = env::var("CARGO_MANIFEST_DIR").unwrap_or_else(|_| ".".to_string());
+
     if env::var("CARGO_FEATURE_BUILD_UI").is_ok() {
         println!("cargo:rerun-if-changed=ui");
 
         let status = process::Command::new("pnpm")
             .args(["install", "--frozen-lockfile"])
-            .current_dir("ui")
+            .current_dir(format!("{manifest_dir}/ui"))
             .stdout(std::process::Stdio::inherit())
             .stderr(std::process::Stdio::inherit())
             .status()?;
@@ -35,7 +45,7 @@ fn build_ui() -> Result<()> {
 
         let status = process::Command::new("pnpm")
             .args(["run", "build"])
-            .current_dir("ui")
+            .current_dir(format!("{manifest_dir}/ui"))
             .stdout(std::process::Stdio::inherit())
             .stderr(std::process::Stdio::inherit())
             .status()?;
@@ -44,7 +54,7 @@ fn build_ui() -> Result<()> {
             return Err(anyhow!("failed to build ui with status: {}", status));
         }
     } else {
-        fs::create_dir_all("ui/dist")?;
+        fs::create_dir_all(format!("{manifest_dir}/ui/dist"))?;
     }
     Ok(())
 }