[#100] s3: Add a flag for permanent versioned object deletion

Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>

internal/s3/client.go

@@ -106,8 +106,51 @@ func (c *Client) Multipart(bucket, key string, objPartSize, concurrency int, pay
 	return PutResponse{Success: true}
 }
 
-func (c *Client) Delete(bucket, key string) DeleteResponse {
+func (c *Client) Delete(bucket, key string, allVersions bool) DeleteResponse {
 	start := time.Now()
+	if allVersions {
+		versions, err := c.cli.ListObjectVersions(c.vu.Context(), &s3.ListObjectVersionsInput{
+			Bucket: aws.String(bucket),
+			Prefix: aws.String(key),
+		})
+		if err != nil {
+			stats.Report(c.vu, objPutFails, 1)
+			return DeleteResponse{Success: false, Error: err.Error()}
+		}
+
+		var toDelete []types.ObjectIdentifier
+		for _, v := range versions.Versions {
+			if *v.Key == key {
+				toDelete = append(toDelete, types.ObjectIdentifier{
+					Key:       v.Key,
+					VersionId: v.VersionId,
+				})
+			}
+		}
+		for _, marker := range versions.DeleteMarkers {
+			if *marker.Key == key {
+				toDelete = append(toDelete, types.ObjectIdentifier{
+					Key:       marker.Key,
+					VersionId: marker.VersionId,
+				})
+			}
+		}
+		if len(toDelete) != 0 {
+			_, err := c.cli.DeleteObjects(c.vu.Context(), &s3.DeleteObjectsInput{
+				Bucket: aws.String(bucket),
+				Delete: &types.Delete{
+					Objects: toDelete,
+					Quiet:   true,
+				},
+			})
+			if err != nil {
+				stats.Report(c.vu, objPutFails, 1)
+				return DeleteResponse{Success: false, Error: err.Error()}
+			}
+
+			return DeleteResponse{Success: true}
+		}
+	}
 
 	_, err := c.cli.DeleteObject(c.vu.Context(), &s3.DeleteObjectInput{
 		Bucket: aws.String(bucket),

scenarios/s3.js

@@ -215,7 +215,7 @@ export function obj_delete() {
     return;
   }
 
-  const resp = s3_client.delete(obj.s3_bucket, obj.s3_key);
+  const resp = s3_client.delete(obj.s3_bucket, obj.s3_key, false);
   if (!resp.success) {
     log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETE'})
         .error(resp.error);

scenarios/s3_car.js

@@ -228,7 +228,7 @@ export function obj_delete() {
     return;
   }
 
-  const resp = s3_client.delete(obj.s3_bucket, obj.s3_key);
+  const resp = s3_client.delete(obj.s3_bucket, obj.s3_key, false);
   if (!resp.success) {
     log.withFields({bucket: obj.s3_bucket, key: obj.s3_key, op: 'DELETE'})
         .error(resp.error);

scenarios/s3_dar.js

@@ -222,7 +222,7 @@ export function delete_object(obj) {
         return;
     }
 
-    const resp = s3_client.delete(obj.s3_bucket, obj.s3_key);
+    const resp = s3_client.delete(obj.s3_bucket, obj.s3_key, false);
     if (!resp.success) {
         log.withFields({bucket : obj.s3_bucket, key : obj.s3_key, op : 'DELETE'})
             .error(resp.error);