Skip to content

Commit a01e04e

Browse files
committed
debug
1 parent fbdd2e8 commit a01e04e

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MSITest.java

+2
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,8 @@ public void registerAKVProvider() throws Exception {
466466

467467
Map<String, SQLServerColumnEncryptionKeyStoreProvider> map = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
468468
if (null != akvProviderManagedClientId) {
469+
System.out.println("ManagedIdentityCredential: registering akvProvider");
470+
469471
ManagedIdentityCredential credential = new ManagedIdentityCredentialBuilder()
470472
.clientId(akvProviderManagedClientId).build();
471473
akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(credential);

src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/MultiUserAKVTest.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,7 @@ public void cekCacheShouldBeDisabledWhenAkvProviderIsRegisteredGlobally() throws
260260

261261
@Test
262262
@Tag(Constants.reqExternalSetup)
263+
@Tag(Constants.requireSecret)
263264
public void testLocalCekCacheIsScopedToProvider() throws Exception {
264265
SQLServerColumnEncryptionAzureKeyVaultProvider provider = akvProvider;
265266

@@ -272,14 +273,13 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
272273
fail((new MessageFormat(TestResource.getResource("R_objectNullOrEmpty"))).format(msgArg));
273274
}
274275

275-
Map<String, SQLServerColumnEncryptionKeyStoreProvider> providerMap = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
276-
ManagedIdentityCredential credential;
276+
SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
277277

278278
SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
279+
Map<String, SQLServerColumnEncryptionKeyStoreProvider> providerMap = new HashMap<String, SQLServerColumnEncryptionKeyStoreProvider>();
279280
providerMap.put(Constants.AZURE_KEY_VAULT_NAME, akvProvider);
280281
SQLServerConnection.registerColumnEncryptionKeyStoreProviders(providerMap);
281282

282-
System.out.println("one");
283283
int customerId = 10;
284284
String customerName = "Microsoft";
285285
createTableForCustomProvider(AETestConnectionString, customProviderTableName, cekAkv);
@@ -303,7 +303,6 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
303303

304304
// Clean up global custom providers
305305
SQLServerConnection.unregisterColumnEncryptionKeyStoreProviders();
306-
System.out.println("two");
307306

308307
// Register key store provider on statement level
309308
providerMap.put(Constants.AZURE_KEY_VAULT_NAME, provider);
@@ -317,14 +316,12 @@ public void testLocalCekCacheIsScopedToProvider() throws Exception {
317316
assertTrue((customerId == intValue) && strValue.equalsIgnoreCase(customerName));
318317
}
319318
}
320-
System.out.println("three");
321319

322320
// Register invalid key store provider on statement level. This will overwrite the previous one.
323321
SQLServerColumnEncryptionAzureKeyVaultProvider providerWithBadCred = new SQLServerColumnEncryptionAzureKeyVaultProvider(
324322
"badApplicationID", "badApplicationKey");
325323
providerMap.put(Constants.AZURE_KEY_VAULT_NAME, providerWithBadCred);
326324
pstmt.registerColumnEncryptionKeyStoreProvidersOnStatement(providerMap);
327-
System.out.println("four");
328325

329326
// The following query should fail due to an empty cek cache and invalid credentials
330327
try (ResultSet rs3 = pstmt.executeQuery()) {

src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ public static void setup() throws Exception {
245245
}
246246

247247
if (null == akvProvider && null != akvProviderManagedClientId) {
248+
System.out.println("akvProviderManagedClientId="+akvProviderManagedClientId);
248249
ManagedIdentityCredential credential = new ManagedIdentityCredentialBuilder()
249250
.clientId(akvProviderManagedClientId).build();
250251
akvProvider = new SQLServerColumnEncryptionAzureKeyVaultProvider(credential);

0 commit comments

Comments
 (0)