Da rp bucket location #5168
Closed
Da rp bucket location #5168
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
davidangb
commented
Nov 13, 2024
| @@ -76,7 +76,7 @@ const checkRequesterPaysError = async (response): Promise<RequesterPaysErrorInfo | |||
| }; | |||
|
|
|||
| export const responseContainsRequesterPaysError = (responseText) => { | |||
| return _.includes('requester pays', responseText); | |||
| return _.includes('to user project', responseText); | |||
There was a problem hiding this comment.
This function needs to know how to recognize requester-pays problems from the Rawls bucketOptions API. I don't know the best way to do this; "to user project" is probably way too generic
davidangb
commented
Nov 13, 2024
| @@ -22,7 +22,7 @@ export type { InitializedWorkspaceWrapper } from 'src/libs/state'; | |||
| export interface StorageDetails { | |||
| googleBucketLocation: string; // historically returns defaultLocation if bucket location cannot be retrieved or Azure | |||
| googleBucketType: string; // historically returns locationTypes.default if bucket type cannot be retrieved or Azure | |||
| fetchedGoogleBucketLocation: 'SUCCESS' | 'ERROR' | undefined; // undefined: still fetching | |||
| fetchedGoogleBucketLocation: 'SUCCESS' | 'ERROR' | 'RPERROR' | undefined; // undefined: still fetching | |||
There was a problem hiding this comment.
Changing the model to distinguish between requester-pays errors with RPERROR and other errors with ERROR
davidangb
commented
Nov 13, 2024
| @@ -115,7 +115,7 @@ export const useWorkspace = (namespace, name): WorkspaceDetails => { | |||
| if (responseContainsRequesterPaysError(errorText)) { | |||
| // loadGoogleBucketLocation will not get called in this case because checkBucketReadAccess fails first, | |||
| // but it would also fail with the requester pays error. | |||
| setGoogleStorage({ fetchedLocation: 'ERROR', location, locationType }); | |||
| setGoogleStorage({ fetchedLocation: 'RPERROR', location, locationType }); | |||
There was a problem hiding this comment.
since this is where we inspect the error to find requester-pays problems (line 115), this is where we can set RPERROR
davidangb
commented
Nov 13, 2024
| @@ -60,6 +58,9 @@ export const BucketLocation = requesterPaysWrapper({ onDismiss: _.noop })((props | |||
| // while storageDetails.googleBucketLocation will contain the default value. | |||
| // In the case of requester pays workspaces, we wish to show the user more information in this case and allow them to link a workspace. | |||
| loadGoogleBucketLocation(); | |||
| } else if (storageDetails.fetchedGoogleBucketLocation === 'RPERROR') { | |||
| setNeedsRequesterPaysProject(true); | |||
| setLoading(false); | |||
There was a problem hiding this comment.
added a case here for RPERROR which sets the proper state. the ERROR case continues to try to reload; this might happen as permissions are being synced.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE, for discussion only