diff --git a/.forgejo/workflows/build-image.yaml b/.forgejo/workflows/build-image.yaml deleted file mode 100644 index 9a3eedb..0000000 --- a/.forgejo/workflows/build-image.yaml +++ /dev/null @@ -1,62 +0,0 @@ -name: Publish image -on: - push: - branches: - - main - workflow_dispatch: - -jobs: - create-docker-images: - runs-on: host - steps: - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - registry: git.alecodes.page - username: ${{ vars.CONTAINER_REGISTRY_USER }} - password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }} - - - name: Build and push - uses: docker/build-push-action@v6 - with: - platforms: linux/amd64 - push: true - outputs: | - type=local,dest=./build-out - type=docker - tags: | - git.alecodes.page/alecodes/compendium:latest - git.alecodes.page/alecodes/compendium:${{ github.sha }} - - - name: Publish release - uses: https://code.forgejo.org/actions/forgejo-release@v2.5.0 - with: - url: "https://git.alecodes.page" - repo: "alecodes/compendium" - direction: upload - # tag: "${{ github.ref_name }}" - sha: "${{ github.sha }}" - release-dir: build-out - # token: ${{ secrets.TOKEN }} - override: ${{ vars.OVERRIDE || "false" }} - verbose: ${{ vars.VERBOSE || "false" }} - - # deploy: - # runs-on: ubuntu-latest - # needs: - # - create-docker-images - # steps: - # - name: Checkout code - # uses: actions/checkout@v4 - # - name: 'Docker Stack Deploy' - # uses: https://github.com/cssnr/stack-deploy-action@v1 - # with: - # host: ${{ vars.DOCKER_SWARM_HOST }} - # port: ${{ vars.DOCKER_SWARM_PORT }} - # user: ${{ secrets.DOCKER_SWARM_USER }} - # ssh_key: '${{ secrets.DOCKER_SWARM_SSH_KEY }}' - # file: 'docker-stack.yaml' - # name: 'personal_page' diff --git a/src/config.rs b/src/config.rs index 7fde8e0..d2de8e9 100644 --- a/src/config.rs +++ b/src/config.rs @@ -2,7 +2,7 @@ use std::fmt::Display; use std::net::SocketAddr; use std::path::PathBuf; -use crate::{Error, Result}; +use crate::Result; use figment::providers::{Env, Format, Serialized, Toml}; use serde::{Deserialize, Serialize}; @@ -19,11 +19,7 @@ pub struct DBConfig { impl Display for DBConfig { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!( - f, - "{}", - self.generate_db_string(true).map_err(|_| std::fmt::Error)? - ) + write!(f, "{}", self.generate_db_string(true)) } } @@ -40,16 +36,13 @@ impl Default for DBConfig { } impl DBConfig { - pub fn generate_db_string(&self, ofuscate: bool) -> Result { + pub fn generate_db_string(&self, ofuscate: bool) -> String { if let Some(value) = &self.string { - return Ok(value.clone()); + return value.clone(); } let db_password = if ofuscate { - let mut db_password = self - .password - .clone() - .ok_or(Error::Runtime("No database password provided"))?; + let mut db_password = self.password.clone().unwrap(); let password_length = db_password.len(); let visible_characters = 4; @@ -66,9 +59,7 @@ impl DBConfig { db_password } else { - self.password - .clone() - .ok_or(Error::Runtime("No database password provided"))? + self.password.clone().unwrap() }; let db_string = format!( @@ -76,7 +67,7 @@ impl DBConfig { self.user, db_password, self.host, self.name, ); - Ok(db_string.to_owned()) + db_string.to_owned() } } diff --git a/src/main.rs b/src/main.rs index 4990567..62d55ab 100644 --- a/src/main.rs +++ b/src/main.rs @@ -62,7 +62,7 @@ async fn main() -> Result<()> { let pool = PgPoolOptions::new() .max_connections(5) - .connect(&config.db.generate_db_string(false)?) + .connect(&config.db.generate_db_string(false)) .await?; let (tx_state, tx_layer) = Tx::setup(pool);