Skip to content

Commit

Permalink
AA/kbs_protocol: rename feature name aa_token to aa_ttrpc
Browse files Browse the repository at this point in the history
This feature enables dependencies to leverage ttrpc capabilities to
connect to AA via ttrpc, thus `aa_ttrpc` is a better name for future
extension.

Signed-off-by: Xynnn007 <xynnn@linux.alibaba.com>
  • Loading branch information
Xynnn007 committed Jan 17, 2025
1 parent 125cad2 commit d35cfa7
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions attestation-agent/kbs_protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ required-features = ["bin"]
default = ["background_check", "passport", "rust-crypto", "all-attesters"]

passport = []
# use a client of attestation-agent to get token for kbs
aa_token = ["ttrpc-codegen", "passport", "ttrpc/async", "protobuf"]
# Allow to connect Attestation-Agent with TTRPC to get evidence, token, etc.
aa_ttrpc = ["ttrpc-codegen", "passport", "ttrpc/async", "protobuf"]

background_check = ["tokio/time"]
all-attesters = ["attester/all-attesters"]
Expand Down
2 changes: 1 addition & 1 deletion attestation-agent/kbs_protocol/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//

fn main() -> Result<(), Box<dyn std::error::Error>> {
#[cfg(feature = "aa_token")]
#[cfg(feature = "aa_ttrpc")]
{
use std::fs::File;
use std::io::{Read, Write};
Expand Down
4 changes: 2 additions & 2 deletions attestation-agent/kbs_protocol/src/token_provider/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
pub mod test;
pub use test::*;

#[cfg(feature = "aa_token")]
#[cfg(feature = "aa_ttrpc")]
pub mod aa;
#[cfg(feature = "aa_token")]
#[cfg(feature = "aa_ttrpc")]
pub use aa::*;

use anyhow::*;
Expand Down
2 changes: 1 addition & 1 deletion confidential-data-hub/hub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ image-rs = { path = "../../image-rs", default-features = false, features = [
] }
kbs_protocol = { path = "../../attestation-agent/kbs_protocol", default-features = false, features = [
"passport",
"aa_token",
"aa_ttrpc",
"openssl",
], optional = true }
log.workspace = true
Expand Down

0 comments on commit d35cfa7

Please sign in to comment.