Skip to content

Commit a712373

Browse files
fix: Modified the code for default azure credential
1 parent 5e488d9 commit a712373

File tree

8 files changed

+16
-8
lines changed

8 files changed

+16
-8
lines changed

Services/src/esg-ai-doc-analysis/CFS.SK.Sustainability.AI/Services/Queue/AzureStorageQueueService.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ public static Uri GetQueueUriFromConnectionString(string connectionString, strin
8484

8585
public AzureStorageQueueService(Uri storageQueueUri, ILogger<AzureStorageQueueService> log)
8686
{
87-
this._clientBuilder = queueName => new QueueClient(storageQueueUri, new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName));
87+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
88+
this._clientBuilder = queueName => new QueueClient(storageQueueUri, credential);
8889
this._log = log;
8990
}
9091

Services/src/esg-ai-doc-analysis/CFS.SK.Sustainability.AI/Utils/StorageAccessUtil.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ static public BlobServiceClient GetBlobClientFromConnectionString(string Connect
1616
var DefaultEndpointSuffix = "core.windows.net";
1717
var storageAccountName = ConnectionString.Split(';').FirstOrDefault(x => x.Contains("AccountName")).Split('=')[1];
1818
var storageAccountUri = new Uri($"https://{storageAccountName}.blob.{DefaultEndpointSuffix}");
19-
return new BlobServiceClient(storageAccountUri, new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName));
19+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
20+
return new BlobServiceClient(storageAccountUri, credential);
2021
}
2122

2223
static public Stream GetReportResultBlob(string FileName, string ConnectionString)

Services/src/kernel-memory/extensions/AzureAIDocIntel/AzureAIDocIntelEngine.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public AzureAIDocIntelEngine(
3636
switch (config.Auth)
3737
{
3838
case AzureAIDocIntelConfig.AuthTypes.AzureIdentity:
39-
this._recognizerClient = new DocumentAnalysisClient(new Uri(config.Endpoint), new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName));
39+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
40+
this._recognizerClient = new DocumentAnalysisClient(new Uri(config.Endpoint), credential);
4041
break;
4142

4243
case AzureAIDocIntelConfig.AuthTypes.APIKey:

Services/src/kernel-memory/extensions/AzureAISearch/AzureAISearch/AzureAISearchMemory.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ public AzureAISearchMemory(
6767
switch (config.Auth)
6868
{
6969
case AzureAISearchConfig.AuthTypes.AzureIdentity:
70+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
7071
this._adminClient = new SearchIndexClient(
7172
new Uri(config.Endpoint),
72-
new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName),
73+
credential,
7374
GetClientOptions());
7475
break;
7576

Services/src/kernel-memory/extensions/AzureBlobs/AzureBlobsStorage.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ public AzureBlobsStorage(
5555
{
5656
this.ValidateAccountName(config.Account);
5757
var suffix = this.ValidateEndpointSuffix(config.EndpointSuffix);
58-
client = new BlobServiceClient(new Uri($"https://{config.Account}.blob.{suffix}"), new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName));
58+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
59+
client = new BlobServiceClient(new Uri($"https://{config.Account}.blob.{suffix}"), credential);
5960
break;
6061
}
6162

Services/src/kernel-memory/extensions/AzureOpenAI/AzureOpenAITextEmbeddingGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,12 @@ public AzureOpenAITextEmbeddingGenerator(
7171
switch (config.Auth)
7272
{
7373
case AzureOpenAIConfig.AuthTypes.AzureIdentity:
74+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
7475
this._client = new AzureOpenAITextEmbeddingGenerationService(
7576
deploymentName: config.Deployment,
7677
modelId: config.Deployment,
7778
endpoint: config.Endpoint,
78-
credential: new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName),
79+
credential: credential,
7980
httpClient: httpClient);
8081
break;
8182

Services/src/kernel-memory/extensions/AzureOpenAI/AzureOpenAITextGenerator.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@ public AzureOpenAITextGenerator(
114114
switch (config.Auth)
115115
{
116116
case AzureOpenAIConfig.AuthTypes.AzureIdentity:
117-
this._client = new OpenAIClient(new Uri(config.Endpoint), new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName), options);
117+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
118+
this._client = new OpenAIClient(new Uri(config.Endpoint), credential, options);
118119
break;
119120

120121
case AzureOpenAIConfig.AuthTypes.ManualTokenCredential:

Services/src/kernel-memory/extensions/AzureQueues/AzureQueuesPipeline.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,10 @@ public AzureQueuesPipeline(
100100

101101
case AzureQueuesConfig.AuthTypes.AzureIdentity:
102102
{
103+
DefaultAzureCredential credential = new(DefaultAzureCredential.DefaultEnvironmentVariableName);
103104
this.ValidateAccountName(config.Account);
104105
var suffix = this.ValidateEndpointSuffix(config.EndpointSuffix);
105-
this._clientBuilder = queueName => new QueueClient(new($"https://{config.Account}.queue.{suffix}/{queueName}"), new DefaultAzureCredential(DefaultAzureCredential.DefaultEnvironmentVariableName));
106+
this._clientBuilder = queueName => new QueueClient(new($"https://{config.Account}.queue.{suffix}/{queueName}"), credential);
106107
break;
107108
}
108109

0 commit comments

Comments
 (0)