refa: move env config logic to common, add to admin (#2039)

* refa: move env config logic to common, add to admin

* minor nits

* lul

Author: jonaro00

Cargo.lock

@@ -6,7 +6,7 @@ publish = false
 
 [dependencies]
 shuttle-api-client = { workspace = true, default-features = true }
-shuttle-common = { workspace = true, features = ["models"] }
+shuttle-common = { workspace = true, features = ["models", "config"] }
 
 anyhow = { workspace = true }
 clap = { workspace = true, features = ["env"] }

admin/Cargo.toml

@@ -1,14 +1,15 @@
 use clap::{Parser, Subcommand};
-use shuttle_common::{
-    constants::SHUTTLE_API_URL,
-    models::{project::ComputeTier, user::AccountTier},
-};
+use shuttle_common::models::{project::ComputeTier, user::AccountTier};
 
 #[derive(Parser, Debug)]
 pub struct Args {
-    /// run this command against the api at the supplied url
-    #[arg(long, env = "SHUTTLE_API", default_value = SHUTTLE_API_URL)]
-    pub api_url: String,
+    /// Target a different Shuttle API env (use a separate global config) (default: None (= prod = production))
+    // ("SHUTTLE_ENV" is used for user-facing environments (agnostic of Shuttle API env))
+    #[arg(global = true, long, env = "SHUTTLE_API_ENV")]
+    pub api_env: Option<String>,
+    /// URL for the Shuttle API to target (overrides inferred URL from api_env)
+    #[arg(global = true, long, env = "SHUTTLE_API")]
+    pub api_url: Option<String>,
 
     #[command(subcommand)]
     pub command: Command,

admin/src/args.rs

@@ -1,19 +1,50 @@
 pub mod args;
 pub mod client;
-pub mod config;
+
+use shuttle_common::{
+    config::{Config, ConfigManager, GlobalConfig, GlobalConfigManager},
+    constants::{other_env_api_url, SHUTTLE_API_URL},
+};
 
 use crate::{
     args::{Args, Command},
     client::Client,
-    config::get_api_key,
 };
 
 pub async fn run(args: Args) {
     tracing::trace!(?args, "starting with args");
 
-    let api_key = get_api_key();
+    let api_key = match std::env::var("SHUTTLE_API_KEY") {
+        Ok(s) => s,
+        Err(_) => {
+            let mut global = Config::<_, GlobalConfig>::new(
+                GlobalConfigManager::new(args.api_env.clone()).unwrap(),
+            );
+            let path = global.manager.path();
+            tracing::trace!(?path, "looking for config");
+            if !global.exists() {
+                global.create().unwrap();
+            }
+            global.open().expect("load global configuration");
+            global
+                .as_ref()
+                .unwrap()
+                .api_key
+                .clone()
+                .expect("api key in config")
+        }
+    };
+    let api_url = args
+        .api_url
+        // calculate env-specific url if no explicit url given but an env was given
+        .or_else(|| args.api_env.as_ref().map(|env| other_env_api_url(env)))
+        .unwrap_or_else(|| SHUTTLE_API_URL.to_string());
+    let api_url = format!("{api_url}/admin");
+    tracing::trace!(?api_url, "");
+
     let client = Client::new(
-        format!("{}/admin", args.api_url),
+        // always in admin mode
+        api_url,
         api_key,
         args.client_timeout,
     );

admin/src/config.rs

@@ -10,7 +10,7 @@ default-run = "shuttle"
 
 [dependencies]
 shuttle-api-client = { workspace = true, default-features = true }
-shuttle-common = { workspace = true, features = ["models", "tables"] }
+shuttle-common = { workspace = true, features = ["models", "tables", "config"] }
 
 anyhow = { workspace = true }
 async-trait = { workspace = true }