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

Jump to bottom

fix: Requester pays to check reason and fallback to error message validation #841

Merged
merged 5 commits into from
Mar 4, 2022
Merged

fix: Requester pays to check reason and fallback to error message validation #841

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
776ee54
fix: Requester pays to check reason and fallback to error message val…
sydney-munro Mar 2, 2022
5149f01
Addressing PR comments
sydney-munro Mar 3, 2022
d4638ce
Adding Tests back for requester pays
sydney-munro Mar 4, 2022
ea0a6f4
Fix autoDetectNoUserProjectTest
sydney-munro Mar 4, 2022
8d596fa
Linter changes
sydney-munro Mar 4, 2022
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
6 changes: 5 additions & 1 deletion ...io/src/main/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -967,7 +967,11 @@ public boolean requesterPays(String bucketName) {
Boolean isRP = storage.get(bucketName).requesterPays();
return isRP != null && isRP.booleanValue();
} catch (StorageException ex) {
if (ex.getCode() == 400 && ex.getMessage().contains("Bucket is requester pays")) {
if (ex.getReason().equals("userProjectMissing")) {
return true;
// fallback to checking the error code and error message.
} else if (ex.getCode() == 400
&& ex.getMessage().contains("Bucket is a requester pays bucket")) {
sydney-munro marked this conversation as resolved.
Show resolved Hide resolved
return true;
}
throw ex;
Expand Down