Always Encrypted Usability Modifications

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java

@@ -820,4 +820,28 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return msiClientId property value
      */
     public String getMSIClientId();
+
+    /**
+     * Sets the Azure Key Vault (AKV) Provider Client Id to provided value to be used for column encryption.
+     * 
+     * @param keyVaultProviderClientId
+     *        Client Id of Azure Key Vault (AKV) Provider to be used for column encryption.
+     */
+    public void setKeyVaultProviderClientId(String keyVaultProviderClientId);
+
+    /**
+     * Returns the value for the connection property 'keyVaultProviderClientId'.
+     * 
+     * @return keyVaultProviderClientId
+     */
+    public String getKeyVaultProviderClientId();
+
+    /**
+     * Sets the Azure Key Vault (AKV) Provider Client Key to provided value to be used for column encryption.
+     * 
+     * @param keyVaultProviderClientKey
+     *        Client Key of Azure Key Vault (AKV) Provider to be used for column encryption.
+     */
+    public void setKeyVaultProviderClientKey(String keyVaultProviderClientKey);
+
 }

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerConnection.java

@@ -1441,6 +1441,24 @@ Connection connectInternal(Properties propsIn,
 
             registerKeyStoreProviderOnConnection(keyStoreAuthentication, keyStoreSecret, keyStoreLocation);
 
+            if (null == globalCustomColumnEncryptionKeyStoreProviders) {
+                sPropKey = SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.toString();
+                sPropValue = activeConnectionProperties.getProperty(sPropKey);
+                if (null != sPropValue) {
+                    String keyVaultColumnEncryptionProviderClientId = sPropValue;
+                    sPropKey = SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_KEY.toString();
+                    sPropValue = activeConnectionProperties.getProperty(sPropKey);
+                    if (null != sPropValue) {
+                        String keyVaultColumnEncryptionProviderClientKey = sPropValue;
+                        SQLServerColumnEncryptionAzureKeyVaultProvider akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(
+                                keyVaultColumnEncryptionProviderClientId, keyVaultColumnEncryptionProviderClientKey);
+                        Map<String, SQLServerColumnEncryptionKeyStoreProvider> keyStoreMap = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
+                        keyStoreMap.put(akvProvider.getName(), akvProvider);
+                        registerColumnEncryptionKeyStoreProviders(keyStoreMap);
+                    }
+                }
+            }
+
             sPropKey = SQLServerDriverBooleanProperty.MULTI_SUBNET_FAILOVER.toString();
             sPropValue = activeConnectionProperties.getProperty(sPropKey);
             if (sPropValue == null) {

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDataSource.java

@@ -877,6 +877,24 @@ public String getMSIClientId() {
                 SQLServerDriverStringProperty.MSI_CLIENT_ID.getDefaultValue());
     }
 
+    @Override
+    public void setKeyVaultProviderClientId(String keyVaultProviderClientId) {
+        setStringProperty(connectionProps, SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.toString(),
+                keyVaultProviderClientId);
+    }
+
+    @Override
+    public String getKeyVaultProviderClientId() {
+        return getStringProperty(connectionProps, SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.toString(),
+                SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.getDefaultValue());
+    }
+
+    @Override
+    public void setKeyVaultProviderClientKey(String keyVaultProviderClientKey) {
+        setStringProperty(connectionProps, SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_KEY.toString(),
+                keyVaultProviderClientKey);
+    }
+
     /**
      * Sets a property string value.
      * 

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerDriver.java

@@ -286,7 +286,9 @@ enum SQLServerDriverStringProperty {
     KEY_STORE_SECRET("keyStoreSecret", ""),
     KEY_STORE_LOCATION("keyStoreLocation", ""),
     SSL_PROTOCOL("sslProtocol", SSLProtocol.TLS.toString()),
-    MSI_CLIENT_ID("msiClientId", ""),;
+    MSI_CLIENT_ID("msiClientId", ""),
+    KEY_VAULT_PROVIDER_CLIENT_ID("keyVaultProviderClientId", ""),
+    KEY_VAULT_PROVIDER_CLIENT_KEY("keyVaultProviderClientKey", "");
 
     private final String name;
     private final String defaultValue;
@@ -516,7 +518,11 @@ public final class SQLServerDriver implements java.sql.Driver {
                     Boolean.toString(SQLServerDriverBooleanProperty.USE_BULK_COPY_FOR_BATCH_INSERT.getDefaultValue()),
                     false, TRUE_FALSE),
             new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.MSI_CLIENT_ID.toString(),
-                    SQLServerDriverStringProperty.MSI_CLIENT_ID.getDefaultValue(), false, null),};
+                    SQLServerDriverStringProperty.MSI_CLIENT_ID.getDefaultValue(), false, null),
+            new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.toString(),
+                    SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_ID.getDefaultValue(), false, null),
+            new SQLServerDriverPropertyInfo(SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_KEY.toString(),
+                    SQLServerDriverStringProperty.KEY_VAULT_PROVIDER_CLIENT_KEY.getDefaultValue(), false, null)};
 
     /**
      * Properties that can only be set by using Properties. Cannot set in connection string

src/main/java/com/microsoft/sqlserver/jdbc/SQLServerResource.java

@@ -540,6 +540,10 @@ protected Object[][] getContents() {
             {"R_illegalWKT", "Illegal Well-Known text. Please make sure Well-Known text is valid."},
             {"R_illegalTypeForGeometry", "{0} is not supported for Geometry."},
             {"R_illegalWKTposition", "Illegal character in Well-Known text at position {0}."},
+            {"R_keyVaultProviderClientIdPropertyDescription",
+                    "The client ID used to access the Key Vault where the column encryption master key is stored."},
+            {"R_keyVaultProviderClientKeyPropertyDescription",
+                    "The client key used to access the Key Vault where the column encryption master key is stored."},
             {"R_ADALMissing", "Failed to load ADAL4J Java library for performing {0} authentication."},
             {"R_DLLandADALMissing",
                     "Failed to load both sqljdbc_auth.dll and ADAL4J Java library for performing {0} authentication. Please install one of them to proceed."},