export: Remove `--delete-after-upload` flag in realm export.

For export realm following changes have been made:
- `./manage.py export --upload` would delete `.tar.gz` and unpacked dir
- `./manage.py export` would only delete `unpacked dir`

Besides, we have removed `--delete-after-upload` as we have set it as
the default.

Fixes #20081
This commit is contained in:
Shlok Patel 2021-11-02 14:09:17 +05:30 committed by Tim Abbott
parent 4d055a6695
commit 893c9bc896
4 changed files with 4 additions and 16 deletions

View File

@ -1947,7 +1947,6 @@ def export_realm_wrapper(
threads: int, threads: int,
upload: bool, upload: bool,
public_only: bool, public_only: bool,
delete_after_upload: bool,
percent_callback: Optional[Callable[[Any], None]] = None, percent_callback: Optional[Callable[[Any], None]] = None,
consent_message_id: Optional[int] = None, consent_message_id: Optional[int] = None,
) -> Optional[str]: ) -> Optional[str]:
@ -1958,9 +1957,8 @@ def export_realm_wrapper(
public_only=public_only, public_only=public_only,
consent_message_id=consent_message_id, consent_message_id=consent_message_id,
) )
print(f"Finished exporting to {output_dir}") shutil.rmtree(output_dir)
print(f"Tarball written to {tarball_path}") print(f"Tarball written to {tarball_path}")
if not upload: if not upload:
return None return None
@ -1971,10 +1969,8 @@ def export_realm_wrapper(
public_url = zerver.lib.upload.upload_backend.upload_export_tarball( public_url = zerver.lib.upload.upload_backend.upload_export_tarball(
realm, tarball_path, percent_callback=percent_callback realm, tarball_path, percent_callback=percent_callback
) )
print() print(f"\nUploaded to {public_url}")
print(f"Uploaded to {public_url}")
if delete_after_upload:
os.remove(tarball_path) os.remove(tarball_path)
print(f"Successfully deleted the tarball at {tarball_path}") print(f"Successfully deleted the tarball at {tarball_path}")
return public_url return public_url

View File

@ -104,11 +104,6 @@ class Command(ZulipBaseCommand):
action="store_true", action="store_true",
help="Whether to upload resulting tarball to s3 or LOCAL_UPLOADS_DIR", help="Whether to upload resulting tarball to s3 or LOCAL_UPLOADS_DIR",
) )
parser.add_argument(
"--delete-after-upload",
action="store_true",
help="Automatically delete the local tarball after a successful export",
)
self.add_realm_args(parser, required=True) self.add_realm_args(parser, required=True)
def handle(self, *args: Any, **options: Any) -> None: def handle(self, *args: Any, **options: Any) -> None:
@ -215,7 +210,6 @@ class Command(ZulipBaseCommand):
threads=num_threads, threads=num_threads,
upload=options["upload"], upload=options["upload"],
public_only=public_only, public_only=public_only,
delete_after_upload=options["delete_after_upload"],
percent_callback=percent_callback, percent_callback=percent_callback,
consent_message_id=consent_message_id, consent_message_id=consent_message_id,
) )

View File

@ -525,7 +525,6 @@ class TestExport(ZulipTestCase):
realm=realm, realm=realm,
public_only=False, public_only=False,
consent_message_id=message.id, consent_message_id=message.id,
delete_after_upload=False,
threads=mock.ANY, threads=mock.ANY,
output_dir=mock.ANY, output_dir=mock.ANY,
percent_callback=mock.ANY, percent_callback=mock.ANY,

View File

@ -979,7 +979,6 @@ class DeferredWorker(QueueProcessingWorker):
threads=6, threads=6,
upload=True, upload=True,
public_only=True, public_only=True,
delete_after_upload=True,
) )
except Exception: except Exception:
export_event.extra_data = orjson.dumps( export_event.extra_data = orjson.dumps(