feat(icx-asset): add --no-delete option to sync command

e2e/tests-icx-asset/icx-asset.bash

@@ -108,6 +108,28 @@ icx_asset_upload() {
   assert_not_match '"/will-delete-this.txt"'
 }
 
+@test "does not delete removed files if --no-delete is passed" {
+  touch src/e2e_project_frontend/assets/will-not-delete-this.txt
+  dfx deploy
+
+  assert_command dfx canister call --query e2e_project_frontend get '(record{key="/will-not-delete-this.txt";accept_encodings=vec{"identity"}})'
+  assert_command dfx canister call --query e2e_project_frontend list '(record{})'
+  assert_match '"/will-not-delete-this.txt"'
+
+  rm src/e2e_project_frontend/assets/will-not-delete-this.txt
+
+  icx_asset_sync src/e2e_project_frontend/assets --no-delete
+
+  assert_command dfx canister call --query e2e_project_frontend get '(record{key="/will-not-delete-this.txt";accept_encodings=vec{"identity"}})'
+  assert_command dfx canister call --query e2e_project_frontend list '(record{})'
+  assert_match '"/will-not-delete-this.txt"'
+  icx_asset_sync src/e2e_project_frontend/assets
+
+  assert_command_fail dfx canister call --query e2e_project_frontend get '(record{key="/will-not-delete-this.txt";accept_encodings=vec{"identity"}})'
+  assert_command dfx canister call --query e2e_project_frontend list '(record{})'
+  assert_not_contains '"/will-not-delete-this.txt"'
+}
+
 @test "unsets asset encodings that are removed from project" {
 
   # shellcheck disable=SC2086

src/canisters/frontend/ic-asset/src/lib.rs

@@ -20,7 +20,7 @@
 //!     .with_agent(&agent)
 //!     .build()?;
 //! let logger = slog::Logger::root(slog::Discard, slog::o!());
-//! ic_asset::sync(&canister, &[concat!(env!("CARGO_MANIFEST_DIR"), "assets/").as_ref()], &logger).await?;
+//! ic_asset::sync(&canister, &[concat!(env!("CARGO_MANIFEST_DIR"), "assets/").as_ref()], false, &logger).await?;
 //! # Ok(())
 //! # }
 

src/canisters/frontend/ic-asset/src/sync.rs

@@ -44,6 +44,7 @@ const KNOWN_DIRECTORIES: [&str; 1] = [".well-known"];
 pub async fn upload_content_and_assemble_sync_operations(
     canister: &Canister<'_>,
     dirs: &[&Path],
+    no_delete: bool,
     logger: &Logger,
 ) -> Result<CommitBatchArguments, UploadContentError> {
     let asset_descriptors = gather_asset_descriptors(dirs, logger)?;
@@ -84,7 +85,10 @@ pub async fn upload_content_and_assemble_sync_operations(
     let commit_batch_args = batch_upload::operations::assemble_commit_batch_arguments(
         project_assets,
         canister_assets,
-        AssetDeletionReason::Obsolete,
+        match no_delete {
+            true => AssetDeletionReason::Incompatible,
+            false => AssetDeletionReason::Obsolete,
+        },
         canister_asset_properties,
         batch_id,
     );
@@ -112,10 +116,11 @@ pub async fn upload_content_and_assemble_sync_operations(
 pub async fn sync(
     canister: &Canister<'_>,
     dirs: &[&Path],
+    no_delete: bool,
     logger: &Logger,
 ) -> Result<(), SyncError> {
     let commit_batch_args =
-        upload_content_and_assemble_sync_operations(canister, dirs, logger).await?;
+        upload_content_and_assemble_sync_operations(canister, dirs, no_delete, logger).await?;
     let canister_api_version = api_version(canister).await;
     debug!(logger, "Canister API version: {canister_api_version}. ic-asset API version: {BATCH_UPLOAD_API_VERSION}");
     info!(logger, "Committing batch.");
@@ -189,7 +194,7 @@ pub async fn prepare_sync_for_proposal(
     dirs: &[&Path],
     logger: &Logger,
 ) -> Result<(), PrepareSyncForProposalError> {
-    let arg = upload_content_and_assemble_sync_operations(canister, dirs, logger).await?;
+    let arg = upload_content_and_assemble_sync_operations(canister, dirs, false, logger).await?;
     let arg = sort_batch_operations(arg);
     let batch_id = arg.batch_id.clone();
 

src/canisters/frontend/icx-asset/src/commands/sync.rs

@@ -9,6 +9,6 @@ pub(crate) async fn sync(
     logger: &Logger,
 ) -> anyhow::Result<()> {
     let dirs: Vec<&Path> = o.directory.iter().map(|d| d.as_path()).collect();
-    ic_asset::sync(canister, &dirs, logger).await?;
+    ic_asset::sync(canister, &dirs, o.no_delete, logger).await?;
     Ok(())
 }

src/canisters/frontend/icx-asset/src/main.rs

@@ -90,6 +90,10 @@ struct SyncOpts {
 
     /// The directories to synchronize
     directory: Vec<PathBuf>,
+
+    /// Do not delete files from the canister that are not present locally.
+    #[arg(long)]
+    no_delete: bool,
 }
 
 #[derive(Parser)]

src/dfx/src/lib/installers/assets/mod.rs

@@ -27,7 +27,7 @@ pub async fn post_install_store_assets(
         .build()
         .context("Failed to build asset canister caller.")?;
 
-    ic_asset::sync(&canister, &source_paths, logger)
+    ic_asset::sync(&canister, &source_paths, false, logger)
         .await
         .with_context(|| {
             format!(