tsk-17: Added version tagging for pull requests

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

.env

@@ -1,5 +1,6 @@
 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 +8,4 @@ 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

.env.sample

@@ -1,5 +1,6 @@
 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 +8,4 @@ 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

.gitea/workflows/tag_release.yml

@@ -3,7 +3,9 @@ name: Release Tagging
 on:
   push:
     branches:
-      - devel
+      - main
+    pull_request:
+      - main
 
 jobs:
   release:
@@ -17,7 +19,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 +30,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

@@ -168,6 +168,26 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "const_format"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+dependencies = [
+ "const_format_proc_macros",
+]
+
+[[package]]
+name = "const_format_proc_macros"
+version = "0.2.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-xid",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.21"
@@ -277,9 +297,10 @@ checksum = "f154ce46856750ed433c8649605bf7ed2de3bc35fd9d2a9f30cddd873c80cb08"
 
 [[package]]
 name = "icarus_envy"
-version = "0.2.0"
+version = "0.3.1"
 dependencies = [
  "async-std",
+ "const_format",
  "dotenvy",
 ]
 
@@ -458,6 +479,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "unicode-xid"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+
 [[package]]
 name = "value-bag"
 version = "1.11.1"

Cargo.toml

@@ -1,11 +1,12 @@
 [package]
 name = "icarus_envy"
-version = "0.2.1"
+version = "0.3.1"
 edition = "2024"
-rust-version = "1.86"
+rust-version = "1.88"
 
 [dependencies]
 dotenvy = { version = "0.15.7" }
+const_format = { version = "0.2.34" }
 
 [dev-dependencies]
 async-std = { version = "1.13.1" }

src/environment.rs

@@ -8,6 +8,11 @@ pub async fn get_secret_main_key() -> String {
     std::env::var(crate::keys::SECRET_MAIN_KEY).expect(crate::keys::error::SECRET_MAIN_KEY)
 }
 
+pub async fn get_service_passphrase() -> String {
+    dotenvy::dotenv().ok();
+    std::env::var(crate::keys::SERVICE_PASSPHRASE).expect(crate::keys::error::SERVICE_LOGIN)
+}
+
 pub async fn get_secret_key() -> String {
     dotenvy::dotenv().ok();
     std::env::var(crate::keys::SECRET_KEY).expect(crate::keys::error::SECRET_KEY)

src/keys.rs

@@ -5,6 +5,9 @@ pub const DB_URL: &str = "DATABASE_URL";
 // Used for the icarus app
 pub const SECRET_MAIN_KEY: &str = "SECRET_MAIN_KEY";
 
+// 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";
@@ -16,9 +19,13 @@ pub const ROOT_DIRECTORY: &str = "ROOT_DIRECTORY";
 pub const ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL";
 
 pub mod error {
-    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_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 ICARUS_BASE_API_URL: &str = "ICARUS_BASE_API_URL must not be set in enviornment file";
+    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_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);
 }

tests/test.rs

@@ -20,6 +20,16 @@ mod tests {
         )
     }
 
+    #[test]
+    fn test_get_service_passphrase() {
+        let result = async_std::task::block_on(icarus_envy::environment::get_service_passphrase());
+        assert_eq!(
+            result, "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());