Merge branch 'main' into feat/user-project-telemetry

the-wondersmith · web-flow · commit 058003a2d99b · 2025-01-15T14:23:31.000-05:00
diff --git a/api-client/src/lib.rs b/api-client/src/lib.rs
@@ -130,8 +130,10 @@ impl ShuttleApiClient {
         &self,
         project: &str,
         deployment_req: DeploymentRequest,
+        force: bool,
     ) -> Result<deployment::Response> {
-        let path = format!("/projects/{project}/services/{project}");
+        let query = if force { "?force=true" } else { "" };
+        let path = format!("/projects/{project}/services/{project}{query}");
         let deployment_req = rmp_serde::to_vec(&deployment_req)
             .context("serialize DeploymentRequest as a MessagePack byte vector")?;
 
diff --git a/cargo-shuttle/src/args.rs b/cargo-shuttle/src/args.rs
@@ -356,6 +356,9 @@ pub struct DeployArgs {
     #[arg(long)]
     pub output_archive: Option<PathBuf>,
 
+    #[arg(long, hide = true)]
+    pub force: bool,
+
     #[command(flatten)]
     pub secret_args: SecretsArgs,
 }
diff --git a/cargo-shuttle/src/lib.rs b/cargo-shuttle/src/lib.rs
@@ -2612,7 +2612,7 @@ impl Shuttle {
 
         deployment_req.data = archive;
         let deployment = client
-            .deploy(project_name, deployment_req)
+            .deploy(project_name, deployment_req, args.force)
             .await
             .map_err(suggestions::deploy::deploy_request_failure)?;
 
diff --git a/gateway/src/api/latest.rs b/gateway/src/api/latest.rs
@@ -417,14 +417,25 @@ async fn delete_project(
     Ok(AxumJson("project successfully deleted".to_owned()))
 }
 
+#[derive(Deserialize)]
+struct DeployQuery {
+    force: Option<bool>,
+}
+
 #[instrument(skip_all, fields(shuttle.project.name = %scoped_user.scope))]
-async fn override_create_service(scoped_user: ScopedUser) -> Result<Response<Body>, ApiError> {
-    // Creating new deployments on the shuttle.rs platform is deprecated as of the first of January
-    // 2025.
-    return Err(Deprecated(
-        "Creating new deployments on the shuttle.rs platform has been deprecated.".to_string(),
-    )
-    .into());
+async fn override_create_service(
+    state: State<RouterState>,
+    scoped_user: ScopedUser,
+    Query(query): Query<DeployQuery>,
+    req: Request<Body>,
+) -> Result<Response<Body>, ApiError> {
+    if query.force.is_some_and(|t| t) {
+        route_project(state, scoped_user, req).await
+    } else {
+        Err(Deprecated(
+            "Creating new deployments on the shuttle.rs platform has been deprecated.".to_string(),
+        ))?
+    }
 }
 
 #[instrument(skip_all, fields(shuttle.project.name = %scoped_user.scope))]

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,9 @@ pub struct DeployArgs {`
`356`	`356`	`#[arg(long)]`
`357`	`357`	`pub output_archive: Option<PathBuf>,`
`358`	`358`
	`359`	`+ #[arg(long, hide = true)]`
	`360`	`+ pub force: bool,`
	`361`	`+`
`359`	`362`	`#[command(flatten)]`
`360`	`363`	`pub secret_args: SecretsArgs,`
`361`	`364`	`}`