testnet/detee-cli
3
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

shorten UUIDs (not sure about this one)

Browse Source
This commit is contained in:
ghe0 2025-03-30 23:36:09 +03:00
parent 896884a1e1
commit b53d10abca
4 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/general/cli_handler.rs
View File

@ -68,10 +68,10 @@ complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/vms/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/vms/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from ssh' -a '(cat ~/.detee/cli/vms/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand vm; and __fish_seen_subcommand_from ssh' -a '(cat ~/.detee/cli/vms/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from app config update' -a '(cat ~/.detee/cli/apps/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from update' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from app config get' -a '(cat ~/.detee/cli/apps/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from get' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from app delete' -a '(cat ~/.detee/cli/apps/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from delete' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from app inspect' -a '(cat ~/.detee/cli/apps/uuid_list)' -f complete -c detee-cli -n '__fish_detee_cli_using_subcommand app; and __fish_seen_subcommand_from inspect' -a '(cat ~/.detee/cli/apps/uuid_list)' -f
"#; "#;
pub fn handle_completion(matches: &ArgMatches, cmd: Command) { pub fn handle_completion(matches: &ArgMatches, cmd: Command) {

6
src/sgx/mod.rs
View File

@ -5,10 +5,9 @@ pub mod grpc_dtpm;
pub mod packaging; pub mod packaging;
pub mod utils; pub mod utils;
use std::sync::LazyLock;
use crate::config::Config; use crate::config::Config;
use crate::snp; use crate::snp;
use crate::utils::shorten_string;
use crate::{constants::HRATLS_APP_PORT, utils::block_on}; use crate::{constants::HRATLS_APP_PORT, utils::block_on};
use detee_shared::{ use detee_shared::{
app_proto::{ app_proto::{
@ -19,6 +18,7 @@ use detee_shared::{
}; };
use grpc_brain::get_one_app_node; use grpc_brain::get_one_app_node;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::sync::LazyLock;
use tabled::Tabled; use tabled::Tabled;
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
@ -37,7 +37,7 @@ pub enum Error {
pub struct AppContract { pub struct AppContract {
#[tabled(rename = "Location")] #[tabled(rename = "Location")]
pub location: String, pub location: String,
#[tabled(rename = "UUID")] #[tabled(rename = "UUID pfx", display_with = "shorten_string")]
pub uuid: String, pub uuid: String,
pub name: String, pub name: String,
#[tabled(rename = "Cores")] #[tabled(rename = "Cores")]

5
src/snp/mod.rs
View File

@ -3,8 +3,9 @@ pub mod deploy;
pub mod grpc; pub mod grpc;
mod injector; mod injector;
pub mod update; pub mod update;
use crate::utils::block_on;
use crate::utils::block_on;
use crate::utils::shorten_string;
use crate::{ use crate::{
config::{self, Config}, config::{self, Config},
snp, snp,
@ -169,7 +170,7 @@ impl Distro {
pub struct VmContract { pub struct VmContract {
#[tabled(rename = "Location")] #[tabled(rename = "Location")]
pub location: String, pub location: String,
#[tabled(rename = "UUID")] #[tabled(rename = "UUID pfx", display_with = "shorten_string")]
pub uuid: String, pub uuid: String,
pub hostname: String, pub hostname: String,
#[tabled(rename = "Cores")] #[tabled(rename = "Cores")]

17
src/utils.rs
View File

@ -1,7 +1,8 @@
use crate::config::Config; use crate::config::Config;
use tonic::metadata::errors::InvalidMetadataValue; use tonic::{
use tonic::metadata::AsciiMetadataValue; metadata::{errors::InvalidMetadataValue, AsciiMetadataValue},
use tonic::Request; Request,
};
#[derive(thiserror::Error, Debug)] #[derive(thiserror::Error, Debug)]
pub enum Error { pub enum Error {
@ -31,3 +32,13 @@ pub fn sign_request<T: std::fmt::Debug>(req: T) -> Result<Request<T>, Error> {
req.metadata_mut().insert("request-signature", signature); req.metadata_mut().insert("request-signature", signature);
Ok(req) Ok(req)
} }
pub fn shorten_string(my_string: &String) -> String {
if my_string.len() <= 8 {
my_string.to_string()
} else {
let first_part = &my_string[..8];
// let last_part = &my_string[my_string.len() - 4..];
format!("{}", first_part)
}
}