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

Delete S3 versions in rmdir

Author: PVince81

apps/files_external/lib/Lib/Storage/AmazonS3.php

@@ -311,13 +311,35 @@ private function batchDelete($path = null) {
 					$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']);