update

microsoft · Feb 22, 2025 · e2a5a36 · e2a5a36
1 parent 35d59e3
commit e2a5a36
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java
@@ -272,11 +272,10 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
             fail((new MessageFormat(TestResource.getResource("R_objectNullOrEmpty"))).format(msgArg));
         }
 
-        SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
         Map<String, SQLServerColumnEncryptionKeyStoreProvider> providerMap = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
-        ManagedIdentityCredential credential = new ManagedIdentityCredentialBuilder()
-                .clientId(akvProviderManagedClientId).build();
-        akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(credential);
+        ManagedIdentityCredential credential;
+
+        SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
         providerMap.put(Constants.AZURE_KEY_VAULT_NAME, akvProvider);
         SQLServerConnection.registerColumnEncryptionKeyStoreProviders(providerMap);
 
@@ -306,9 +305,6 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
             SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
             System.out.println("two");
 
-            credential = new ManagedIdentityCredentialBuilder().clientId(akvProviderManagedClientId).build();
-            akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(credential);
-
             // Register key store provider on statement level
             providerMap.put(Constants.AZURE_KEY_VAULT_NAME, provider);
             pstmt.registerColumnEncryptionKeyStoreProvidersOnStatement(providerMap);
@@ -326,9 +322,6 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
             // Register invalid key store provider on statement level. This will overwrite the previous one.
             SQLServerColumnEncryptionAzureKeyVaultProvider providerWithBadCred = new SQLServerColumnEncryptionAzureKeyVaultProvider(
                     "badApplicationID", "badApplicationKey");
-            credential = new ManagedIdentityCredentialBuilder().clientId(akvProviderManagedClientId).build();
-            akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(credential);
-
             providerMap.put(Constants.AZURE_KEY_VAULT_NAME, providerWithBadCred);
             pstmt.registerColumnEncryptionKeyStoreProvidersOnStatement(providerMap);
             System.out.println("four");

diff --git a/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java b/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
@@ -168,7 +168,7 @@ public static void setup() throws Exception {
         applicationClientID = getConfiguredProperty("applicationClientID");
         applicationKey = getConfiguredProperty("applicationKey");
 
-        akvProviderManagedClientId = getConfiguredProperty("akvProviderManagedClientId");
+        akvProviderManagedClientId = getConfiguredProperty("jdbc-akvProviderManagedClientId");
 
         tenantID = getConfiguredProperty("tenantID");
         servicePrincipalCertificateApplicationClientId = getConfiguredProperty(