Use forceDelete flag instead of direct deletion.

Author: isoos

app/lib/admin/actions/moderate_package.dart

@@ -83,7 +83,7 @@ Note: the action may take a longer time to complete as the public archive bucket
       });
 
       // sync exported API(s)
-      await apiExporter?.synchronizePackage(package);
+      await apiExporter?.synchronizePackage(package, forceDelete: true);
 
       // retract or re-populate public archive files
       await packageBackend.tarballStorage.updatePublicArchiveBucket(

app/lib/admin/actions/moderate_package_versions.dart

@@ -116,7 +116,7 @@ Set the moderated flag on a package version (updating the flag and the timestamp
       });
 
       // sync exported API(s)
-      await apiExporter?.synchronizePackage(package);
+      await apiExporter?.synchronizePackage(package, forceDelete: true);
 
       // retract or re-populate public archive files
       await packageBackend.tarballStorage.updatePublicArchiveBucket(

app/lib/package/api_export/api_exporter.dart

@@ -188,9 +188,16 @@ final class ApiExporter {
   ///  * Running a full background synchronization.
   ///  * When a change in [Package.updated] is detected.
   ///  * A package is moderated, or other admin action is applied.
+  ///
+  /// When [forceDelete] is set, the age threshold limit for stray files is
+  /// ignored, they will be deleted even if they were updated recently.
+  ///
+  /// When [forceDelete] is set, the age threshold limit for stray files is
+  /// ignored, they will be deleted even if they were updated recently.
   Future<void> synchronizePackage(
     String package, {
     bool forceWrite = false,
+    bool forceDelete = false,
   }) async {
     _log.info('synchronizePackage("$package")');
 
@@ -216,19 +223,6 @@ final class ApiExporter {
     final versions = await packageBackend.tarballStorage
         .listVersionsInCanonicalBucket(package);
 
-    // Check versions that are not exposed in the public API and if they are moderated, delete them.
-    for (final cv in versions.entries) {
-      final version = cv.key;
-      if (versionListing.versions.any((v) => v.version == version)) {
-        continue;
-      }
-      final pv = await packageBackend.lookupPackageVersion(package, version);
-      if (pv != null && pv.isModerated) {
-        // We only delete the package if it is explicitly moderated.
-        // If we can't find it, then it's safer to assume that it's a bug.
-        await _api.package(package).deleteVersion(version);
-      }
-    }
     // Remove versions that are not exposed in the public API.
     versions.removeWhere(
       (version, _) => !versionListing.versions.any((v) => v.version == version),
@@ -237,6 +231,7 @@ final class ApiExporter {
     await _api.package(package).synchronizeTarballs(
           versions,
           forceWrite: forceWrite,
+          forceDelete: forceDelete,
         );
     await _api.package(package).advisories.write(
           advisories,

app/lib/package/api_export/exported_api.dart

@@ -293,6 +293,7 @@ final class ExportedPackage {
   Future<void> synchronizeTarballs(
     Map<String, SourceObjectInfo> versions, {
     bool forceWrite = false,
+    bool forceDelete = false,
   }) async {
     await Future.wait([
       ..._owner._prefixes.map((prefix) async {
@@ -331,7 +332,8 @@ final class ExportedPackage {
           }
 
           // Delete the item, if it's old enough.
-          if (item.updated.isBefore(clock.agoBy(_minGarbageAge))) {
+          if (forceDelete ||
+              item.updated.isBefore(clock.agoBy(_minGarbageAge))) {
             // Only delete if the item if it's older than _minGarbageAge
             // This avoids any races where we delete files we've just created
             await _owner._bucket.tryDelete(item.name);
@@ -402,13 +404,6 @@ final class ExportedPackage {
       }),
     ]);
   }
-
-  /// Deletes the files related to this package and [version].
-  Future<void> deleteVersion(String version) async {
-    await Future.wait([
-      tarball(version).delete(),
-    ]);
-  }
 }
 
 /// Information about an object to be used as source in a copy operation.