Skip to content

Commit 8b5e6d2

Browse files
updated scripts to azureclicreds
1 parent 2cdbaf9 commit 8b5e6d2

File tree

4 files changed

+15
-14
lines changed

4 files changed

+15
-14
lines changed

infra/scripts/index_scripts/create_search_index.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import time
66

77
import pandas as pd
8-
from azure.identity import DefaultAzureCredential, get_bearer_token_provider
8+
from azure.identity import get_bearer_token_provider
9+
from azure.identity import AzureCliCredential
910
from azure.keyvault.secrets import SecretClient
1011
from azure.search.documents import SearchClient
1112
from azure.search.documents.indexes import SearchIndexClient
@@ -44,7 +45,7 @@
4445
"clienttranscripts/meeting_transcripts_metadata/transcripts_metadata.csv"
4546
)
4647

47-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
48+
credential = AzureCliCredential()
4849
token_provider = get_bearer_token_provider(
4950
credential,
5051
"https://cognitiveservices.azure.com/.default"

infra/scripts/index_scripts/create_sql_tables.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import pandas as pd
99
import pyodbc
10-
from azure.identity import DefaultAzureCredential
10+
from azure.identity import AzureCliCredential
1111
from azure.keyvault.secrets import SecretClient
1212

1313

1414
def get_secrets_from_kv(kv_name, secret_name):
1515
key_vault_name = kv_name # Set the name of the Azure Key Vault
16-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
16+
credential = AzureCliCredential() # Use Azure CLI Credential
1717
secret_client = SecretClient(
1818
vault_url=f"https://{key_vault_name}.vault.azure.net/", credential=credential
1919
) # Create a secret client object using the credential and Key Vault name
@@ -25,7 +25,7 @@ def get_secrets_from_kv(kv_name, secret_name):
2525
driver = "{ODBC Driver 18 for SQL Server}"
2626

2727

28-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
28+
credential = AzureCliCredential() # Use Azure CLI Credential
2929

3030
token_bytes = credential.get_token(
3131
"https://database.windows.net/.default"
@@ -45,7 +45,7 @@ def get_secrets_from_kv(kv_name, secret_name):
4545
from azure.storage.filedatalake import DataLakeServiceClient
4646

4747
account_name = get_secrets_from_kv(key_vault_name, "ADLS-ACCOUNT-NAME")
48-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
48+
credential = AzureCliCredential() # Use Azure CLI Credential
4949

5050
account_url = f"https://{account_name}.dfs.core.windows.net"
5151

infra/scripts/index_scripts/create_update_sql_dates.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
import pandas as pd
88
import pymssql
9-
from azure.identity import DefaultAzureCredential
9+
from azure.identity import AzureCliCredential
1010
from azure.keyvault.secrets import SecretClient
1111

1212

1313
def get_secrets_from_kv(kv_name, secret_name):
1414
key_vault_name = kv_name # Set the name of the Azure Key Vault
15-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
15+
credential = AzureCliCredential() # Use Azure CLI Credential
1616
secret_client = SecretClient(
1717
vault_url=f"https://{key_vault_name}.vault.azure.net/", credential=credential
1818
) # Create a secret client object using the credential and Key Vault name
@@ -30,7 +30,7 @@ def get_secrets_from_kv(kv_name, secret_name):
3030
from azure.storage.filedatalake import DataLakeServiceClient
3131

3232
account_name = get_secrets_from_kv(key_vault_name, "ADLS-ACCOUNT-NAME")
33-
credential = DefaultAzureCredential(managed_identity_client_id=managed_identity_client_id) # CodeQL [SM05139] Okay use of DefaultAzureCredential as it is only used in local environment.
33+
credential = AzureCliCredential() # Use Azure CLI Credential
3434

3535
account_url = f"https://{account_name}.dfs.core.windows.net"
3636

src/App/tests/backend/services/test_sqldb_service.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
@patch("backend.services.sqldb_service.pyodbc.connect") # Mock pyodbc.connect
1818
@patch(
1919
"backend.services.sqldb_service.get_azure_credential"
20-
) # Mock DefaultAzureCredential
20+
) # Mock AzureCliCredential
2121
def test_get_connection(mock_credential_class, mock_connect):
22-
# Mock the DefaultAzureCredential and get_token method
22+
# Mock the AzureCliCredential and get_token method
2323
mock_credential = MagicMock()
2424
mock_credential_class.return_value = mock_credential
2525
mock_token = MagicMock()
@@ -32,7 +32,7 @@ def test_get_connection(mock_credential_class, mock_connect):
3232
# Call the function
3333
conn = sql_db.get_connection()
3434

35-
# Assert that DefaultAzureCredential and get_token were called correctly
35+
# Assert that AzureCliCredential and get_token were called correctly
3636
mock_credential_class.assert_called_once_with(
3737
client_id=sql_db.mid_id
3838
)
@@ -60,9 +60,9 @@ def test_get_connection(mock_credential_class, mock_connect):
6060
@patch("backend.services.sqldb_service.pyodbc.connect") # Mock pyodbc.connect
6161
@patch(
6262
"backend.services.sqldb_service.get_azure_credential"
63-
) # Mock DefaultAzureCredential
63+
) # Mock AzureCliCredential
6464
def test_get_connection_token_failure(mock_credential_class, mock_connect):
65-
# Mock the DefaultAzureCredential and get_token method
65+
# Mock the AzureCliCredential and get_token method
6666
mock_credential = MagicMock()
6767
mock_credential_class.return_value = mock_credential
6868
mock_token = MagicMock()

0 commit comments

Comments
 (0)