3 Commits

Author SHA1 Message Date
7df6fe5821 Added test (#10)
All checks were successful
Release Tagging / release (push) Successful in 31s
Rust Build / Check (push) Successful in 26s
Rust Build / Test Suite (push) Successful in 26s
Rust Build / Rustfmt (push) Successful in 28s
Rust Build / Clippy (push) Successful in 26s
Rust Build / Rustfmt (pull_request) Successful in 27s
Rust Build / Clippy (pull_request) Successful in 28s
Rust Build / build (pull_request) Successful in 27s
Rust Build / build (push) Successful in 27s
Rust Build / Check (pull_request) Successful in 26s
Rust Build / Test Suite (pull_request) Successful in 28s
Reviewed-on: #10
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-12 21:26:22 +00:00
e7e6fd904b Add icarus_base_api_url_env (#8)
All checks were successful
Release Tagging / release (push) Successful in 31s
Reviewed-on: #8
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-12 19:14:27 +00:00
dbe4dc67cb DBURL name change (#7)
All checks were successful
Release Tagging / release (push) Successful in 31s
Reviewed-on: #7
Co-authored-by: kdeng00 <kundeng00@pm.me>
Co-committed-by: kdeng00 <kundeng00@pm.me>
2025-06-01 01:26:37 +00:00
9 changed files with 112 additions and 28 deletions

1
.env
View File

@@ -6,3 +6,4 @@ POSTGRES_MAIN_PASSWORD=password
POSTGRES_MAIN_DB=my_db POSTGRES_MAIN_DB=my_db
POSTGRES_MAIN_HOST=localhost POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com

View File

@@ -6,3 +6,4 @@ POSTGRES_MAIN_PASSWORD=password
POSTGRES_MAIN_DB=my_db POSTGRES_MAIN_DB=my_db
POSTGRES_MAIN_HOST=localhost POSTGRES_MAIN_HOST=localhost
DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB} DATABASE_URL=postgres://${POSTGRES_MAIN_USER}:${POSTGRES_MAIN_PASSWORD}@${POSTGRES_MAIN_HOST}:5432/${POSTGRES_MAIN_DB}
ICARUS_BASE_API_URL=https://icarus.com

View File

@@ -0,0 +1,65 @@
name: Rust Build
on:
push:
branches:
- main
- devel
pull_request:
branches:
- main
- devel
jobs:
check:
name: Check
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.86.0
- run: cargo check
test:
name: Test Suite
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.86.0
- run: cargo test
fmt:
name: Rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.86.0
- run: rustup component add rustfmt
- run: cargo fmt --all -- --check
clippy:
name: Clippy
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.86.0
- run: rustup component add clippy
- run: cargo clippy -- -D warnings
build:
name: build
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: actions-rust-lang/setup-rust-toolchain@v1
with:
toolchain: 1.86.0
- run: cargo build

2
Cargo.lock generated
View File

@@ -277,7 +277,7 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
[[package]] [[package]]
name = "icarus_envy" name = "icarus_envy"
version = "0.1.0" version = "0.2.0"
dependencies = [ dependencies = [
"async-std", "async-std",
"dotenvy", "dotenvy",

View File

@@ -1,6 +1,6 @@
[package] [package]
name = "icarus_envy" name = "icarus_envy"
version = "0.1.0" version = "0.2.1"
edition = "2024" edition = "2024"
rust-version = "1.86" rust-version = "1.86"

View File

@@ -1,7 +1,6 @@
pub async fn get_db_url() -> String { pub async fn get_db_url() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
std::env::var(crate::keys::DBURL).expect(crate::keys::error::ERROR) std::env::var(crate::keys::DB_URL).expect(crate::keys::error::DB_URL)
} }
pub async fn get_secret_main_key() -> String { pub async fn get_secret_main_key() -> String {
@@ -18,3 +17,8 @@ pub async fn get_root_directory() -> String {
dotenvy::dotenv().ok(); dotenvy::dotenv().ok();
std::env::var(crate::keys::ROOT_DIRECTORY).expect(crate::keys::error::ROOT_DIRECTORY) std::env::var(crate::keys::ROOT_DIRECTORY).expect(crate::keys::error::ROOT_DIRECTORY)
} }
pub async fn get_icarus_base_api_url() -> String {
dotenvy::dotenv().ok();
std::env::var(crate::keys::ICARUS_BASE_API_URL).expect(crate::keys::error::ICARUS_BASE_API_URL)
}

View File

@@ -1,10 +1,9 @@
// TODO: Change this to snake case
// Environment key for Database management // Environment key for Database management
pub const DBURL: &str = "DATABASE_URL"; pub const DB_URL: &str = "DATABASE_URL";
// Environment key for secret main key // Environment key for secret main key
// Used for the icarus app // Used for the icarus app
pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY"; pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
// Environment key for secret key // Environment key for secret key
// Generic use of secret key that could be found in various apps // Generic use of secret key that could be found in various apps
@@ -13,9 +12,13 @@ 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"; pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
// Environment key for icarus api url
pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
pub mod error { pub mod error {
pub const ERROR: &str = "DATABASE_URL must be set in .env"; pub const DB_URL: &str = "DATABASE_URL must be set in .env";
pub const SECRET_KEY: &str = "SECRET_KEY must be set in environment file"; pub const SECRET_KEY: &str = "SECRET_KEY must be set in environment file";
pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY must not be set in environment file"; pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY must not be set in environment file";
pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY must not be set in environment file"; pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY must not be set in environment file";
pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL must not be set in enviornment file";
} }

View File

@@ -1,17 +1,2 @@
pub mod environment; pub mod environment;
pub mod keys; pub mod keys;
pub fn add(left: u64, right: u64) -> u64 {
left + right
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn it_works() {
let result = add(2, 2);
assert_eq!(result, 4);
}
}

View File

@@ -1,27 +1,52 @@
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
#[test] #[test]
fn test_dburl() { fn test_dburl() {
let result = async_std::task::block_on(icarus_envy::environment::get_db_url()); let result = async_std::task::block_on(icarus_envy::environment::get_db_url());
assert_eq!(result, "postgres://myuser:password@localhost:5432/my_db", "DATABASE_URL does not match {:?}", result); assert_eq!(
result, "postgres://myuser:password@localhost:5432/my_db",
"DATABASE_URL does not match {:?}",
result
);
} }
#[test] #[test]
fn test_get_secret_main_key() { fn test_get_secret_main_key() {
let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key()); let result = async_std::task::block_on(icarus_envy::environment::get_secret_main_key());
assert_eq!(result, "Somesupersecretpassword!!!45345435", "SECRET_MAIN_KEY does not match {:?}", result) assert_eq!(
result, "Somesupersecretpassword!!!45345435",
"SECRET_MAIN_KEY does not match {:?}",
result
)
} }
#[test] #[test]
fn test_get_secret_key() { fn test_get_secret_key() {
let result = async_std::task::block_on(icarus_envy::environment::get_secret_key()); let result = async_std::task::block_on(icarus_envy::environment::get_secret_key());
assert_eq!(result, "AmIGoodEnoughForYou?", "SECRET_KEY does not match {:?}", result) assert_eq!(
result, "AmIGoodEnoughForYou?",
"SECRET_KEY does not match {:?}",
result
)
} }
#[test] #[test]
fn test_get_root_directory() { fn test_get_root_directory() {
let result = async_std::task::block_on(icarus_envy::environment::get_root_directory()); let result = async_std::task::block_on(icarus_envy::environment::get_root_directory());
assert_eq!(result, "/path/to/root", "ROOT_DIRECTORY does not match {:?}", result) assert_eq!(
result, "/path/to/root",
"ROOT_DIRECTORY does not match {:?}",
result
)
}
#[test]
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",
"ICARUS_BASE_API_URL does not match {:?}",
result
)
} }
} }