Skip to content
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

fix: update grpc bidi resumable uploads to validate ack'd object size #2570

Merged
merged 6 commits into from
Jun 13, 2024
Merged

fix: update grpc bidi resumable uploads to validate ack'd object size #2570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83748e8
fix: update grpc bidi resumable uploads to validate ack'd object size
BenWhitehead May 30, 2024
e2c3c81
fix: update grpc bidi resumable uploads to validate ack'd object size
BenWhitehead May 30, 2024
6c9c450
fix: update grpc bidi resumable uploads to validate ack'd object size
BenWhitehead May 30, 2024
dc2441a
fix: update grpc bidi resumable uploads to validate ack'd object size
BenWhitehead May 30, 2024
41eaa81
fix: update grpc bidi resumable uploads to validate ack'd object size
BenWhitehead May 30, 2024
f046ba1
chore: fix failing tests
BenWhitehead May 31, 2024
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
2 changes: 1 addition & 1 deletion google-cloud-storage/src/main/java/com/google/cloud/storage/BidiResumableWrite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public StartResumableWriteResponse getRes() {

@Override
public BidiWriteObjectRequest.Builder newBuilder() {
return writeRequest.toBuilder();
return writeRequest.toBuilder().clearWriteObjectSpec();
}

@Override
Expand Down
33 changes: 0 additions & 33 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/BidiWriteCtx.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

package com.google.cloud.storage;

import static com.google.cloud.storage.StorageV2ProtoUtils.fmtProto;

import com.google.cloud.storage.BidiWriteCtx.BidiWriteObjectRequestBuilderFactory;
import com.google.cloud.storage.Crc32cValue.Crc32cLengthKnown;
import com.google.storage.v2.BidiWriteObjectRequest;
Expand Down Expand Up @@ -84,36 +82,5 @@ interface BidiWriteObjectRequestBuilderFactory {

@Nullable
String bucketName();

static BidiSimpleWriteObjectRequestBuilderFactory simple(BidiWriteObjectRequest req) {
return new BidiSimpleWriteObjectRequestBuilderFactory(req);
}
}

static final class BidiSimpleWriteObjectRequestBuilderFactory
implements BidiWriteObjectRequestBuilderFactory {
private final BidiWriteObjectRequest req;

private BidiSimpleWriteObjectRequestBuilderFactory(BidiWriteObjectRequest req) {
this.req = req;
}

@Override
public BidiWriteObjectRequest.Builder newBuilder() {
return req.toBuilder();
}

@Override
public @Nullable String bucketName() {
if (req.hasWriteObjectSpec() && req.getWriteObjectSpec().hasResource()) {
return req.getWriteObjectSpec().getResource().getBucket();
}
return null;
}

@Override
public String toString() {
return "SimpleBidiWriteObjectRequestBuilderFactory{" + "req=" + fmtProto(req) + '}';
}
}
}
Loading
Loading