Don't specify region when it's null

Author: ting-lan-wang

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/s3/S3Factory.java

@@ -8,6 +8,7 @@
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
 import software.amazon.awssdk.services.s3.model.GetObjectRequest;
 
 import java.io.InputStream;
@@ -54,10 +55,18 @@ public static ResourceFactory<InputStream> getInstance() {
   @Override
   public Resource<InputStream> request(
       AwsCredentials awsCredentials, ParameterSet parameterSet) {
+    // Get S3 URL and region from the parameter set.
     String s3Url = parameterSet.getRequired(S3_URL);
     String region = parameterSet.getOptional(REGION);
 
-    URI uri = null;
+    // Create S3 client builder and specify the region if it's not null
+    S3ClientBuilder builder = S3Client
+        .builder()
+        .credentialsProvider(() -> awsCredentials);
+    if (region != null) builder.region(Region.of(region));
+
+    // Create URI to get the bucket name and the object key
+    URI uri;
     try {
       uri = new URI(s3Url);
     } catch (URISyntaxException uriSyntaxException) {
@@ -66,11 +75,7 @@ public Resource<InputStream> request(
           uriSyntaxException);
     }
 
-    try (S3Client client = S3Client.builder()
-        .region(Region.of(region))
-        .credentialsProvider(() -> awsCredentials)
-        .build()) {
-
+    try (S3Client client = builder.build()) {
       String bucketName = uri.getHost();
       String objectKey = uri.getPath()
           .substring(1);

ojdbc-provider-aws/src/main/java/oracle/jdbc/provider/aws/secrets/SecretsManagerFactory.java

@@ -84,18 +84,20 @@ public Resource<String> request(
     String secretName = parameterSet.getRequired(SECRET_NAME);
     String region = parameterSet.getOptional(REGION);
 
-    SecretsManagerClientBuilder builder = SecretsManagerClient.builder()
+    SecretsManagerClientBuilder builder = SecretsManagerClient
+        .builder()
         .credentialsProvider(() -> awsCredentials);
     if (region != null)
       builder.region(Region.of(region));
 
-    SecretsManagerClient client = builder.build();
-    GetSecretValueRequest request = GetSecretValueRequest.builder()
-        .secretId(secretName).build();
-    GetSecretValueResponse response = client.getSecretValue(request);
+    try (SecretsManagerClient client = builder.build()) {
+      GetSecretValueRequest request = GetSecretValueRequest.builder()
+          .secretId(secretName).build();
+      GetSecretValueResponse response = client.getSecretValue(request);
 
-    String secretString = response.secretString();
+      String secretString = response.secretString();
 
-    return Resource.createPermanentResource(secretString, true);
+      return Resource.createPermanentResource(secretString, true);
+    }
   }
 }