Compare commits
3 Commits
v0.3.3-20-
...
v0.3.1-18-
Author | SHA1 | Date | |
---|---|---|---|
93642b9bb3
|
|||
cda52a660f
|
|||
6353336bba
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "icarus_envy"
|
name = "icarus_envy"
|
||||||
version = "0.3.3"
|
version = "0.3.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-std",
|
"async-std",
|
||||||
"const_format",
|
"const_format",
|
||||||
|
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "icarus_envy"
|
name = "icarus_envy"
|
||||||
version = "0.3.3"
|
version = "0.3.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
rust-version = "1.88"
|
rust-version = "1.88"
|
||||||
|
|
||||||
|
@@ -27,41 +27,3 @@ pub async fn get_icarus_base_api_url() -> String {
|
|||||||
dotenvy::dotenv().ok();
|
dotenvy::dotenv().ok();
|
||||||
std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
|
std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_icarus_auth_base_api_url() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::ICARUS_AUTH_BASE_API_URL)
|
|
||||||
.expect(crate::keys::error::ICARUS_AUTH_BASE_API_URL)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_app_env() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::APP_ENV).expect(crate::keys::error::APP_ENV)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_backend_port() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::BACKEND_PORT).expect(crate::keys::error::BACKEND_PORT)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_frontend_url() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::FRONTEND_URL).expect(crate::keys::error::FRONTEND_URL)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_rust_log() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::RUST_LOG).expect(crate::keys::error::RUST_LOG)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_allowed_origins() -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
std::env::var(crate::keys::ALLOWED_ORIGINS).expect(crate::keys::error::ALLOWED_ORIGINS)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Get environment not specified in the code
|
|
||||||
pub async fn get_env(environment: &str) -> String {
|
|
||||||
dotenvy::dotenv().ok();
|
|
||||||
let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR);
|
|
||||||
std::env::var(environment).expect(&my_error)
|
|
||||||
}
|
|
||||||
|
21
src/keys.rs
21
src/keys.rs
@@ -18,20 +18,6 @@ pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
|
|||||||
// Environment key for icarus api url
|
// Environment key for icarus api url
|
||||||
pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
|
pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
|
||||||
|
|
||||||
// Environment key for icarus auth api url
|
|
||||||
pub const ICARUS_AUTH_BASE_API_URL: &str = "ICARUS_AUTH_BASE_API_URL";
|
|
||||||
|
|
||||||
/// Environment key for App status
|
|
||||||
pub const APP_ENV: &str = "APP_ENV";
|
|
||||||
/// Environment key for backend port. Used for both auth and core functionality
|
|
||||||
pub const BACKEND_PORT: &str = "BACKEND_PORT";
|
|
||||||
/// Environment key for frontend url
|
|
||||||
pub const FRONTEND_URL: &str = "FRONTEND_URL";
|
|
||||||
/// Environment key for application logging
|
|
||||||
pub const RUST_LOG: &str = "RUST_LOG";
|
|
||||||
/// Environment key for allowed origins for CORS support
|
|
||||||
pub const ALLOWED_ORIGINS: &str = "ALLOWED_ORIGINS";
|
|
||||||
|
|
||||||
pub mod error {
|
pub mod error {
|
||||||
use const_format::concatcp;
|
use const_format::concatcp;
|
||||||
|
|
||||||
@@ -42,11 +28,4 @@ pub mod error {
|
|||||||
pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
|
pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
|
||||||
pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
|
pub const ROOT_DIRECTORY: &str = concatcp!(super::ROOT_DIRECTORY, " ", GENERAL_ERROR);
|
||||||
pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR);
|
pub const ICARUS_BASE_API_URL: &str = concatcp!(super::ICARUS_BASE_API_URL, " ", GENERAL_ERROR);
|
||||||
pub const ICARUS_AUTH_BASE_API_URL: &str =
|
|
||||||
concatcp!(super::ICARUS_AUTH_BASE_API_URL, " ", GENERAL_ERROR);
|
|
||||||
pub const APP_ENV: &str = concatcp!(super::APP_ENV, " ", GENERAL_ERROR);
|
|
||||||
pub const BACKEND_PORT: &str = concatcp!(super::BACKEND_PORT, " ", GENERAL_ERROR);
|
|
||||||
pub const FRONTEND_URL: &str = concatcp!(super::FRONTEND_URL, " ", GENERAL_ERROR);
|
|
||||||
pub const RUST_LOG: &str = concatcp!(super::RUST_LOG, " ", GENERAL_ERROR);
|
|
||||||
pub const ALLOWED_ORIGINS: &str = concatcp!(super::ALLOWED_ORIGINS, " ", GENERAL_ERROR);
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user