sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29165 from nextcloud/bug/noid/s3-delete-folder-versions 

Delete S3 versions in rmdir
pull/29176/head
Vincent Petry 2021-10-11 16:32:54 +07:00 committed by GitHub
parent fc7ec1ff1b 09ab7a40fe
commit 0f80bc03e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/files_external/lib/Lib/Storage/AmazonS3.php
Unescape Escape View File

@ -311,13 +311,35 @@ class AmazonS3 extends \OC\Files\Storage\Common {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['Contents']
'Objects' => $objects['Contents'],
]
]);
$this->testTimeout();
}
// we reached the end when the list is no longer truncated
} while ($objects['IsTruncated']);
do {
// delete all contained versions and deletion markers
$objects = $connection->listObjectVersions($params);
if (isset($objects['Versions'])) {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['Versions'],
]
]);
}
if (isset($objects['DeleteMarkers'])) {
$connection->deleteObjects([
'Bucket' => $this->bucket,
'Delete' => [
'Objects' => $objects['DeleteMarkers'],
]
]);
}
// we reached the end when the list is no longer truncated
} while ($objects['IsTruncated']);
$this->deleteObject($path);
} catch (S3Exception $e) {
\OC::$server->getLogger()->logException($e, ['app' => 'files_external']);