Add override for default region.

README.md

@@ -92,3 +92,20 @@ The secret being used should be in the JSON format we use for our rotation lambd
 	...
 }
 ```
+### Overriding Default Regions
+
+The default region provider chain is used if no adjustments are made. In order to override this default, use one of the following options listed below.
+
+1) Set a PrivateLink DNS endpoint URL and region in the secretsmanager.properties file.
+```text
+drivers.vpcEndpointUrl= #The endpoint URL
+drivers.vpcEndpointRegion= #The endpoint region
+```
+Both options must be set in order for this option to take effect.
+
+2) Override the region by setting the 'AWS_SECRET_JDBC_REGION' environment variable to the preferred region.
+
+3) Override the region via the secretsmanager.properties file.
+```text
+drivers.region= #The region to use.
+```

pom.xml

@@ -16,7 +16,7 @@
   <artifactId>aws-secretsmanager-jdbc</artifactId>
   <packaging>jar</packaging>
   <name>AWS Secrets Manager SQL Connection Library</name>
-  <version>1.0.8</version>
+  <version>1.0.9</version>
   <description>The AWS Secrets Manager SQL Connection Library for Java enables Java developers to easily
     connect to SQL databases using secrets stored in AWS Secrets Manager.
   </description>
@@ -29,7 +29,7 @@
     <jackson.version>2.13.3</jackson.version>
     <junit.version>4.13.2</junit.version>
     <mockito.version>1.10.19</mockito.version>
-    <powermock.version>1.6.6</powermock.version>
+    <powermock.version>1.7.0</powermock.version>
     <compiler.plugin.version>3.10.1</compiler.plugin.version>
     <javadoc.plugin.version>3.4.0</javadoc.plugin.version>
     <source.plugin.version>3.2.1</source.plugin.version>
@@ -291,4 +291,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>

src/main/java/com/amazonaws/secretsmanager/sql/AWSSecretsManagerDriver.java

@@ -12,10 +12,10 @@
  */
 package com.amazonaws.secretsmanager.sql;
 
-import com.amazonaws.client.builder.AwsClientBuilder;
 import com.amazonaws.secretsmanager.util.Config;
 import com.amazonaws.secretsmanager.caching.SecretCache;
 import com.amazonaws.secretsmanager.caching.SecretCacheConfiguration;
+import com.amazonaws.secretsmanager.util.JDBCSecretCacheBuilderProvider;
 import com.amazonaws.services.secretsmanager.AWSSecretsManager;
 import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
 import com.amazonaws.util.StringUtils;
@@ -105,13 +105,6 @@ public abstract class AWSSecretsManagerDriver implements Driver {
      */ 
     public static final String INVALID_SECRET_STRING_JSON = "Could not parse SecretString JSON";
 
-    /**
-     * Configuration property to override PrivateLink DNS URL for Secrets Manager
-     */
-    private static final String PROPERTY_VPC_ENDPOINT_URL = "vpcEndpointUrl";
-
-    private static final String PROPERTY_VPC_ENDPOINT_REGION = "vpcEndpointRegion";
-
     private SecretCache secretCache;
 
     private String realDriverClass;
@@ -120,35 +113,25 @@ public abstract class AWSSecretsManagerDriver implements Driver {
 
     private ObjectMapper mapper = new ObjectMapper();
 
+
+
     /**
      * Constructs the driver setting the properties from the properties file using system properties as defaults.
      * Instantiates the secret cache with default options.
      */
     protected AWSSecretsManagerDriver() {
-        this(new SecretCache());
+        this(new JDBCSecretCacheBuilderProvider().build());
     }
 
+
     /**
      * Constructs the driver setting the properties from the properties file using system properties as defaults.
      * Sets the secret cache to the cache that was passed in.
      *
      * @param cache                                             Secret cache to use to retrieve secrets
      */
     protected AWSSecretsManagerDriver(SecretCache cache) {
-
-        final Config config = Config.loadMainConfig();
-
-        String vpcEndpointUrl = config.getStringPropertyWithDefault(PROPERTY_PREFIX+"."+PROPERTY_VPC_ENDPOINT_URL, null);
-        String vpcEndpointRegion = config.getStringPropertyWithDefault(PROPERTY_PREFIX+"."+PROPERTY_VPC_ENDPOINT_REGION, null);
-
-        if (vpcEndpointUrl == null || vpcEndpointUrl.isEmpty() || vpcEndpointRegion == null || vpcEndpointRegion.isEmpty()) {
-            this.secretCache = cache;
-        } else {
-            AWSSecretsManagerClientBuilder builder = AWSSecretsManagerClientBuilder.standard();
-            builder.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(vpcEndpointUrl, vpcEndpointRegion));
-
-            this.secretCache = new SecretCache(builder);
-        }
+        this.secretCache = cache;
 
         setProperties();
         AWSSecretsManagerDriver.register(this);
@@ -186,8 +169,6 @@ protected AWSSecretsManagerDriver(SecretCacheConfiguration cacheConfig) {
 
     /**
      * Sets general configuration properties that are unrelated to the API client.
-     *
-     * @param config                                            The main configuration for this driver.
      */
     private void setProperties() {
         this.config = Config.loadMainConfig().getSubconfig(PROPERTY_PREFIX + "." + getPropertySubprefix());

src/main/java/com/amazonaws/secretsmanager/util/JDBCSecretCacheBuilderProvider.java

@@ -0,0 +1,76 @@
+package com.amazonaws.secretsmanager.util;
+
+import com.amazonaws.client.builder.AwsClientBuilder;
+import com.amazonaws.secretsmanager.sql.AWSSecretsManagerDriver;
+import com.amazonaws.services.secretsmanager.AWSSecretsManagerClientBuilder;
+
+
+/**
+ * <p>
+ *  A class for providing JDBC driver the secrets cache builder.
+ *
+ * Checks the config file and environment variables for overrides to the default
+ * region and applies those changes to the provided secret cache builder.
+ * </p>
+ */
+public class JDBCSecretCacheBuilderProvider {
+
+    /**
+     * Configuration property to override PrivateLink DNS URL for Secrets Manager
+     */
+    static final String PROPERTY_VPC_ENDPOINT_URL = "vpcEndpointUrl";
+
+    static final String PROPERTY_VPC_ENDPOINT_REGION = "vpcEndpointRegion";
+
+    /**
+     * Configuration properties to override the default region
+     */
+    static final String PROPERTY_REGION = "region";
+
+    static final String REGION_ENVIRONMENT_VARIABLE = "AWS_SECRET_JDBC_REGION";
+
+
+    private Config configFile;
+
+
+    public JDBCSecretCacheBuilderProvider() {
+        this(Config.loadMainConfig());
+    }
+
+    public JDBCSecretCacheBuilderProvider(Config config) {
+        configFile = config;
+    }
+
+    /**
+     * Provides the secrets cache builder.
+     *
+     * 1) If a PrivateLink DNS endpoint URL and region are given in the Config, then they are used to configure the endpoint.
+     * 2) The AWS_SECRET_JDBC_REGION environment variable is checked. If set, it is used to configure the region.
+     * 3) The region variable file is checked in the provided Config and, if set, used to configure the region.
+     * 4) Finally, if none of these are not found, the default region provider chain is used.
+     *
+     * @return the built secret cache.
+     */
+    public AWSSecretsManagerClientBuilder build() {
+
+        AWSSecretsManagerClientBuilder builder = AWSSecretsManagerClientBuilder.standard();
+
+        //Retrieve data from information sources.
+        String vpcEndpointUrl = configFile.getStringPropertyWithDefault(AWSSecretsManagerDriver.PROPERTY_PREFIX+"."+PROPERTY_VPC_ENDPOINT_URL, null);
+        String vpcEndpointRegion = configFile.getStringPropertyWithDefault(AWSSecretsManagerDriver.PROPERTY_PREFIX+"."+PROPERTY_VPC_ENDPOINT_REGION, null);
+        String envRegion = System.getenv(REGION_ENVIRONMENT_VARIABLE);
+        String configRegion = configFile.getStringPropertyWithDefault(AWSSecretsManagerDriver.PROPERTY_PREFIX+"."+PROPERTY_REGION, null);
+
+
+        //Apply settings to our builder configuration.
+        if (vpcEndpointUrl != null && !vpcEndpointUrl.isEmpty() && vpcEndpointRegion != null && !vpcEndpointRegion.isEmpty()) {
+            builder.setEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(vpcEndpointUrl, vpcEndpointRegion));
+        } else if ( envRegion != null && !envRegion.isEmpty() ) {
+            builder.withRegion(envRegion);
+        } else if ( configRegion != null && !configRegion.isEmpty() ) {
+            builder.withRegion(configRegion);
+        }
+
+        return builder;
+    }
+}