handle error

sfc-gh-schen · sfc-gh-schen · commit d936937f0292 · 2023-06-08T10:01:28.000-07:00
diff --git a/s3compatapi/src/main/java/com/snowflake/s3compatapitestsuite/compatapi/S3CompatStorageClient.java b/s3compatapi/src/main/java/com/snowflake/s3compatapitestsuite/compatapi/S3CompatStorageClient.java
@@ -98,8 +98,6 @@ public String getBucketLocation(String bucketName) {
             if (ex.getAdditionalDetails() != null) {
                 String correctRegion = ex.getAdditionalDetails().get("Region");
                 if (correctRegion != null) {
-                    this.s3Client.setSignerRegionOverride(correctRegion);
-                    this.s3Client.setRegion(RegionUtils.getRegion(correctRegion));
                     return correctRegion.toLowerCase();
                 }
             }
@@ -120,10 +118,8 @@ public String getBucketRegionThroughMetadata(String bucketName) {
             }
         } catch (AmazonS3Exception ex) {
             if (ex.getAdditionalDetails() != null) {
-                String correctRegion = ex.getAdditionalDetails().get("Region");
+                String correctRegion = ex.getAdditionalDetails().get(BUCKET_REGION_HEADER_NAME);
                 if (correctRegion != null) {
-                    this.s3Client.setSignerRegionOverride(correctRegion);
-                    this.s3Client.setRegion(RegionUtils.getRegion(correctRegion));
                     return correctRegion.toLowerCase();
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,6 @@ public String getBucketLocation(String bucketName) {`
`98`	`98`	`if (ex.getAdditionalDetails() != null) {`
`99`	`99`	`String correctRegion = ex.getAdditionalDetails().get("Region");`
`100`	`100`	`if (correctRegion != null) {`
`101`		`- this.s3Client.setSignerRegionOverride(correctRegion);`
`102`		`- this.s3Client.setRegion(RegionUtils.getRegion(correctRegion));`
`103`	`101`	`return correctRegion.toLowerCase();`
`104`	`102`	`}`
`105`	`103`	`}`
`@@ -120,10 +118,8 @@ public String getBucketRegionThroughMetadata(String bucketName) {`
`120`	`118`	`}`
`121`	`119`	`} catch (AmazonS3Exception ex) {`
`122`	`120`	`if (ex.getAdditionalDetails() != null) {`
`123`		`- String correctRegion = ex.getAdditionalDetails().get("Region");`
	`121`	`+ String correctRegion = ex.getAdditionalDetails().get(BUCKET_REGION_HEADER_NAME);`
`124`	`122`	`if (correctRegion != null) {`
`125`		`- this.s3Client.setSignerRegionOverride(correctRegion);`
`126`		`- this.s3Client.setRegion(RegionUtils.getRegion(correctRegion));`
`127`	`123`	`return correctRegion.toLowerCase();`
`128`	`124`	`}`
`129`	`125`	`}`