Merge branch 'main' into feat/silent-flag

Author: sourabpramanik

Cargo.lock

@@ -8,6 +8,7 @@ publish = false
 shuttle-common = { workspace = true, features = ["models"] }
 
 anyhow = { workspace = true }
+bytes = { workspace = true }
 clap = { workspace = true, features = ["env"] }
 dirs = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }

admin/Cargo.toml

@@ -1,6 +1,7 @@
 use std::{fs, io, path::PathBuf};
 
 use clap::{Error, Parser, Subcommand};
+use shuttle_common::models::user::UserId;
 
 #[derive(Parser, Debug)]
 pub struct Args {
@@ -27,6 +28,11 @@ pub enum Command {
     /// Manage project names
     ProjectNames,
 
+    ChangeProjectOwner {
+        project_name: String,
+        new_user_id: UserId,
+    },
+
     /// Viewing and managing stats
     #[command(subcommand)]
     Stats(StatsCommand),

admin/src/args.rs

@@ -1,4 +1,5 @@
-use anyhow::{Context, Result};
+use anyhow::{bail, Context, Result};
+use bytes::Bytes;
 use serde::{de::DeserializeOwned, Serialize};
 use shuttle_common::models::{admin::ProjectResponse, stats, ToJson};
 use tracing::trace;
@@ -73,6 +74,15 @@ impl Client {
         self.get("/admin/projects").await
     }
 
+    pub async fn change_project_owner(&self, project_name: &str, new_user_id: &str) -> Result<()> {
+        self.get_raw(&format!(
+            "/admin/projects/change-owner/{project_name}/{new_user_id}"
+        ))
+        .await?;
+
+        Ok(())
+    }
+
     pub async fn get_load(&self) -> Result<stats::LoadResponse> {
         self.get("/admin/stats/load").await
     }
@@ -130,15 +140,20 @@ impl Client {
             .context("failed to extract json body from delete response")
     }
 
-    async fn get<R: DeserializeOwned>(&self, path: &str) -> Result<R> {
-        reqwest::Client::new()
+    async fn get_raw(&self, path: &str) -> Result<Bytes> {
+        let res = reqwest::Client::new()
             .get(format!("{}{}", self.api_url, path))
             .bearer_auth(&self.api_key)
             .send()
             .await
-            .context("failed to make get request")?
-            .to_json()
-            .await
-            .context("failed to post text body from response")
+            .context("making request")?;
+        if !res.status().is_success() {
+            bail!("API call returned non-2xx: {:?}", res);
+        }
+        res.bytes().await.context("getting response body")
+    }
+
+    async fn get<R: DeserializeOwned>(&self, path: &str) -> Result<R> {
+        serde_json::from_slice(&self.get_raw(path).await?).context("deserializing body")
     }
 }

admin/src/client.rs

@@ -1,6 +1,10 @@
 use std::{fs, path::PathBuf};
 
 pub fn get_api_key() -> String {
+    if let Ok(s) = std::env::var("SHUTTLE_API_KEY") {
+        return s;
+    }
+
     let data = fs::read_to_string(config_path()).expect("shuttle config file to exist");
     let toml: toml::Value = toml::from_str(&data).expect("to parse shuttle config file");
 

admin/src/config.rs

@@ -165,6 +165,16 @@ async fn main() {
             client.idle_cch().await.expect("cch projects to be idled");
             "Idled CCH projects".to_string()
         }
+        Command::ChangeProjectOwner {
+            project_name,
+            new_user_id,
+        } => {
+            client
+                .change_project_owner(&project_name, &new_user_id)
+                .await
+                .unwrap();
+            format!("Changed project owner: {project_name} -> {new_user_id}")
+        }
     };
 
     println!("{res}");