Skip to content

Commit f1cb5e2

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-roles-refactor
2 parents bf63f24 + f409d8a commit f1cb5e2

File tree

2 files changed

+23
-11
lines changed

2 files changed

+23
-11
lines changed

articles/azure-app-configuration/howto-integrate-azure-managed-service-identity.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,16 @@ To set up a managed identity in the portal, you first create an application and
140140
.ConfigureAppConfiguration((hostingContext, config) =>
141141
{
142142
var settings = config.Build();
143-
AzureServiceTokenProvider azureServiceTokenProvider = new AzureServiceTokenProvider();
144-
KeyVaultClient kvClient = new KeyVaultClient(new KeyVaultClient.AuthenticationCallback(azureServiceTokenProvider.KeyVaultTokenCallback));
145-
146-
config.AddAzureAppConfiguration(options => options.Connect(new Uri(settings["AppConfig:Endpoint"]), new ManagedIdentityCredential()).UseAzureKeyVault(kvClient));
143+
var credentials = new ManagedIdentityCredential();
144+
145+
config.AddAzureAppConfiguration(options =>
146+
{
147+
options.Connect(new Uri(settings["AppConfig:Endpoint"]), credentials)
148+
.ConfigureKeyVault(kv =>
149+
{
150+
kv.SetCredential(credentials);
151+
});
152+
});
147153
})
148154
.UseStartup<Startup>();
149155
```
@@ -155,12 +161,18 @@ To set up a managed identity in the portal, you first create an application and
155161
Host.CreateDefaultBuilder(args)
156162
.ConfigureWebHostDefaults(webBuilder =>
157163
webBuilder.ConfigureAppConfiguration((hostingContext, config) =>
158-
{
159-
var settings = config.Build();
160-
AzureServiceTokenProvider azureServiceTokenProvider = new AzureServiceTokenProvider();
161-
KeyVaultClient kvClient = new KeyVaultClient(new KeyVaultClient.AuthenticationCallback(azureServiceTokenProvider.KeyVaultTokenCallback));
162-
163-
config.AddAzureAppConfiguration(options => options.Connect(new Uri(settings["AppConfig:Endpoint"]), new ManagedIdentityCredential()).UseAzureKeyVault(kvClient));
164+
{
165+
var settings = config.Build();
166+
var credentials = new ManagedIdentityCredential();
167+
168+
config.AddAzureAppConfiguration(options =>
169+
{
170+
options.Connect(new Uri(settings["AppConfig:Endpoint"]), credentials)
171+
.ConfigureKeyVault(kv =>
172+
{
173+
kv.SetCredential(credentials);
174+
});
175+
});
164176
})
165177
.UseStartup<Startup>());
166178
```

articles/cognitive-services/Bing-Web-Search/includes/quickstarts/web-search-client-library-python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.author: aahi
1212

1313
The Bing Web Search client library makes it easy to integrate Bing Web Search into your Python application. In this quickstart, you'll learn how to send a request, receive a JSON response, and filter and parse the results.
1414

15-
Want to see the code right now? Samples for the [Bing Search client libraries for JavaScript](https://github.com/Azure-Samples/cognitive-services-python-sdk-samples/tree/master/samples/search) are available on GitHub.
15+
Want to see the code right now? Samples for the [Bing Search client libraries for Python](https://github.com/Azure-Samples/cognitive-services-python-sdk-samples/tree/master/samples/search) are available on GitHub.
1616

1717

1818
## Prerequisites

0 commit comments

Comments
 (0)