From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 12 Oct 2021 15:06:02 +0000 (+0200)
Subject: Revert "Delete S3 versions in rmdir"
X-Git-Tag: v23.0.0beta1~25^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F29185%2Fhead;p=nextcloud-server.git

Revert "Delete S3 versions in rmdir"
---

diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php
index a6872f1dc3e..1bdd11e39bd 100644
--- a/apps/files_external/lib/Lib/Storage/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php
@@ -311,35 +311,13 @@ 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']);