diff --git a/eden/mononoke/edenapi_service/src/lib.rs b/eden/mononoke/edenapi_service/src/lib.rs index 4a2f865370..b4db758bf1 100644 --- a/eden/mononoke/edenapi_service/src/lib.rs +++ b/eden/mononoke/edenapi_service/src/lib.rs @@ -80,7 +80,7 @@ pub fn build( fb, logger.clone(), common_config.internal_identity.clone(), - ClientEntryPoint::EdenAPI, + ClientEntryPoint::EdenApi, )) .add(ServerIdentityMiddleware::new(HeaderValue::from_static( "edenapi_server", diff --git a/eden/mononoke/lfs_server/src/main.rs b/eden/mononoke/lfs_server/src/main.rs index 0658d43378..d4275e296e 100644 --- a/eden/mononoke/lfs_server/src/main.rs +++ b/eden/mononoke/lfs_server/src/main.rs @@ -335,7 +335,7 @@ fn main(fb: FacebookInit) -> Result<(), Error> { fb, logger.clone(), internal_identity, - ClientEntryPoint::LFS, + ClientEntryPoint::LfsServer, )) .add(PostResponseMiddleware::with_config(config_handle)) .add(RequestContextMiddleware::new( diff --git a/eden/mononoke/scs/client/src/connection.rs b/eden/mononoke/scs/client/src/connection.rs index 0b56ad2b34..40bf769964 100644 --- a/eden/mononoke/scs/client/src/connection.rs +++ b/eden/mononoke/scs/client/src/connection.rs @@ -68,7 +68,7 @@ impl Connection { use source_control_srclients::make_SourceControlService_srclient; use srclient::ClientParams; - let client_info = ClientInfo::new_with_entry_point(ClientEntryPoint::SCS_CLI)?; + let client_info = ClientInfo::new_with_entry_point(ClientEntryPoint::ScsClient)?; let headers = hashmap! { String::from(CLIENT_INFO_HEADER) => client_info.to_json()?, }; diff --git a/eden/mononoke/scs_server/src/source_control_impl.rs b/eden/mononoke/scs_server/src/source_control_impl.rs index 59aa1a0631..31d8b91755 100644 --- a/eden/mononoke/scs_server/src/source_control_impl.rs +++ b/eden/mononoke/scs_server/src/source_control_impl.rs @@ -289,8 +289,9 @@ impl SourceControlServiceImpl { if let Some(other_cats) = header(FORWARDED_OTHER_CATS_HEADER)? { metadata.add_raw_encoded_cats(other_cats); } - let client_info = client_info - .unwrap_or_else(|| ClientInfo::default_with_entry_point(ClientEntryPoint::SCS)); + let client_info = client_info.unwrap_or_else(|| { + ClientInfo::default_with_entry_point(ClientEntryPoint::ScsServer) + }); metadata.add_client_info(client_info); return Ok(metadata); } @@ -306,7 +307,7 @@ impl SourceControlServiceImpl { .await; let client_info = client_info - .unwrap_or_else(|| ClientInfo::default_with_entry_point(ClientEntryPoint::SCS)); + .unwrap_or_else(|| ClientInfo::default_with_entry_point(ClientEntryPoint::ScsServer)); metadata.add_client_info(client_info); Ok(metadata) } diff --git a/eden/mononoke/server/repo_listener/src/http_service.rs b/eden/mononoke/server/repo_listener/src/http_service.rs index cf78367873..4e07519044 100644 --- a/eden/mononoke/server/repo_listener/src/http_service.rs +++ b/eden/mononoke/server/repo_listener/src/http_service.rs @@ -584,7 +584,7 @@ mod h2m { .await; let client_info = client_info.unwrap_or_else(|| { - ClientInfo::default_with_entry_point(ClientEntryPoint::EdenAPI) + ClientInfo::default_with_entry_point(ClientEntryPoint::EdenApi) }); metadata.add_client_info(client_info); @@ -612,7 +612,7 @@ mod h2m { .await; let client_info = client_info - .unwrap_or_else(|| ClientInfo::default_with_entry_point(ClientEntryPoint::EdenAPI)); + .unwrap_or_else(|| ClientInfo::default_with_entry_point(ClientEntryPoint::EdenApi)); metadata.add_client_info(client_info); Ok(metadata) diff --git a/eden/scm/lib/clientinfo/src/request_info.rs b/eden/scm/lib/clientinfo/src/request_info.rs index 2334c2c451..3648f48808 100644 --- a/eden/scm/lib/clientinfo/src/request_info.rs +++ b/eden/scm/lib/clientinfo/src/request_info.rs @@ -22,7 +22,7 @@ const ENV_SAPLING_CLIENT_ENTRY_POINT: &str = "SAPLING_CLIENT_ENTRY_POINT"; const ENV_SAPLING_CLIENT_CORRELATOR: &str = "SAPLING_CLIENT_CORRELATOR"; const DEFAULT_CLIENT_ENTRY_POINT_SAPLING: ClientEntryPoint = ClientEntryPoint::Sapling; -const DEFAULT_CLIENT_ENTRY_POINT_EDENFS: ClientEntryPoint = ClientEntryPoint::EdenFS; +const DEFAULT_CLIENT_ENTRY_POINT_EDENFS: ClientEntryPoint = ClientEntryPoint::EdenFs; // The global static ClientRequestInfo lazy_static! { @@ -110,16 +110,16 @@ pub struct ClientRequestInfo { #[derive(Clone, Deserialize, Serialize, Debug, PartialEq, Eq)] pub enum ClientEntryPoint { Sapling, - EdenFS, - SCS, - SCMQuery, - EdenAPI, + EdenFs, + ScsServer, + ScmQuery, + EdenApi, LandService, - LFS, + LfsServer, DerivedDataService, DerivationWorker, - ISL, - SCS_CLI, + InteractiveSmartlog, + ScsClient, } impl ClientRequestInfo { @@ -172,16 +172,16 @@ impl Display for ClientEntryPoint { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { let out = match self { ClientEntryPoint::Sapling => "sapling", - ClientEntryPoint::EdenFS => "edenfs", - ClientEntryPoint::SCS => "scs", - ClientEntryPoint::SCMQuery => "scm_query", - ClientEntryPoint::EdenAPI => "eden_api", + ClientEntryPoint::EdenFs => "edenfs", + ClientEntryPoint::ScsServer => "scs", + ClientEntryPoint::ScmQuery => "scm_query", + ClientEntryPoint::EdenApi => "eden_api", ClientEntryPoint::LandService => "landservice", - ClientEntryPoint::LFS => "lfs", + ClientEntryPoint::LfsServer => "lfs", ClientEntryPoint::DerivedDataService => "derived_data_service", ClientEntryPoint::DerivationWorker => "derivation_worker", - ClientEntryPoint::ISL => "isl", - ClientEntryPoint::SCS_CLI => "scsc", + ClientEntryPoint::InteractiveSmartlog => "isl", + ClientEntryPoint::ScsClient => "scsc", }; write!(f, "{}", out) } @@ -193,15 +193,15 @@ impl TryFrom<&str> for ClientEntryPoint { fn try_from(value: &str) -> Result { match value { "sapling" => Ok(ClientEntryPoint::Sapling), - "edenfs" => Ok(ClientEntryPoint::EdenFS), - "scs" => Ok(ClientEntryPoint::SCS), - "scm_query" => Ok(ClientEntryPoint::SCMQuery), - "eden_api" => Ok(ClientEntryPoint::EdenAPI), + "edenfs" => Ok(ClientEntryPoint::EdenFs), + "scs" => Ok(ClientEntryPoint::ScsServer), + "scm_query" => Ok(ClientEntryPoint::ScmQuery), + "eden_api" => Ok(ClientEntryPoint::EdenApi), "landservice" => Ok(ClientEntryPoint::LandService), - "lfs" => Ok(ClientEntryPoint::LFS), + "lfs" => Ok(ClientEntryPoint::LfsServer), "derived_data_service" => Ok(ClientEntryPoint::DerivedDataService), - "isl" => Ok(ClientEntryPoint::ISL), - "scsc" => Ok(ClientEntryPoint::SCS_CLI), + "isl" => Ok(ClientEntryPoint::InteractiveSmartlog), + "scsc" => Ok(ClientEntryPoint::ScsClient), _ => Err(anyhow!("Invalid client entry point")), } } @@ -223,13 +223,13 @@ mod tests { let correlator = "test1234".to_owned(); let main_id = "user:test".to_owned(); - let entry_point = ClientEntryPoint::EdenAPI; + let entry_point = ClientEntryPoint::EdenApi; cri.set_main_id(main_id.clone()); cri.set_entry_point(entry_point); cri.set_correlator(correlator.clone()); assert_eq!(cri.main_id, Some(main_id)); - assert_eq!(cri.entry_point, ClientEntryPoint::EdenAPI); + assert_eq!(cri.entry_point, ClientEntryPoint::EdenApi); assert_eq!(cri.correlator, correlator); assert!(cri.has_main_id()); } @@ -240,7 +240,7 @@ mod tests { set_var(ENV_SAPLING_CLIENT_CORRELATOR, correlator); set_var(ENV_SAPLING_CLIENT_ENTRY_POINT, "isl"); let cri = get_client_request_info(); - assert_eq!(cri.entry_point, ClientEntryPoint::ISL); + assert_eq!(cri.entry_point, ClientEntryPoint::InteractiveSmartlog); assert_eq!(cri.correlator, correlator.to_owned()); } }