feat(runtime): beta runtime as client

Cargo.toml

@@ -32,7 +32,7 @@ repository = "https://github.com/shuttle-hq/shuttle"
 
 # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table
 [workspace.dependencies]
-shuttle-api-client = { path = "api-client", version = "0.47.0" }
+shuttle-api-client = { path = "api-client", version = "0.47.0", default-features = false }
 shuttle-backends = { path = "backends", version = "0.47.0" }
 shuttle-codegen = { path = "codegen", version = "0.47.0" }
 shuttle-common = { path = "common", version = "0.47.0" }

admin/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-shuttle-api-client = { workspace = true }
+shuttle-api-client = { workspace = true, default-features = true }
 shuttle-common = { workspace = true, features = ["models"] }
 shuttle-backends = { workspace = true }
 

api-client/Cargo.toml

@@ -19,9 +19,14 @@ reqwest-middleware = "0.2.5"
 rmp-serde = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-task-local-extensions = "0.1.4"
 tokio = { workspace = true, features = ["macros", "signal", "rt-multi-thread"] }
 tokio-tungstenite = { workspace = true }
-tracing = { workspace = true, features = ["default"] }
 url = { workspace = true }
 uuid = { workspace = true, features = ["v4"] }
+
+task-local-extensions = { version = "0.1.4", optional = true }
+tracing = { workspace = true, features = ["default"], optional = true }
+
+[features]
+default = ["tracing"]
+tracing = ["dep:tracing", "dep:task-local-extensions"]

api-client/src/lib.rs

@@ -1,5 +1,3 @@
-mod middleware;
-
 use std::time::Duration;
 
 use anyhow::{Context, Result};
@@ -9,19 +7,25 @@ use reqwest::header::HeaderMap;
 use reqwest::Response;
 use reqwest_middleware::{ClientWithMiddleware, RequestBuilder};
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 use shuttle_common::log::{LogsRange, LogsResponseBeta};
 use shuttle_common::models::deployment::{
     DeploymentRequest, DeploymentRequestBeta, UploadArchiveResponseBeta,
 };
 use shuttle_common::models::{deployment, project, service, team, user, ToJson};
+use shuttle_common::resource::{ProvisionResourceRequest, ShuttleResourceOutput};
 use shuttle_common::{resource, LogItem, VersionInfo};
 use tokio::net::TcpStream;
 use tokio_tungstenite::tungstenite::client::IntoClientRequest;
 use tokio_tungstenite::{connect_async, MaybeTlsStream, WebSocketStream};
-use tracing::{debug, error};
 use uuid::Uuid;
 
+#[cfg(feature = "tracing")]
+mod middleware;
+#[cfg(feature = "tracing")]
 use crate::middleware::LoggingMiddleware;
+#[cfg(feature = "tracing")]
+use tracing::{debug, error};
 
 #[derive(Clone)]
 pub struct ShuttleApiClient {
@@ -37,9 +41,12 @@ impl ShuttleApiClient {
             builder = builder.default_headers(h);
         }
         let client = builder.timeout(Duration::from_secs(60)).build().unwrap();
-        let client = reqwest_middleware::ClientBuilder::new(client)
-            .with(LoggingMiddleware)
-            .build();
+
+        let builder = reqwest_middleware::ClientBuilder::new(client);
+        #[cfg(feature = "tracing")]
+        let builder = builder.with(LoggingMiddleware);
+        let client = builder.build();
+
         Self {
             client,
             api_url,
@@ -208,6 +215,18 @@ impl ShuttleApiClient {
         self.delete_json(format!("/projects/{project}/resources/{}", r#type))
             .await
     }
+    pub async fn provision_resource_beta(
+        &self,
+        project: &str,
+        req: ProvisionResourceRequest,
+    ) -> Result<ShuttleResourceOutput<Value>> {
+        self.post_json(format!("/projects/{project}/resources"), Some(req))
+            .await
+    }
+    pub async fn get_secrets_beta(&self, project: &str) -> Result<resource::Response> {
+        self.get_json(format!("/projects/{project}/resources/secrets"))
+            .await
+    }
 
     pub async fn create_project(
         &self,
@@ -411,6 +430,7 @@ impl ShuttleApiClient {
         }
 
         let (stream, _) = connect_async(request).await.with_context(|| {
+            #[cfg(feature = "tracing")]
             error!("failed to connect to websocket");
             "could not connect to websocket"
         })?;
@@ -446,6 +466,7 @@ impl ShuttleApiClient {
 
         if let Some(body) = body {
             let body = serde_json::to_string(&body)?;
+            #[cfg(feature = "tracing")]
             debug!("Outgoing body: {}", body);
             builder = builder.body(body);
             builder = builder.header("Content-Type", "application/json");
@@ -477,6 +498,7 @@ impl ShuttleApiClient {
 
         if let Some(body) = body {
             let body = serde_json::to_string(&body)?;
+            #[cfg(feature = "tracing")]
             debug!("Outgoing body: {}", body);
             builder = builder.body(body);
             builder = builder.header("Content-Type", "application/json");

backends/src/lib.rs

@@ -13,7 +13,6 @@ pub mod headers;
 pub mod metrics;
 mod otlp_tracing_bridge;
 pub mod project_name;
-pub mod resource;
 pub mod trace;
 
 #[cfg(any(test, feature = "test-utils"))]

cargo-shuttle/Cargo.toml

@@ -8,7 +8,7 @@ description = "A cargo command for the Shuttle platform (https://www.shuttle.rs/
 homepage = "https://www.shuttle.rs"
 
 [dependencies]
-shuttle-api-client = { workspace = true }
+shuttle-api-client = { workspace = true, default-features = true }
 shuttle-common = { workspace = true, features = ["models"] }
 shuttle-proto = { workspace = true, features = ["provisioner", "runtime-client"] }
 shuttle-service = { workspace = true, features = ["builder", "runner"] }

cargo-shuttle/src/lib.rs

@@ -1338,7 +1338,6 @@ impl Shuttle {
         let (mut runtime, mut runtime_client) = runner::start(
             beta,
             port,
-            SocketAddr::new(Ipv4Addr::LOCALHOST.into(), port),
             runtime_executable,
             service.workspace_path.as_path(),
         )

deployer/src/runtime_manager.rs

@@ -1,6 +1,5 @@
 use std::{
     collections::HashMap,
-    net::{Ipv4Addr, SocketAddr},
     path::{Path, PathBuf},
     sync::Arc,
 };
@@ -58,15 +57,10 @@ impl RuntimeManager {
                 .unwrap_or_default()
         );
 
-        let (mut process, runtime_client) = runner::start(
-            false,
-            port,
-            SocketAddr::new(Ipv4Addr::LOCALHOST.into(), port),
-            runtime_executable,
-            project_path,
-        )
-        .await
-        .context("failed to start shuttle runtime")?;
+        let (mut process, runtime_client) =
+            runner::start(false, port, runtime_executable, project_path)
+                .await
+                .context("failed to start shuttle runtime")?;
 
         let stdout = process
             .stdout

runtime/Cargo.toml

@@ -10,6 +10,7 @@ description = "Runtime to start and manage any service that runs on shuttle"
 doctest = false
 
 [dependencies]
+shuttle-api-client = { workspace = true }
 shuttle-codegen = { workspace = true }
 shuttle-common = { workspace = true, features = ["extract_propagation"] }
 shuttle-proto = { workspace = true, features = ["runtime"] }
@@ -18,6 +19,7 @@ shuttle-service = { workspace = true }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 colored = { workspace = true, optional = true }
+hyper = { workspace = true, features = ["http1", "server", "tcp"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 strfmt = { workspace = true }
@@ -35,9 +37,10 @@ uuid = { workspace = true }
 
 [features]
 default = ["setup-tracing"]
+api-client-tracing = ["shuttle-api-client/tracing"]
 
 setup-tracing = [
     "tracing-subscriber/default",
     "tracing-subscriber/env-filter",
-    "colored",
+    "dep:colored",
 ]