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

Vanity URLs with AWS result in bucket NOT_FOUND on #2411 #2412

Merged
merged 5 commits into from
May 27, 2021
Merged

Vanity URLs with AWS result in bucket NOT_FOUND on #2411 #2412

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bba7226
Vanity URLs with AWS result in bucket NOT_FOUND on #2411
prb112 May 21, 2021
3de73cc
Update fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/provi…
prb112 May 26, 2021
184a181
Update fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/provi…
prb112 May 26, 2021
22bdb6a
Update fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/provi…
prb112 May 26, 2021
f1e9084
Update fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/provi…
prb112 May 27, 2021
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
12 changes: 9 additions & 3 deletions fhir-bulkdata-webapp/src/main/java/com/ibm/fhir/bulkdata/provider/impl/S3Provider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public S3Provider(String source) throws FHIRException {

String cosLocation = adapter.getStorageProviderLocation(source);
String cosEndpointUrl = adapter.getStorageProviderEndpointInternal(source);
String bucketName = adapter.getStorageProviderBucketName(source);
bucketName = adapter.getStorageProviderBucketName(source);

boolean iam = adapter.isStorageProviderAuthTypeIam(source);
isExportPublic = adapter.isStorageProviderExportPublic(source);
Expand Down Expand Up @@ -171,10 +171,16 @@ private static AmazonS3 getClient(boolean iam, String cosApiKeyProperty, String
* @return
prb112 marked this conversation as resolved.
Show resolved Hide resolved
*/
public boolean exists() {
prb112 marked this conversation as resolved.
Show resolved Hide resolved
boolean ex = client != null && client.doesBucketExistV2(bucketName);
if (ex == false) {
boolean ex = client != null;

// We only want to log a warning here, and assume it's true if the client exists
prb112 marked this conversation as resolved.
Show resolved Hide resolved
// in certain circumstances, a direct url to the bucket can be used. https://mybucketdemo123.s3.us.east-2.amazonaws.com
prb112 marked this conversation as resolved.
Show resolved Hide resolved
// versus an API enabled url e.g. https://s3.us.east-2.amazonaws.com
// These end up with TWO different responses, the former is false, and the latter is true.
if (!client.doesBucketExistV2(bucketName)) {
prb112 marked this conversation as resolved.
Show resolved Hide resolved
logger.warning("Bucket '" + bucketName + "' not found! Client [" + (client != null) + "]");
}

return ex;
}

Expand Down