fix: static folder local run clearing file contents, add missing tests in cargo-shuttle

cargo-shuttle/tests/integration/run.rs

@@ -120,6 +120,65 @@ async fn rocket_postgres() {
     assert_eq!(request_text, "{\"id\":1,\"note\":\"Deploy to shuttle\"}");
 }
 
+#[tokio::test(flavor = "multi_thread")]
+async fn axum_static_files() {
+    let url = cargo_shuttle_run("../examples/axum/static-files", false).await;
+    let client = reqwest::Client::new();
+
+    let request_text = client
+        .get(format!("{url}/hello"))
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .unwrap();
+
+    assert_eq!(request_text, "Hello, world!");
+
+    let request_text = client
+        .get(format!("{url}"))
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .unwrap();
+
+    assert!(
+        request_text.contains("This is an example of serving static files with axum and shuttle.")
+    );
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn shuttle_next() {
+    let url = cargo_shuttle_run("../examples/next/hello-world", false).await;
+    let client = reqwest::Client::new();
+
+    let request_text = client
+        .get(format!("{url}/hello"))
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .unwrap();
+
+    assert_eq!(request_text, "Hello, World!");
+
+    let post_text = client
+        .post(format!("{url}/uppercase"))
+        .body("uppercase this")
+        .send()
+        .await
+        .unwrap()
+        .text()
+        .await
+        .unwrap();
+
+    assert_eq!(post_text, "UPPERCASE THIS");
+}
+
 #[tokio::test(flavor = "multi_thread")]
 #[ignore]
 async fn rocket_authentication() {

codegen/src/shuttle_main/mod.rs

@@ -232,7 +232,7 @@ impl ToTokens for Loader {
             None
         } else {
             Some(parse_quote!(
-                use shuttle_runtime::ResourceBuilder;
+                use shuttle_runtime::{Factory, ResourceBuilder};
             ))
         };
 

resources/static-folder/src/lib.rs

@@ -65,6 +65,10 @@ impl<'a> ResourceBuilder<PathBuf> for StaticFolder<'a> {
 
         trace!(output_directory = ?output_dir, "got output directory");
 
+        if output_dir.join(self.folder) == input_dir {
+            return Ok(output_dir.join(self.folder));
+        }
+
         let copy_options = CopyOptions::new().overwrite(true);
         match copy(&input_dir, &output_dir, &copy_options) {
             Ok(_) => Ok(output_dir.join(self.folder)),

runtime/src/lib.rs

@@ -227,7 +227,7 @@ pub use logger::Logger;
 pub use next::{AxumWasm, NextArgs};
 pub use provisioner_factory::ProvisionerFactory;
 pub use shuttle_common::storage_manager::StorageManager;
-pub use shuttle_service::{main, CustomError, Error, ResourceBuilder, Service};
+pub use shuttle_service::{main, CustomError, Error, Factory, ResourceBuilder, Service};
 
 // Dependencies required by the codegen
 pub use anyhow::Context;