Allow user to set serverless properties useful for NLB case

aws · Jun 3, 2022 · 3e71874 · 3e71874
1 parent e080dd6
commit 3e71874
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/src/main/java/com/amazon/redshift/Driver.java b/src/main/java/com/amazon/redshift/Driver.java
@@ -671,8 +671,8 @@ public static Properties parseURL(String url, Properties defaults) {
           	if(awsRegion == null || awsRegion.length() == 0)
           	  urlProps.setProperty(RedshiftProperty.AWS_REGION.getName(), region);
 
-          	urlProps.setProperty(RedshiftConnectionImpl.IS_SERVERLESS,"true");
-          	urlProps.setProperty(RedshiftConnectionImpl.SERVERLESS_ACCT_ID,acctId);
+          	urlProps.setProperty(RedshiftProperty.IS_SERVERLESS.getName(),"true");
+          	urlProps.setProperty(RedshiftProperty.SERVERLESS_ACCT_ID.getName(),acctId);
           }
 
         }

diff --git a/src/main/java/com/amazon/redshift/RedshiftProperty.java b/src/main/java/com/amazon/redshift/RedshiftProperty.java
@@ -1028,6 +1028,27 @@ public enum RedshiftProperty {
            null,
            "The name of the Redshift Native Auth Provider"),
 
+  /**
+   * Set true when end point host is for serverless.
+   * Driver auto detect from the given host.
+   * For NLB, it won't so user can set explicitly.
+   * Default value is false.
+   */
+  IS_SERVERLESS("isServerless",
+                    "false",
+                    "Redshift end-point is serverless or provisional."),
+
+  /**
+   * The account ID of the serverless.
+   * Driver auto detect from the given host.
+   * For NLB, it won't so user can set explicitly.
+   * Default value is null.
+   * 
+   */
+  SERVERLESS_ACCT_ID("serverlessAcctId",
+           null,
+           "The account ID of the serverless"),
+
   ;
 
   private final String name;

diff --git a/src/main/java/com/amazon/redshift/core/IamHelper.java b/src/main/java/com/amazon/redshift/core/IamHelper.java
@@ -109,13 +109,13 @@ public static Properties setIAMProperties(Properties info, RedshiftJDBCSettings
 
       String authProfile = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.AUTH_PROFILE.getName(), info);
 
-      String isServerless = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftConnectionImpl.IS_SERVERLESS, info);
+      String isServerless = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.IS_SERVERLESS.getName(), info);
       settings.m_isServerless = isServerless == null ? false : Boolean.valueOf(isServerless);
 
       String clusterId = (!settings.m_isServerless)
           ? RedshiftConnectionImpl.getRequiredConnSetting(RedshiftProperty.CLUSTER_IDENTIFIER.getName(), info) : null;
       String acctId = (settings.m_isServerless)
-          ? RedshiftConnectionImpl.getOptionalConnSetting(RedshiftConnectionImpl.SERVERLESS_ACCT_ID, info) : null;
+          ? RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.SERVERLESS_ACCT_ID.getName(), info) : null;
       String awsRegion = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.AWS_REGION.getName(), info);
       String endpointUrl = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.ENDPOINT_URL.getName(), info);
       String stsEndpointUrl = RedshiftConnectionImpl.getOptionalConnSetting(RedshiftProperty.STS_ENDPOINT_URL.getName(),

diff --git a/src/main/java/com/amazon/redshift/jdbc/RedshiftConnectionImpl.java b/src/main/java/com/amazon/redshift/jdbc/RedshiftConnectionImpl.java
@@ -90,8 +90,6 @@ public class RedshiftConnectionImpl implements BaseConnection {
   private static final SQLPermission SQL_PERMISSION_NETWORK_TIMEOUT = new SQLPermission("setNetworkTimeout");
 
   // Internal properties
-  public static final String IS_SERVERLESS = "isServerless";
-  public static final String SERVERLESS_ACCT_ID = "serverlessAcctId";
 
   private enum ReadOnlyBehavior {
     ignore,