feat: CLI Configuration and maintainability

cli/src/commands/upload/interface.rs

@@ -1,10 +1,7 @@
 use std::path::Path;
 
 use crate::{
-    cli::UploadInfo,
-    commands::upload::{s3::S3, uploadable::Uploadable},
-    config::Config,
-    manifest::generate_manifest,
+    cli::UploadInfo, commands::upload::{s3::S3, uploadable::Uploadable}, config::config::Config, manifest::generate_manifest
 };
 use log::info;
 
@@ -16,7 +13,7 @@ pub async fn upload(info: &UploadInfo, config: Config) -> anyhow::Result<()> {
     let manifest = generate_manifest(&Path::new(path)).await?;
     let mut uploader: Box<dyn Uploadable> = match info.upload_style {
         crate::cli::UploadStyle::S3 => Box::new(S3::new(
-            config
+            &config
                 .get_active_s3()
                 .ok_or(anyhow::Error::msg("Could not get active S3 value"))?,
         )?),

cli/src/commands/upload/mod.rs

@@ -1,5 +1,4 @@
 pub mod interface;
 pub mod s3;
+pub mod speedtest;
 pub mod uploadable;
-pub mod void;
-pub mod speedtest;

cli/src/commands/upload/s3.rs

@@ -2,12 +2,11 @@ use crate::{
     commands::upload::{
         speedtest::{SPEEDTEST_PATH, Speedtest},
         uploadable::Uploadable,
-    },
-    config::S3Config,
+    }, config::s3::S3Config,
 };
 use async_trait::async_trait;
 use droplet_rs::manifest::{ChunkData, Manifest};
-use s3::{Bucket, creds::Credentials};
+use s3::Bucket;
 use serde_json::json;
 use std::{ops::Deref, path::PathBuf};
 

cli/src/commands/upload/void.rs

@@ -1,40 +0,0 @@
-use async_trait::async_trait;
-use droplet_rs::manifest::{ChunkData, Manifest};
-use log::warn;
-
-use crate::commands::upload::uploadable::Uploadable;
-
-pub struct VoidUploadable;
-#[async_trait]
-impl Uploadable for VoidUploadable {
-    async fn upload_chunk(
-        &mut self,
-        _id: &String,
-        _version: &String,
-        _chunk_id: &String,
-        _chunk: &ChunkData,
-    ) -> anyhow::Result<()> {
-        warn!("Uploading chunk to VoidUploader");
-        Ok(())
-    }
-
-    async fn upload_speedtest(&mut self) -> anyhow::Result<()> {
-        warn!("Uploading speedtest to VoidUploader");
-        Ok(())
-    }
-
-    async fn upload_manifest(
-        &mut self,
-        _manifest: Manifest,
-        _game_id: &String,
-        _version_id: &String,
-    ) -> anyhow::Result<()> {
-        warn!("Uploading manifest to VoidUploader");
-        Ok(())
-    }
-}
-impl VoidUploadable {
-    pub fn new() -> Self {
-        Self
-    }
-}