Skip to content

fix(Google.Cloud.Storage.V1): configure retry options in DeleteObject overloads taking an Object #16018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
robertvoinescu-work wants to merge 1 commit into from
Closed

fix(Google.Cloud.Storage.V1): configure retry options in DeleteObject overloads taking an Object #16018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1.Tests/StorageClientImplRetryTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,21 @@ public void DeleteObject_RetryThenFail() =>
RetryThenFail(service => new ObjectsResource.DeleteRequest(service, "bucket", "objectName") { Generation = 70 },
client => client.DeleteObject("bucket", "objectName", new DeleteObjectOptions { Generation = 70 }), "check");

[Fact]
public void DeleteObject_Object_NoRetry() => NoRetryHelper(
service => service.Objects.Delete("bucket", "objectName"),
client => client.DeleteObject(new Object { Bucket = "bucket", Name = "objectName" }));

[Fact]
public void DeleteObject_Object_RetryOnce() => RetryOnce(
service => new ObjectsResource.DeleteRequest(service, "bucket", "objectName") { Generation = 70 },
client => client.DeleteObject(new Object { Bucket = "bucket", Name = "objectName" }, new DeleteObjectOptions { Generation = 70 }), "check");

[Fact]
public void DeleteObject_Object_RetryThenFail() =>
RetryThenFail(service => new ObjectsResource.DeleteRequest(service, "bucket", "objectName") { Generation = 70 },
client => client.DeleteObject(new Object { Bucket = "bucket", Name = "objectName" }, new DeleteObjectOptions { Generation = 70 }), "check");

[Fact]
public void UpdateObject_WithMetageneration_RetryOnce() => RetryOnceHelper(
service => new ObjectsResource.UpdateRequest(service, new Object { Bucket = "bucket", Name = "object" }, "bucket", "object") { IfMetagenerationMatch = 70 },
Expand Down
4 changes: 1 addition & 3 deletions apis/Google.Cloud.Storage.V1/Google.Cloud.Storage.V1/StorageClientImpl.DeleteObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@ public override Task DeleteObjectAsync(Object obj, DeleteObjectOptions options =
private ObjectsResource.DeleteRequest CreateDeleteObjectRequest(Object obj, DeleteObjectOptions options)
{
ValidateObject(obj, nameof(obj));
var request = Service.Objects.Delete(obj.Bucket, obj.Name);
options?.ModifyRequest(request);
return request;
return CreateDeleteObjectRequest(obj.Bucket, obj.Name, options);
}

private ObjectsResource.DeleteRequest CreateDeleteObjectRequest(string bucket, string name, DeleteObjectOptions options)
Expand Down
Loading