Skip to content

fix: fix BidiBlobWriteSessionConfig to respect preconditions #2481

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

Merged
BenWhitehead merged 1 commit into from
Apr 1, 2024
Merged

fix: fix BidiBlobWriteSessionConfig to respect preconditions #2481

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
81 changes: 81 additions & 0 deletions google-cloud-storage/src/main/java/com/google/cloud/storage/UnifiedOpts.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getObjectChecksumsBuilder().setCrc32C(val);
Copy link
Contributor

@frankyn frankyn Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did this get past tests? (unless it was part of the JUnit test issue you're working on)

Copy link
Collaborator Author

@BenWhitehead BenWhitehead Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tests that were added for bidi specifically didn't tests any preconditions. I'm adding some tests that will run for every BlobWriteSessionConfig to verify they all handle semantics similarly.

Copy link
Contributor

@frankyn frankyn Apr 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's subtle i would likely make the same mistake implementing options; thanks ben!

return b;
};
}

@Override
public int hashCode() {
return Objects.hash(val);
Expand Down Expand Up @@ -753,6 +761,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
customerSuppliedKey(b.getCommonObjectRequestParamsBuilder(), val);
return b;
};
}

@Override
public Mapper<UpdateObjectRequest.Builder> updateObject() {
return b -> {
Expand Down Expand Up @@ -1045,6 +1061,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().setIfGenerationMatch(val);
return b;
};
}

@Override
public Mapper<ReadObjectRequest.Builder> readObject() {
return b -> b.setIfGenerationMatch(val);
Expand Down Expand Up @@ -1106,6 +1130,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().setIfGenerationNotMatch(val);
return b;
};
}

@Override
public Mapper<ReadObjectRequest.Builder> readObject() {
return b -> b.setIfGenerationNotMatch(val);
Expand Down Expand Up @@ -1157,6 +1189,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().getResourceBuilder().setKmsKey(val);
return b;
};
}

@Override
public Mapper<ComposeObjectRequest.Builder> composeObject() {
return b -> b.setKmsKey(val);
Expand Down Expand Up @@ -1217,6 +1257,15 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getObjectChecksumsBuilder()
.setMd5Hash(ByteString.copyFrom(BaseEncoding.base64().decode(val)));
return b;
};
}

@Override
public int hashCode() {
return Objects.hash(val);
Expand Down Expand Up @@ -1252,6 +1301,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().setIfMetagenerationMatch(val);
return b;
};
}

@Override
public Mapper<ReadObjectRequest.Builder> readObject() {
return b -> b.setIfMetagenerationMatch(val);
Expand Down Expand Up @@ -1337,6 +1394,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().setIfMetagenerationNotMatch(val);
return b;
};
}

@Override
public Mapper<ReadObjectRequest.Builder> readObject() {
return b -> b.setIfMetagenerationNotMatch(val);
Expand Down Expand Up @@ -1452,6 +1517,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().setPredefinedAcl(val);
return b;
};
}

@Override
public Mapper<UpdateObjectRequest.Builder> updateObject() {
return b -> b.setPredefinedAcl(val);
Expand Down Expand Up @@ -1704,6 +1777,14 @@ public Mapper<WriteObjectRequest.Builder> writeObject() {
};
}

@Override
public Mapper<BidiWriteObjectRequest.Builder> bidiWriteObject() {
return b -> {
b.getWriteObjectSpecBuilder().getResourceBuilder().setContentType(val);
return b;
};
}

@Override
public Mapper<UpdateObjectRequest.Builder> updateObject() {
return b -> {
Expand Down