feat: expose improved auth utils (#294)

crates/auth/Cargo.toml

@@ -24,3 +24,6 @@ tokio = { version = "1", features = ["full"] }
 log = { version = "0.4.19" }
 chrono = { version = "0.4.26" }
 marzano-util = { path = "../util" }
+
+[features]
+test-utils = []

crates/auth/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod auth0;
 pub mod env;
 pub mod info;
+#[cfg(any(test, feature = "test-utils"))]
 pub mod testing;

crates/auth/src/testing.rs

@@ -9,8 +9,33 @@ use crate::{
     info::AuthInfo,
 };
 
+/// Attempts to read a variable, first from the environment, then from Doppler.
+///
+/// If neither source has the variable, an error is returned.
+fn get_config_var(var_name: &str) -> Result<String> {
+    if let Ok(value) = env::var(var_name) {
+        return Ok(value);
+    }
+
+    use std::process::Command;
+    let output = Command::new("doppler")
+        .args(["secrets", "get", var_name, "--plain"])
+        .output();
+
+    match output {
+        Ok(output) if output.status.success() => {
+            let value = String::from_utf8_lossy(&output.stdout).trim().to_string();
+            Ok(value)
+        }
+        _ => Err(anyhow::anyhow!(
+            "Variable {} not found in environment or Doppler",
+            var_name
+        )),
+    }
+}
+
 fn get_existing_token() -> Result<AuthInfo> {
-    let existing_token = env::var("API_TESTING_TOKEN")?;
+    let existing_token = get_config_var("API_TESTING_TOKEN")?;
     let info = AuthInfo {
         access_token: existing_token,
     };
@@ -24,8 +49,8 @@ fn get_existing_token() -> Result<AuthInfo> {
 
 fn get_new_tokens() -> Result<AuthInfo> {
     // Exchange client tokens for a test token
-    let client_id = env::var("API_TESTING_CLIENT_ID")?;
-    let client_secret = env::var("API_TESTING_CLIENT_SECRET")?;
+    let client_id = get_config_var("API_TESTING_CLIENT_ID")?;
+    let client_secret = get_config_var("API_TESTING_CLIENT_SECRET")?;
 
     let client = reqwest::blocking::Client::new();
 
@@ -68,7 +93,6 @@ mod tests {
     #[ignore = "eats up auth tokens, only enable when explicitly testing"]
     fn test_token_refresh() -> Result<()> {
         let auth_info = get_testing_auth_info().unwrap();
-        println!("auth_info: {}", auth_info);
         assert!(!auth_info.is_expired()?);
         Ok(())
     }

crates/cli/src/commands/apply.rs

@@ -52,6 +52,10 @@ pub(crate) async fn run_apply(
 ) -> Result<()> {
     #[cfg(feature = "workflows_v2")]
     {
+        if args.apply_migration_args.remote {
+            println!("Apply {} remotely", args.pattern_or_workflow);
+            anyhow::bail!("Remote workflows are not yet supported");
+        }
         let current_dir = current_dir()?;
         let custom_workflow = find_workflow_file_from(current_dir, &args.pattern_or_workflow).await;
         if let Some(custom_workflow) = custom_workflow {

crates/cli/src/commands/apply_migration.rs

@@ -21,6 +21,12 @@ pub struct ApplyMigrationArgs {
         help = "JSON input parameter to pass to the workflow"
     )]
     input: Option<String>,
+    #[clap(
+        long,
+        help_heading = "Workflow options",
+        help = "Run the workflow remotely on Grit Cloud"
+    )]
+    pub(crate) remote: bool,
     /// Print verbose output
     #[clap(long)]
     verbose: bool,

crates/core/Cargo.toml

@@ -46,7 +46,7 @@ similar = "2.2.1"
 lazy_static = "1.4.0"
 insta = { version = "1.30.0", features = ["yaml", "redactions"] }
 trim-margin = "0.1.0"
-marzano-auth = { path = "../auth" }
+marzano-auth = { path = "../auth", features = ["test-utils"] }
 walkdir = "2.3.3"
 
 [features]

crates/test_utils/Cargo.toml

@@ -16,7 +16,7 @@ rust.unused_crate_dependencies = "warn"
 
 [dependencies]
 anyhow = { version = "1.0.70" }
-marzano-auth = { path = "../auth" }
+marzano-auth = { path = "../auth", features = ["test-utils"] }
 assert_cmd = { version = "2.0.12" }
 tempfile = { version = "3.1" }
 fs_extra = { version = "1.3" }