feat(cargo-shuttle): admin flag for admin operations (#2020)

* feat(cargo-shuttle): admin flag for admin operations

* new endpoints

Author: jonaro00

admin/src/client.rs

@@ -48,13 +48,16 @@ impl Client {
 
     pub async fn get_project_config(&self, project_id: &str) -> Result<Value> {
         self.inner
-            .get_json(format!("/admin/projects/{project_id}"))
+            .get_json(format!("/admin/projects/{project_id}/config"))
             .await
     }
 
     pub async fn upgrade_project_to_lb(&self, project_id: &str) -> Result<Value> {
         self.inner
-            .put_json(format!("/admin/projects/{project_id}"), Option::<()>::None)
+            .put_json(
+                format!("/admin/projects/{project_id}/config"),
+                Option::<()>::None,
+            )
             .await
     }
 

admin/src/lib.rs

@@ -2,19 +2,21 @@ pub mod args;
 pub mod client;
 pub mod config;
 
-use tracing::trace;
-
 use crate::{
     args::{Args, Command},
     client::Client,
     config::get_api_key,
 };
 
 pub async fn run(args: Args) {
-    trace!(?args, "starting with args");
+    tracing::trace!(?args, "starting with args");
 
     let api_key = get_api_key();
-    let client = Client::new(args.api_url.clone(), api_key, args.client_timeout);
+    let client = Client::new(
+        format!("{}/admin", args.api_url),
+        api_key,
+        args.client_timeout,
+    );
 
     match args.command {
         Command::ChangeProjectOwner {

cargo-shuttle/src/args.rs

@@ -29,6 +29,9 @@ pub struct ShuttleArgs {
     /// URL for the Shuttle API to target (mainly for development)
     #[arg(global = true, long, env = "SHUTTLE_API", hide = true)]
     pub api_url: Option<String>,
+    /// Modify Shuttle API URL to use admin endpoints
+    #[arg(global = true, long, env = "SHUTTLE_ADMIN", hide = true)]
+    pub admin: bool,
     /// Disable network requests that are not strictly necessary. Limits some features.
     #[arg(global = true, long, env = "SHUTTLE_OFFLINE")]
     pub offline: bool,

cargo-shuttle/src/lib.rs

@@ -156,7 +156,10 @@ impl Shuttle {
             // TODO: refactor so that beta local run does not need to know project id / always uses crate name ???
             matches!(args.cmd, Command::Run(..))
         ) {
-            if let Some(ref url) = args.api_url {
+            let api_url = args
+                .api_url
+                .map(|u| if args.admin { format!("{u}/admin") } else { u });
+            if let Some(ref url) = api_url {
                 if url != SHUTTLE_API_URL {
                     eprintln!(
                         "{}",
@@ -167,7 +170,7 @@ impl Shuttle {
                     eprintln!("WARNING: API URL is probably incorrect. Ends with '/': {url}");
                 }
             }
-            self.ctx.set_api_url(args.api_url);
+            self.ctx.set_api_url(api_url);
 
             let client = ShuttleApiClient::new(
                 self.ctx.api_url(),

cargo-shuttle/tests/integration/main.rs

@@ -14,6 +14,7 @@ async fn shuttle_command(cmd: Command, working_directory: &str) -> anyhow::Resul
         .run(
             ShuttleArgs {
                 api_url: Some("http://shuttle.invalid:80".to_string()),
+                admin: false,
                 project_args: ProjectArgs {
                     working_directory,
                     name_or_id: None,

cargo-shuttle/tests/integration/run.rs

@@ -30,6 +30,7 @@ async fn shuttle_run(working_directory: &str, external: bool) -> String {
     let runner = Shuttle::new(cargo_shuttle::Binary::Shuttle).unwrap().run(
         ShuttleArgs {
             api_url: Some("http://shuttle.invalid:80".to_string()),
+            admin: false,
             project_args: ProjectArgs {
                 working_directory: working_directory.clone(),
                 name_or_id: None,

runtime/src/telemetry.rs

@@ -499,8 +499,9 @@ pub fn init_tracing_subscriber(
 
     if endpoint.is_none() {
         tracing::warn!(
-            "No value set for `OTEL_EXPORTER_OTLP_ENDPOINT` env var, \
-            declining to attach OTLP exporter to default tracing subscriber"
+            "No value set for `{}` env var, \
+            declining to attach OTLP exporter to default tracing subscriber",
+            OTEL_EXPORTER_OTLP_ENDPOINT,
         );
     }