add bindgen

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f75506e192142c49188e758bd851330ffb916ed..e66b9f81fc39205f99e10fe5cb845242bd4b20f5 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,6 @@ jobs:
       - name: Build all
         run: |
           cargo install cross --git https://github.com/cross-rs/cross
-          cargo install --force --locked bindgen-cli
           export CROSS_CONTAINER_ENGINE_NO_BUILDKIT=1
           cross build --release --target ${{ matrix.arch }}
           mkdir -p ./build

diff --git a/Cargo.lock b/Cargo.lock
index 3de978739bc6b279ede9adac5247a044f8a968b7..8306643779e5eec00ab452d250f4368db059f2de 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,6 +31,7 @@ name = "all_in_one"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "aws-lc-rs",
  "cache",
  "cbindgen",
  "config",
@@ -389,15 +390,31 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
+[[package]]
+name = "aws-lc-fips-sys"
+version = "0.12.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cfb6142ca55e3c1be078c970f46b74f93b14e732b664059ef0d0ed718c10829"
+dependencies = [
+ "bindgen",
+ "cmake",
+ "dunce",
+ "fs_extra",
+ "libc",
+ "paste",
+]
+
 [[package]]
 name = "aws-lc-rs"
 version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8a47f2fb521b70c11ce7369a6c5fa4bd6af7e5d62ec06303875bafe7c6ba245"
 dependencies = [
+ "aws-lc-fips-sys",
  "aws-lc-sys",
  "mirai-annotations",
  "paste",
+ "untrusted 0.7.1",
  "zeroize",
 ]
 
@@ -587,6 +604,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-nats",
+ "aws-lc-rs",
  "proto",
  "serde",
  "serde_json",
@@ -1324,6 +1342,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-nats",
+ "aws-lc-rs",
  "bytes",
  "leash",
  "opentelemetry",
@@ -1791,6 +1810,7 @@ name = "leash"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "aws-lc-rs",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry_sdk",
@@ -2432,6 +2452,7 @@ dependencies = [
 name = "proto"
 version = "0.1.0"
 dependencies = [
+ "aws-lc-rs",
  "glob",
  "prost",
  "tonic",
@@ -2482,6 +2503,7 @@ name = "ratelimit"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "aws-lc-rs",
  "criterion",
  "env_logger",
  "hyper 1.4.0",
@@ -2601,6 +2623,7 @@ name = "rest"
 version = "0.1.0"
 dependencies = [
  "anyhow",
+ "aws-lc-rs",
  "dns-lookup",
  "futures-util",
  "hashring",
@@ -2975,6 +2998,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "async-nats",
+ "aws-lc-rs",
  "config",
  "opentelemetry",
  "opentelemetry-otlp",

diff --git a/Cargo.toml b/Cargo.toml
index fdd888eca405228764c3a291c19928c2bf414c8e..2bf73e0ea07c664ff8ef5927d7f86566efcb1ec9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,6 +23,9 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 hyper = "1.4.0"
 
+# Fix to include bindgen
+aws-lc-rs = { version = "1", features = ["bindgen"] }
+
 anyhow = "1"
 
 tracing = "0.1"

diff --git a/exes/cache/Cargo.toml b/exes/cache/Cargo.toml
index 27d99296b699ba3bafa994998b5dc581e3741c06..dc0dc35f9652cc3e637bf0ef219fbc4a410a90a6 100644 (file)
--- a/exes/cache/Cargo.toml
+++ b/exes/cache/Cargo.toml
@@ -24,3 +24,5 @@ twilight-model = "0.15.4"
 anyhow = "1.0.86"
 
 tracing = "0.1.40"
+
+aws-lc-rs = { workspace = true }
\ No newline at end of file

diff --git a/exes/gateway/Cargo.toml b/exes/gateway/Cargo.toml
index b69de60b99225dd798c11448d97364ed36192b7c..1c8e39137f03eec1a769734c2bc1ead6ad07473c 100644 (file)
--- a/exes/gateway/Cargo.toml
+++ b/exes/gateway/Cargo.toml
@@ -16,6 +16,7 @@ tokio = { workspace = true }
 anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+aws-lc-rs = { workspace = true }
 
 tokio-stream = "0.1.15"
 twilight-gateway = { default-features = false, features = ["rustls-webpki-roots"], version = "0.15.4" }

diff --git a/exes/ratelimit/Cargo.toml b/exes/ratelimit/Cargo.toml
index 2ecb2e52f8ec09a865b1fa9d41fae9b2061da190..104b5bf34e46a273e9a0063eb19334fed55d1093 100644 (file)
--- a/exes/ratelimit/Cargo.toml
+++ b/exes/ratelimit/Cargo.toml
@@ -19,6 +19,7 @@ anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 hyper = { workspace = true }
+aws-lc-rs = { workspace = true }
 
 twilight-http-ratelimiting = "0.15.3"
 tonic = "0.11.0"

diff --git a/exes/rest/Cargo.toml b/exes/rest/Cargo.toml
index 2ad376f039267673618cd776160d451cbfe6c65c..3a9286bd6da9fcca73f992a02ed4e749e7f3fbcf 100644 (file)
--- a/exes/rest/Cargo.toml
+++ b/exes/rest/Cargo.toml
@@ -19,6 +19,7 @@ anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 hyper = { workspace = true }
+aws-lc-rs = { workspace = true }
 
 futures-util = "0.3.30"
 hyper-rustls = "0.27.2"

diff --git a/libs/all_in_one/Cargo.toml b/libs/all_in_one/Cargo.toml
index 72ddf3e9cc709357fbf3856962b2b5beed0550ca..8d331df224cbe06b542c6680b7111a41f90fdc6b 100644 (file)
--- a/libs/all_in_one/Cargo.toml
+++ b/libs/all_in_one/Cargo.toml
@@ -15,6 +15,7 @@ gateway = { path = "../../exes/gateway" }
 ratelimit = { path = "../../exes/ratelimit" }
 rest = { path = "../../exes/rest" }
 webhook = { path = "../../exes/webhook" }
+aws-lc-rs = { workspace = true }
 ctrlc = "3.4.4"
 
 tokio = { version = "1.38.0", features = ["rt"] }

diff --git a/libs/leash/Cargo.toml b/libs/leash/Cargo.toml
index 82b6cc31372e8c8a2ad8ba5fbada0e81990d8675..25cb0838088bad356a0f7c9e7b21894bd2c405d2 100644 (file)
--- a/libs/leash/Cargo.toml
+++ b/libs/leash/Cargo.toml
@@ -13,6 +13,7 @@ serde = { workspace = true }
 opentelemetry = { workspace = true }
 tracing-opentelemetry = { workspace = true }
 tracing = { workspace = true }
+aws-lc-rs = { workspace = true }
 
 tracing-log = { version = "0.2.0" }
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }

diff --git a/libs/proto/Cargo.toml b/libs/proto/Cargo.toml
index 928f851921207516cba2294035badba9cbd4ee74..9ccc49ef7ebb2fac4fefd545549cc1adb5722d5f 100644 (file)
--- a/libs/proto/Cargo.toml
+++ b/libs/proto/Cargo.toml
@@ -6,6 +6,7 @@ edition = "2021"
 [dependencies]
 tonic = "0.11.0"
 prost = "0.12.6"
+aws-lc-rs = { workspace = true }
 
 [build-dependencies]
 tonic-build = "0.11.0"

diff --git a/libs/shared/Cargo.toml b/libs/shared/Cargo.toml
index e8e040b05898e1e2c0aaaab7c434cc5d02327546..dab4e337f87603a3ab89c8b7e84827e1da2ee4e2 100644 (file)
--- a/libs/shared/Cargo.toml
+++ b/libs/shared/Cargo.toml
@@ -9,6 +9,7 @@ serde_json = { workspace = true }
 opentelemetry = { workspace = true }
 tracing = { workspace = true }
 tokio = { workspace = true }
+aws-lc-rs = { workspace = true }
 
 config = { version = "0.14", default-features = false, features = ["json", "yaml-rust", "ini"] }
 redis = { version = "0.25.4", features = ["cluster", "connection-manager", "tokio-comp"] }