Skip to content

Commit d505bf6

Browse files
imlk0claude
andcommitted
build(as): drop shadow_rs from runtime deps, use const_format for concatcp
Remove shadow_rs from the build artifact, using it only at build time, which avoids pulling libgit2-sys into the resulting binary. Replace shadow_rs::concatcp in the token module with const_format::concatcp, and manage the const_format dependency at the workspace level. Co-Authored-By: Claude <noreply@anthropic.com> Signed-off-by: Kun Lai <laikun@linux.alibaba.com>
1 parent 226dc32 commit d505bf6

9 files changed

Lines changed: 10 additions & 7 deletions

File tree

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ serde_with = { version = "1.11.0", features = ["base64", "hex"] }
5757
serial_test = "0.9.0"
5858
sha2 = "0.10"
5959
shadow-rs = "0.19.0"
60+
const_format = "0.2"
6061
sqlx = { version = "0.7", default-features = false, features = ["runtime-tokio-rustls", "mysql", "sqlite", "any", "json", "chrono"] }
6162
strum = { version = "0.25", features = ["derive"] }
6263
thiserror = "2.0"

attestation-service/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ serde_json.workspace = true
8282
serde_variant = "0.1.2"
8383
sha2.workspace = true
8484
sm3 = "0.4.2"
85-
shadow-rs.workspace = true
85+
shadow-rs = { workspace = true, default-features = false }
8686
strum.workspace = true
8787
tempfile.workspace = true
8888
time = { version = "0.3.23", features = ["std"] }
@@ -92,6 +92,7 @@ toml.workspace = true
9292
tonic = { workspace = true, optional = true }
9393
uuid = { version = "1.1.2", features = ["v4"] }
9494
verifier = { path = "../deps/verifier", default-features = false }
95+
const_format.workspace = true
9596

9697
[build-dependencies]
9798
shadow-rs.workspace = true

attestation-service/src/token/ear_broker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use anyhow::*;
77

88
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
99
use base64::Engine;
10+
use const_format::concatcp;
1011
use ear::{
1112
Algorithm, Appraisal, Ear, ExtensionKind, ExtensionValue, Extensions, RawValue, TrustVector,
1213
VerifierID,
@@ -22,7 +23,6 @@ use openssl::x509::X509;
2223
use serde::Deserialize;
2324
use serde_json::{json, Value};
2425
use serde_variant::to_variant_name;
25-
use shadow_rs::concatcp;
2626
use std::collections::{BTreeMap, HashMap};
2727
use std::path::Path;
2828
use std::sync::Arc;

attestation-service/src/token/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55

66
use crate::TeeClaims;
77
use anyhow::*;
8+
use const_format::concatcp;
89
use serde::Deserialize;
9-
use shadow_rs::concatcp;
1010
use std::collections::HashMap;
1111
use strum::Display;
1212

attestation-service/src/token/oidc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use anyhow::*;
1111
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
1212
use base64::Engine;
13+
use const_format::concatcp;
1314
use log::info;
1415
use openssl::rsa::Rsa;
1516
use openssl::sign::Signer;
@@ -23,7 +24,6 @@ use rand::{thread_rng, Rng};
2324
use serde::Deserialize;
2425
use serde_json::{json, Map, Value};
2526
use serde_variant::to_variant_name;
26-
use shadow_rs::concatcp;
2727
use std::collections::{HashMap, HashSet};
2828
use std::path::Path;
2929
use std::sync::Arc;

attestation-service/src/token/simple.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use anyhow::*;
1111
use base64::engine::general_purpose::URL_SAFE_NO_PAD;
1212
use base64::Engine;
13+
use const_format::concatcp;
1314
use log::info;
1415
use openssl::rsa::Rsa;
1516
use openssl::sign::Signer;
@@ -23,7 +24,6 @@ use rand::{thread_rng, Rng};
2324
use serde::Deserialize;
2425
use serde_json::{json, Map, Value};
2526
use serde_variant::to_variant_name;
26-
use shadow_rs::concatcp;
2727
use std::collections::HashMap;
2828
use std::path::Path;
2929
use std::sync::Arc;

deps/kms/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ anyhow.workspace = true
1010
async-trait.workspace = true
1111
base64.workspace = true
1212
chrono.workspace = true
13-
const_format = "0.2"
13+
const_format.workspace = true
1414
hex.workspace = true
1515
log.workspace = true
1616
prost.workspace = true

kbs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ cfg-if.workspace = true
6262
clap = { workspace = true, features = ["derive", "env"] }
6363
config.workspace = true
6464
concat-kdf = "0.1.0"
65-
const_format = "0.2.36"
65+
const_format.workspace = true
6666
cryptoki = { version = "0.8.0", optional = true }
6767
env_logger.workspace = true
6868
jsonwebtoken = { workspace = true, default-features = false }

0 commit comments

Comments
 (0)