From 6b84cc42d67c925386d7d4ffdf9aef9e686f9953 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 1 Jul 2026 22:53:09 -0400 Subject: [PATCH] Removing async from functions --- src/config/auxiliary/mod.rs | 11 +++++------ src/envy/environment.rs | 30 ++++++++++++++---------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/config/auxiliary/mod.rs b/src/config/auxiliary/mod.rs index 069c381..6d82691 100644 --- a/src/config/auxiliary/mod.rs +++ b/src/config/auxiliary/mod.rs @@ -20,12 +20,11 @@ impl TwilioConfig { } } -// TODO: Remove the async at a later point -pub async fn load_config() -> Result { - let auth_sid_var = crate::envy::environment::get_env("TWILIO_AUTH_SID").await; - let service_sid_var = crate::envy::environment::get_env("TWILIO_SERVICE_SID").await; - let auth_token_var = crate::envy::environment::get_env("TWILIO_AUTH_TOKEN").await; - let phone_number_var = crate::envy::environment::get_env("TWILIO_PHONE_NUMBER").await; +pub fn load_config() -> Result { + let auth_sid_var = crate::envy::environment::get_env("TWILIO_AUTH_SID"); + let service_sid_var = crate::envy::environment::get_env("TWILIO_SERVICE_SID"); + let auth_token_var = crate::envy::environment::get_env("TWILIO_AUTH_TOKEN"); + let phone_number_var = crate::envy::environment::get_env("TWILIO_PHONE_NUMBER"); if auth_sid_var.value.is_empty() || service_sid_var.value.is_empty() diff --git a/src/envy/environment.rs b/src/envy/environment.rs index e006a6d..bd673c9 100644 --- a/src/envy/environment.rs +++ b/src/envy/environment.rs @@ -1,6 +1,4 @@ -// TODO: Functions does not need to be async - -pub async fn get_db_url() -> crate::envy::EnvVar { +pub fn get_db_url() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::DB_URL; let value = std::env::var(key).expect(key); @@ -8,7 +6,7 @@ pub async fn get_db_url() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_secret_main_key() -> crate::envy::EnvVar { +pub fn get_secret_main_key() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::SECRET_MAIN_KEY; let value = std::env::var(key).expect(key); @@ -16,7 +14,7 @@ pub async fn get_secret_main_key() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_service_passphrase() -> crate::envy::EnvVar { +pub fn get_service_passphrase() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::SERVICE_PASSPHRASE; let value = std::env::var(key).expect(key); @@ -24,7 +22,7 @@ pub async fn get_service_passphrase() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_secret_key() -> crate::envy::EnvVar { +pub fn get_secret_key() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::SECRET_KEY; let value = std::env::var(key).expect(key); @@ -32,7 +30,7 @@ pub async fn get_secret_key() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_root_directory() -> crate::envy::EnvVar { +pub fn get_root_directory() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::ROOT_DIRECTORY; let value = std::env::var(key).expect(key); @@ -40,7 +38,7 @@ pub async fn get_root_directory() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_app_base_api_url() -> crate::envy::EnvVar { +pub fn get_app_base_api_url() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::TEXTSENDER_BASE_API_URL; let value = std::env::var(key).expect(key); @@ -48,7 +46,7 @@ pub async fn get_app_base_api_url() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_app_auth_base_api_url() -> crate::envy::EnvVar { +pub fn get_app_auth_base_api_url() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::TEXTSENDER_AUTH_BASE_API_URL; let value = std::env::var(key).expect(key); @@ -56,7 +54,7 @@ pub async fn get_app_auth_base_api_url() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_app_env() -> crate::envy::EnvVar { +pub fn get_app_env() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::APP_ENV; let value = std::env::var(key).expect(key); @@ -64,14 +62,14 @@ pub async fn get_app_env() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_backend_port() -> crate::envy::EnvVar { +pub fn get_backend_port() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::BACKEND_PORT; let value = std::env::var(key).expect(key); crate::envy::init_envvar(key, &value) } -pub async fn get_frontend_url() -> crate::envy::EnvVar { +pub fn get_frontend_url() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::FRONTEND_URL; let value = std::env::var(key).expect(key); @@ -79,7 +77,7 @@ pub async fn get_frontend_url() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_rust_log() -> crate::envy::EnvVar { +pub fn get_rust_log() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::RUST_LOG; let value = std::env::var(key).expect(key); @@ -87,7 +85,7 @@ pub async fn get_rust_log() -> crate::envy::EnvVar { crate::envy::init_envvar(key, &value) } -pub async fn get_allowed_origins() -> crate::envy::EnvVar { +pub fn get_allowed_origins() -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let key = crate::envy::keys::ALLOWED_ORIGINS; let value = std::env::var(key).expect(key); @@ -98,8 +96,8 @@ pub async fn get_allowed_origins() -> crate::envy::EnvVar { envvar } -/// Get environment not specified in the code -pub async fn get_env(environment: &str) -> crate::envy::EnvVar { +/// Get environment not specified in the library +pub fn get_env(environment: &str) -> crate::envy::EnvVar { dotenvy::dotenv().ok(); let my_error = format!("{environment} {}", crate::envy::keys::error::GENERAL_ERROR); let value = std::env::var(environment).expect(&my_error);