Merge pull request #20 from Tyrannican/list-all-envs

List all environments

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Documenting changes between versions beginning from v0.3.0
 
+## v0.10.3
+
+* `safir env` now lists all existing environments and indicates the currently loaded one
+
 ## v0.10.2
 
 * Reduced binary size - no other changes

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "safir"
-version = "0.10.2"
+version = "0.10.3"
 edition = "2021"
 authors = ["Graham Keenan <[email protected]>"]
 license = "MIT OR Apache-2.0"

src/main.rs

@@ -49,8 +49,18 @@ async fn main() -> Result<()> {
         }
         Commands::Env => {
             let cfg = safir.get_config();
-            let env = cfg.environment;
-            println!("Currently loaded environment: '{env}'");
+            let current_env = cfg.environment;
+            let envs = safir.environments().await?;
+
+            println!("Safir environments:");
+            for env in envs {
+                let penv = if env == current_env {
+                    format!("{env} <- Currently loaded")
+                } else {
+                    env
+                };
+                println!("- {penv}");
+            }
         }
     }
 

src/store/db_store.rs

@@ -133,6 +133,12 @@ impl SafirStore for SqliteStore {
         Ok(())
     }
 
+    async fn environments(&self) -> Result<Vec<String>> {
+        let query = format!("select distinct environment from safir");
+        let result: Vec<String> = sqlx::query_scalar(&query).fetch_all(&self.pool).await?;
+        Ok(result)
+    }
+
     fn get_config(&self) -> SafirConfig {
         self.config.clone()
     }

src/store/file_store.rs

@@ -187,6 +187,10 @@ impl SafirStore for KVStore {
         Ok(())
     }
 
+    async fn environments(&self) -> Result<Vec<String>> {
+        Ok(self.store.keys().map(|e| e.to_string()).collect())
+    }
+
     fn get_config(&self) -> SafirConfig {
         self.config.clone()
     }

src/store/mod.rs

@@ -18,6 +18,7 @@ pub trait SafirStore {
     async fn remove(&mut self, keys: Vec<String>) -> Result<()>;
     async fn clear(&mut self) -> Result<()>;
     async fn purge(&mut self) -> Result<()>;
+    async fn environments(&self) -> Result<Vec<String>>;
     fn get_config(&self) -> SafirConfig;
 }