[sites] Don't delete unused assets

src/commands/dev/edge/setup.rs

@@ -24,22 +24,20 @@ pub(super) fn upload(
 ) -> Result<String> {
     let client = crate::http::legacy_auth_client(user);
 
-    let (to_delete, asset_manifest, site_namespace_id) = if let Some(site_config) =
-        target.site.clone()
-    {
+    let asset_manifest = if let Some(site_config) = target.site.clone() {
         let site_namespace = add_namespace(user, target, true)?;
         let path = Path::new(&site_config.bucket);
-        let (to_upload, to_delete, asset_manifest) = sync(target, user, &site_namespace.id, path)?;
+        let (to_upload, asset_manifest) = sync(target, user, &site_namespace.id, path)?;
 
         // First, upload all existing files in given directory
         if verbose {
             StdOut::info("Uploading updated files...");
         }
 
         bulk::put(target, user, &site_namespace.id, to_upload, &None)?;
-        (to_delete, Some(asset_manifest), Some(site_namespace.id))
+        Some(asset_manifest)
     } else {
-        (Vec::new(), None, None)
+        None
     };
 
     let session_config = get_session_config(deploy_target);
@@ -58,14 +56,6 @@ pub(super) fn upload(
     }
     let response = response.error_for_status()?;
 
-    if !to_delete.is_empty() {
-        if verbose {
-            StdOut::info("Deleting stale files...");
-        }
-
-        bulk::delete(target, user, &site_namespace_id.unwrap(), to_delete, &None)?;
-    }
-
     let text = &response.text()?;
 
     // TODO: use cloudflare-rs for this :)

src/commands/publish.rs

@@ -73,8 +73,7 @@ pub fn publish(
 
         let site_namespace = sites::add_namespace(user, target, false)?;
 
-        let (to_upload, to_delete, asset_manifest) =
-            sites::sync(target, user, &site_namespace.id, path)?;
+        let (to_upload, asset_manifest) = sites::sync(target, user, &site_namespace.id, path)?;
 
         // First, upload all existing files in bucket directory
         StdErr::working("Uploading site files");
@@ -105,33 +104,6 @@ pub fn publish(
         upload::script(&upload_client, target, Some(asset_manifest))?;
 
         run_deploy(target)?;
-
-        // Finally, remove any stale files
-        if !to_delete.is_empty() {
-            StdErr::info("Deleting stale files...");
-
-            let delete_progress_bar = if to_delete.len() > bulk::BATCH_KEY_MAX {
-                let delete_progress_bar = ProgressBar::new(to_delete.len() as u64);
-                delete_progress_bar.set_style(
-                    ProgressStyle::default_bar().template("{wide_bar} {pos}/{len}\n{msg}"),
-                );
-                Some(delete_progress_bar)
-            } else {
-                None
-            };
-
-            bulk::delete(
-                target,
-                user,
-                &site_namespace.id,
-                to_delete,
-                &delete_progress_bar,
-            )?;
-
-            if let Some(pb) = delete_progress_bar {
-                pb.finish_with_message("Done deleting");
-            }
-        }
     } else {
         let upload_client = http::legacy_auth_client(user);
 

src/preview/upload.rs

@@ -63,8 +63,7 @@ pub fn upload(
                     let site_namespace = add_namespace(user, target, true)?;
 
                     let path = Path::new(&site_config.bucket);
-                    let (to_upload, to_delete, asset_manifest) =
-                        sync(target, user, &site_namespace.id, path)?;
+                    let (to_upload, asset_manifest) = sync(target, user, &site_namespace.id, path)?;
 
                     // First, upload all existing files in given directory
                     if verbose {
@@ -73,16 +72,7 @@ pub fn upload(
 
                     bulk::put(target, user, &site_namespace.id, to_upload, &None)?;
 
-                    let preview = authenticated_upload(&client, target, Some(asset_manifest))?;
-                    if !to_delete.is_empty() {
-                        if verbose {
-                            StdOut::info("Deleting stale files...");
-                        }
-
-                        bulk::delete(target, user, &site_namespace.id, to_delete, &None)?;
-                    }
-
-                    preview
+                    authenticated_upload(&client, target, Some(asset_manifest))?
                 } else {
                     authenticated_upload(&client, target, None)?
                 }

src/sites/sync.rs

@@ -18,7 +18,7 @@ pub fn sync(
     user: &GlobalUser,
     namespace_id: &str,
     path: &Path,
-) -> Result<(Vec<KeyValuePair>, Vec<String>, AssetManifest)> {
+) -> Result<(Vec<KeyValuePair>, AssetManifest)> {
     // First, find all changed files in given local directory (aka files that are now stale
     // in Workers KV).
 
@@ -41,20 +41,6 @@ pub fn sync(
     let (diff_files_to_upload, asset_manifest, _): (Vec<KeyValuePair>, AssetManifest, _) =
         directory_keys_values(target, path, Some(&remote_keys))?;
 
-    // Now delete files from Workers KV that exist in remote but no longer exist locally.
-    // Get local keys
-    let mut local_keys: HashSet<_> = HashSet::new();
-    for (_, asset_key) in asset_manifest.iter() {
-        local_keys.insert(asset_key.clone());
-    }
-
-    // Find keys that are present in remote but not present in local, and
-    // stage them for deletion.
-    let to_delete: Vec<_> = remote_keys
-        .difference(&local_keys)
-        .map(|key| key.to_owned())
-        .collect();
-
     StdErr::success("Success");
-    Ok((diff_files_to_upload, to_delete, asset_manifest))
+    Ok((diff_files_to_upload, asset_manifest))
 }