Added EnvVar (#24)

Reviewed-on: #24
Co-authored-by: phoenix <kundeng00@pm.me>
Co-committed-by: phoenix <kundeng00@pm.me>

.env

@@ -1,5 +1,8 @@
+RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
+MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
+SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
 ROOT_DIRECTORY=/path/to/root
 POSTGRES_MAIN_USER=myuser
 POSTGRES_MAIN_PASSWORD=password
@@ -7,3 +10,9 @@ POSTGRES_MAIN_DB=my_db
 POSTGRES_MAIN_HOST=localhost
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
 ICARUS_BASE_API_URL=https://icarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com
+APP_ENV=development
+BACKEND_PORT=8001
+FRONTEND_URL=http://localhost:4200
+RUST_LOG=debug
+ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com

.env.sample

@@ -1,5 +1,8 @@
+RANDOM_ENV_KEY="YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe"
+MODNAR_ENV_KEY="FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain"
 SECRET_MAIN_KEY=Somesupersecretpassword!!!45345435
 SECRET_KEY=AmIGoodEnoughForYou?
+SERVICE_PASSPHRASE=T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO
 ROOT_DIRECTORY=/path/to/root
 POSTGRES_MAIN_USER=myuser
 POSTGRES_MAIN_PASSWORD=password
@@ -7,3 +10,9 @@ POSTGRES_MAIN_DB=my_db
 POSTGRES_MAIN_HOST=localhost
 DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
 ICARUS_BASE_API_URL=https://icarus.com
+ICARUS_AUTH_BASE_API_URL=https://auth.icarus.com
+APP_ENV=development
+BACKEND_PORT=8001
+FRONTEND_URL=http://localhost:4200
+RUST_LOG=debug
+ALLOWED_ORIGINS=https://soaricarus.com,https://www.soaricarus.com

.gitea/workflows/tag_release.yml

@@ -3,7 +3,10 @@ name: Release Tagging
 on:
   push:
     branches:
-      - devel
+      - main
+  pull_request:
+    branches:
+      - main
 
 jobs:
   release:
@@ -17,7 +20,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
           components: cargo
 
       - name: Extract Version from Cargo.toml
@@ -28,7 +31,7 @@ jobs:
           BRANCH_REF="${GITHUB_REF}"
           BRANCH_NAME=$(echo "$BRANCH_REF" | cut -d '/' -f 3)
           PROJECT_TAG_RELEASE="v$VERSION-$BRANCH_NAME-$PROJECT_COMMIT_HASH"
-          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-950"
+          echo "::set-output name=project_tag_release::$PROJECT_TAG_RELEASE-006"
           echo "Version: $VERSION"
           echo "Hash: $PROJECT_COMMIT_HASH"
           echo "Branch: $BRANCH_NAME"

.gitea/workflows/workflow.yaml

@@ -4,11 +4,9 @@ on:
   push:
     branches:
       - main 
-      - devel
   pull_request:
     branches:
       - main 
-      - devel
 
 jobs:
   check:
@@ -18,7 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: cargo check
 
   test:
@@ -28,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: cargo test
 
   fmt:
@@ -38,7 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: rustup component add rustfmt
       - run: cargo fmt --all -- --check
 
@@ -49,7 +47,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: rustup component add clippy
       - run: cargo clippy -- -D warnings
 
@@ -60,6 +58,5 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
-          toolchain: 1.86.0
+          toolchain: 1.88.0
       - run: cargo build
-

Cargo.lock

@@ -297,7 +297,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "icarus_envy"
-version = "0.2.1"
+version = "0.4.0"
 dependencies = [
  "async-std",
  "const_format",

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "icarus_envy"
-version = "0.2.2"
+version = "0.4.0"
 edition = "2024"
-rust-version = "1.86"
+rust-version = "1.88"
 
 [dependencies]
 dotenvy = { version = "0.15.7" }

src/environment.rs

@@ -1,24 +1,104 @@
-pub async fn get_db_url() -> String {
+pub async fn get_db_url() -> crate::EnvVar {
     dotenvy::dotenv().ok();
-    std::env::var(crate::keys::DB_URL).expect(crate::keys::error::DB_URL)
+    let key = crate::keys::DB_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
 }
 
-pub async fn get_secret_main_key() -> String {
+pub async fn get_secret_main_key() -> crate::EnvVar {
     dotenvy::dotenv().ok();
-    std::env::var(crate::keys::SECRET_MAIN_KEY).expect(crate::keys::error::SECRET_MAIN_KEY)
+    let key = crate::keys::SECRET_MAIN_KEY;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
 }
 
-pub async fn get_secret_key() -> String {
+pub async fn get_service_passphrase() -> crate::EnvVar {
     dotenvy::dotenv().ok();
-    std::env::var(crate::keys::SECRET_KEY).expect(crate::keys::error::SECRET_KEY)
+    let key = crate::keys::SERVICE_PASSPHRASE;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
 }
 
-pub async fn get_root_directory() -> String {
+pub async fn get_secret_key() -> crate::EnvVar {
     dotenvy::dotenv().ok();
-    std::env::var(crate::keys::ROOT_DIRECTORY).expect(crate::keys::error::ROOT_DIRECTORY)
+    let key = crate::keys::SECRET_KEY;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
 }
 
-pub async fn get_icarus_base_api_url() -> String {
+pub async fn get_root_directory() -> crate::EnvVar {
     dotenvy::dotenv().ok();
-    std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
+    let key = crate::keys::ROOT_DIRECTORY;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_icarus_base_api_url() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::ICARUS_BASE_API_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_icarus_auth_base_api_url() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::ICARUS_AUTH_BASE_API_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_app_env() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::APP_ENV;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_backend_port() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::BACKEND_PORT;
+    let value = std::env::var(key).expect(key);
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_frontend_url() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::FRONTEND_URL;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_rust_log() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::RUST_LOG;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+pub async fn get_allowed_origins() -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    let key = crate::keys::ALLOWED_ORIGINS;
+    let value = std::env::var(key).expect(key);
+
+    crate::init_envvar(key, &value)
+}
+
+/// Get environment not specified in the code
+pub async fn get_env(environment: &str) -> crate::EnvVar {
+    dotenvy::dotenv().ok();
+    // let key = crate::keys::
+    let my_error = format!("{environment} {}", crate::keys::error::GENERAL_ERROR);
+    let value = std::env::var(environment).expect(&my_error);
+
+    crate::init_envvar(environment, &value)
 }

src/keys.rs

@@ -1,27 +1,52 @@
-// Environment key for Database management
+/// Environment key for Database management
 pub const DB_URL: &str = "DATABASE_URL";
 
-// Environment key for secret main key
-// Used for the icarus app
+/// Environment key for secret main key
+/// Used for the icarus app
 pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
 
-// Environment key for secret key
-// Generic use of secret key that could be found in various apps
+/// Environment key for service logins
+pub const SERVICE_PASSPHRASE: &str = "SERVICE_PASSPHRASE";
+
+/// Environment key for secret key
+/// Generic use of secret key that could be found in various apps
 pub const SECRET_KEY: &str = "SECRET_KEY";
 
-// Environment key for root directory for the icarus app
+/// Environment key for root directory for the icarus app
 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";
 
+/// 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 {
     use const_format::concatcp;
 
     pub const GENERAL_ERROR: &str = "must not be set in enviornment file";
     pub const DB_URL: &str = concatcp!(super::DB_URL, " ", GENERAL_ERROR);
-    pub const SECRET_KEY: &str = concatcp!(super::SECRET_KEY, " ", GENERAL_ERROR);
     pub const SECRET_MAIN_KEY: &str = concatcp!(super::SECRET_MAIN_KEY, " ", GENERAL_ERROR);
+    pub const SERVICE_LOGIN: &str = concatcp!(super::SERVICE_PASSPHRASE, " ", 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 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);
 }

src/lib.rs

@@ -1,2 +1,15 @@
 pub mod environment;
 pub mod keys;
+
+#[derive(Debug, Default, Clone)]
+pub struct EnvVar {
+    pub key: String,
+    pub value: String,
+}
+
+pub fn init_envvar(key: &str, value: &str) -> EnvVar {
+    EnvVar {
+        key: key.to_string(),
+        value: value.to_string(),
+    }
+}

tests/test.rs

@@ -4,7 +4,7 @@ mod tests {
     fn test_dburl() {
         let result = async_std::task::block_on(icarus_envy::environment::get_db_url());
         assert_eq!(
-            result, "postgres://myuser:password@localhost:5432/my_db",
+            result.value, "postgres://myuser:password@localhost:5432/my_db",
             "DATABASE_URL does not match {:?}",
             result
         );
@@ -14,17 +14,27 @@ mod tests {
     fn test_get_secret_main_key() {
         let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key());
         assert_eq!(
-            result, "Somesupersecretpassword!!!45345435",
+            result.value, "Somesupersecretpassword!!!45345435",
             "SECRET_MAIN_KEY does not match {:?}",
             result
         )
     }
 
+    #[test]
+    fn test_get_service_passphrase() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
+        assert_eq!(
+            result.value, "T5OCHDHadAtuOWIqRAS7u8XHDDkzKT1Uvvw7mGMkNzKjVdlHA8xGdILf2adDHspO",
+            "SERVICE_PASSPHRASE does not match {:?}",
+            result
+        )
+    }
+
     #[test]
     fn test_get_secret_key() {
         let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());
         assert_eq!(
-            result, "AmIGoodEnoughForYou?",
+            result.value, "AmIGoodEnoughForYou?",
             "SECRET_KEY does not match {:?}",
             result
         )
@@ -34,7 +44,7 @@ mod tests {
     fn test_get_root_directory() {
         let result = async_std::task::block_on(icarus_envy::environment::get_root_directory());
         assert_eq!(
-            result, "/path/to/root",
+            result.value, "/path/to/root",
             "ROOT_DIRECTORY does not match {:?}",
             result
         )
@@ -44,9 +54,89 @@ mod tests {
     fn test_get_icarus_base_api_url() {
         let result = async_std::task::block_on(icarus_envy::environment::get_icarus_base_api_url());
         assert_eq!(
-            result, "https://icarus.com",
+            result.value, "https://icarus.com",
             "ICARUS_BASE_API_URL does not match {:?}",
             result
         )
     }
+
+    #[test]
+    fn test_get_app_env() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_app_env());
+        assert_eq!(
+            result.value,
+            "development",
+            "{} does not match {:?}",
+            icarus_envy::keys::APP_ENV,
+            result
+        )
+    }
+
+    #[test]
+    fn test_get_backend_port() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_backend_port());
+        assert_eq!(
+            result.value,
+            "8001",
+            "{} does not match {:?}",
+            icarus_envy::keys::BACKEND_PORT,
+            result
+        )
+    }
+    #[test]
+    fn test_get_frontend_url() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_frontend_url());
+        assert_eq!(
+            result.value,
+            "http://localhost:4200",
+            "{} does not match {:?}",
+            icarus_envy::keys::FRONTEND_URL,
+            result
+        )
+    }
+    #[test]
+    fn test_get_rust_log() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_rust_log());
+        assert_eq!(
+            result.value,
+            "debug",
+            "{} does not match {:?}",
+            icarus_envy::keys::RUST_LOG,
+            result
+        )
+    }
+    #[test]
+    fn test_get_allowed_origins() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_allowed_origins());
+        assert_eq!(
+            result.value,
+            "https://soaricarus.com,https://www.soaricarus.com",
+            "{} does not match {:?}",
+            icarus_envy::keys::ALLOWED_ORIGINS,
+            result
+        )
+    }
+
+    #[test]
+    fn test_get_env() {
+        let keys = vec![
+            (
+                "RANDOM_ENV_KEY",
+                "YouDon'tWantToButYouGottaChange|It'sGoingToHurtYouTryingToStayTheSame|AreYouInItOrYouInItForTheFame?|I'mTryingToFigureOutWhoLoveMeForMe",
+            ),
+            (
+                "MODNAR_ENV_KEY",
+                "FeelingTheMonsterClimbDeepserInsideOfMe|FeelingHimGnawingMyHeartAwayHungrily|I'llNeverLoseThisPain|NeverDreamOfYouAgain",
+            ),
+        ];
+
+        for (key, value) in keys.iter() {
+            let result = async_std::task::block_on(icarus_envy::environment::get_env(key));
+            assert_eq!(
+                result.value, *value,
+                "{:?} does not match {:?}",
+                key, result
+            )
+        }
+    }
 }