test fix

public/app/plugins/datasource/mssql/azureauth/AzureAuth.test.ts

@@ -118,7 +118,7 @@ describe('AzureAuth', () => {
       });
     });
 
-    describe('updateDatasourceCredentials()', () => {
+    describe('updateCredentials()', () => {
       it('should update the credentials for managed service identity correctly', () => {
         // If `dataSourceSettings.authType === 'msi'` && `config.azure.managedIdentityEnabled === true`.
         jest.mocked(config).azure.managedIdentityEnabled = true;
@@ -159,12 +159,12 @@ describe('AzureAuth', () => {
           dataSourceSettingsWithClientSecretOnServer,
           basicClientSecretCredentials
         );
-        expect(resultForClientSecretCredentials1).toEqual({
+
-          jsonData: {
+        expect(resultForClientSecretCredentials1.jsonData.azureCredentials).toEqual(basicClientSecretCredentials);
-            azureCredentials: { ...basicClientSecretCredentials },
+        expect(resultForClientSecretCredentials1.secureJsonData).toEqual({ azureClientSecret: undefined });
-          },
+        expect(resultForClientSecretCredentials1.secureJsonFields).toEqual({
-          secureJsonData: { azureClientSecret: undefined },
+          azureClientSecret: false,
-          secureJsonFields: { azureClientSecret: false },
+          clientSecret: false,
         });
 
         // If `dataSourceSettings.authType === 'clientsecret'` && `secureJsonFields.azureClientSecret == false`.
@@ -174,12 +174,14 @@ describe('AzureAuth', () => {
           dataSourceSettingsWithClientSecretInSecureJSONData,
           { ...basicClientSecretCredentials, clientSecret: 'XXXX-super-secret-secret-XXXX' }
         );
-        expect(resultForClientSecretCredentials2).toEqual({
+
-          jsonData: {
+        expect(resultForClientSecretCredentials2.jsonData.azureCredentials).toEqual(basicClientSecretCredentials);
-            azureCredentials: { ...basicClientSecretCredentials },
+        expect(resultForClientSecretCredentials2.secureJsonData).toEqual({
-          },
+          azureClientSecret: 'XXXX-super-secret-secret-XXXX',
-          secureJsonData: { azureClientSecret: 'XXXX-super-secret-secret-XXXX' },
+        });
-          secureJsonFields: { azureClientSecret: false },
+        expect(resultForClientSecretCredentials2.secureJsonFields).toEqual({
+          azureClientSecret: false,
+          clientSecret: false,
         });
       });
     });

public/app/plugins/datasource/mssql/azureauth/AzureAuth.testMocks.ts

@@ -28,12 +28,16 @@ export const dataSourceSettingsWithMsiCredentials: Partial<AzureDataSourceSettin
 
 // Will return symbol as the secret is concealed
 export const dataSourceSettingsWithClientSecretOnServer: Partial<AzureDataSourceSettings> = {
-  jsonData: { azureCredentials: { authType: 'clientsecret', clientId: 'testClientId', tenantId: 'testTenantId' } },
+  jsonData: {
+    azureCredentials: { authType: 'clientsecret', clientId: 'XXXX-client-id-XXXX', tenantId: 'XXXX-tenant-id-XXXX' },
+  },
   secureJsonFields: { azureClientSecret: true },
 };
 // Will return the secret as a string from the secureJsonData
 export const dataSourceSettingsWithClientSecretInSecureJSONData: Partial<AzureDataSourceSettings> = {
-  jsonData: { azureCredentials: { authType: 'clientsecret', clientId: 'testClientId', tenantId: 'testTenantId' } },
+  jsonData: {
+    azureCredentials: { authType: 'clientsecret', clientId: 'XXXX-client-id-XXXX', tenantId: 'XXXX-tenant-id-XXXX' },
+  },
   secureJsonFields: { azureClientSecret: false },
-  secureJsonData: { azureClientSecret: 'testClientSecret' },
+  secureJsonData: { azureClientSecret: 'XXXX-super-secret-secret-XXXX' },
 };