Skip to content

Commit b0c6184

Browse files
authored
Merge pull request #298574 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents eacf719 + e58188d commit b0c6184

File tree

8 files changed

+51
-15
lines changed

8 files changed

+51
-15
lines changed

articles/azure-functions/functions-bindings-signalr-service-input.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The following table explains the properties of the `SignalRConnectionInfoInput`
149149
|**HubName**| Required. The hub name. |
150150
|**ConnectionStringSetting**| The name of the app setting or settings collection that contains the SignalR Service connection string, which defaults to `AzureSignalRConnectionString`. |
151151
|**UserId**| Optional. The user identifier of a SignalR connection. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
152-
|**IdToken**| Optional. A JWT token whose claims will be added to the user claims. It should be used together with **ClaimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
152+
|**IdToken**| Optional. A JWT whose claims will be added to the user claims. It should be used together with **ClaimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
153153
|**ClaimTypeList**| Optional. A list of claim types, which filter the claims in **IdToken** . |
154154

155155
# [In-process model](#tab/in-process)
@@ -161,7 +161,7 @@ The following table explains the properties of the `SignalRConnectionInfo` attri
161161
|**HubName**| Required. The hub name. |
162162
|**ConnectionStringSetting**| The name of the app setting or settings collection that contains the SignalR Service connection string, which defaults to `AzureSignalRConnectionString`. |
163163
|**UserId**| Optional. The user identifier of a SignalR connection. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
164-
|**IdToken**| Optional. A JWT token whose claims will be added to the user claims. It should be used together with **ClaimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
164+
|**IdToken**| Optional. A JWT whose claims will be added to the user claims. It should be used together with **ClaimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
165165
|**ClaimTypeList**| Optional. A list of claim types, which filter the claims in **IdToken** . |
166166

167167
---
@@ -179,7 +179,7 @@ The following table explains the supported settings for the `SignalRConnectionIn
179179
|**hubName**| Required. The hub name. |
180180
|**connectionStringSetting**| The name of the app setting or settings collection that contains the SignalR Service connection string, which defaults to `AzureSignalRConnectionString`. |
181181
|**userId**| Optional. The user identifier of a SignalR connection. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
182-
|**idToken**| Optional. A JWT token whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
182+
|**idToken**| Optional. A JWT whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
183183
|**claimTypeList**| Optional. A list of claim types, which filter the claims in **idToken** . |
184184

185185
::: zone-end
@@ -196,7 +196,7 @@ The following table explains the supported settings for the `SignalRConnectionIn
196196
|**hubName**| Required. The hub name. |
197197
|**connectionStringSetting**| The name of the app setting or settings collection that contains the SignalR Service connection string, which defaults to `AzureSignalRConnectionString`. |
198198
|**userId**| Optional. The user identifier of a SignalR connection. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
199-
|**idToken**| Optional. A JWT token whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
199+
|**idToken**| Optional. A JWT whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
200200
|**claimTypeList**| Optional. A list of claim types, which filter the claims in **idToken** . |
201201

202202
::: zone-end
@@ -213,7 +213,7 @@ The following table explains the binding configuration properties that you set i
213213
|**hubName**| Required. The hub name. |
214214
|**connectionStringSetting**| The name of the app setting or settings collection that contains the SignalR Service connection string, which defaults to `AzureSignalRConnectionString`. |
215215
|**userId**| Optional. The user identifier of a SignalR connection. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
216-
|**idToken**| Optional. A JWT token whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
216+
|**idToken**| Optional. A JWT whose claims will be added to the user claims. It should be used together with **claimTypeList**. You can use a [binding expression](#binding-expressions-for-http-trigger) to bind the value to an HTTP request header or query. |
217217
|**claimTypeList**| Optional. A list of claim types, which filter the claims in **idToken** . |
218218

219219
::: zone-end

articles/communication-services/how-tos/call-automation/includes/secure-webhook-endpoint-java.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ Each mid-call webhook callback sent by Call Automation uses a signed JSON Web To
3535
```
3636

3737
4. Configure your application to validate the JWT and the configuration of your Azure Communication Services resource. You need the `audience` values as it is present in the JWT payload.
38-
5. Validate the issuer, audience and the JWT token.
38+
5. Validate the issuer, audience and the JWT.
3939
- The audience is your Azure Communication Services resource ID you used to set up your Call Automation client. Refer [here](../../../quickstarts/voice-video-calling/get-resource-id.md) about how to get it.
40-
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT token. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
40+
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
4141

4242
This sample code demonstrates how to configure OIDC client to validate webhook payload using JWT
4343

articles/communication-services/how-tos/call-automation/includes/secure-webhook-endpoint-javascript.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ npm install express jwks-rsa jsonwebtoken
2626
```
2727

2828
3. Configure your application to validate the JWT and the configuration of your Azure Communication Services resource. You need the `audience` values as it is present in the JWT payload.
29-
4. Validate the issuer, audience and the JWT token.
29+
4. Validate the issuer, audience and the JWT.
3030
- The audience is your Azure Communication Services resource ID you used to set up your Call Automation client. Refer [here](../../../quickstarts/voice-video-calling/get-resource-id.md) about how to get it.
31-
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT token. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
31+
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
3232

3333
This sample code demonstrates how to configure OIDC client to validate webhook payload using JWT
3434

articles/communication-services/how-tos/call-automation/includes/secure-webhook-endpoint-python.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ pip install flask pyjwt
2525
```
2626

2727
3. Configure your application to validate the JWT and the configuration of your Azure Communication Services resource. You need the `audience` values as it is present in the JWT payload.
28-
4. Validate the issuer, audience and the JWT token.
28+
4. Validate the issuer, audience and the JWT.
2929
- The audience is your Azure Communication Services resource ID you used to set up your Call Automation client. Refer [here](../../../quickstarts/voice-video-calling/get-resource-id.md) about how to get it.
30-
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT token. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
30+
- The JSON Web Key Set (JWKS) endpoint in the OpenId configuration contains the keys used to validate the JWT. When the signature is valid and the token hasn't expired (within 5 minutes of generation), the client can use the token for authorization.
3131

3232
This sample code demonstrates how to configure OIDC client to validate webhook payload using JWT
3333

articles/confidential-computing/skr-flow-confidential-vm-sev-snp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ $cert | Format-List *
689689
# Subject : CN=vault.azure.net, O=Microsoft Corporation, L=Redmond, S=WA, C=US
690690
```
691691

692-
The response's JWT token body looks incredibly similar to the response that you get when invoking the `get` key operation. However, the `release` operation includes the `key_hsm` property, amongst other things.
692+
The response's JWT body looks incredibly similar to the response that you get when invoking the `get` key operation. However, the `release` operation includes the `key_hsm` property, amongst other things.
693693
694694
```json
695695
{

articles/healthcare-apis/fhir/customer-managed-keys.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Customer-managed keys (CMK) are encryption keys that you create and manage in yo
1717

1818
Follow security best practices and rotate keys often. Keys used with the FHIR service must be rotated manually. When you rotate a key, update the version of the existing key or set a new encryption key from a different storage location. Always make sure to keep existing keys enabled when adding new keys because they're still needed to access the data that was encrypted with them.
1919

20-
To rotate the key by generating a new version of the key, use the 'az keyvault key rotate' command. For more information, see [Azure key vault rotate command](/cli/azure/keyvault/key)
20+
To rotate the key by generating a new version of the key, use the 'az keyvault key rotate' command. For more information, see [Azure Key Vault rotate command](/cli/azure/keyvault/key).
2121

2222
## Update the FHIR service after changing a managed identity
2323

articles/role-based-access-control/permissions/ai-machine-learning.md

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2493,6 +2493,42 @@ Azure service: [Azure AI Search](/azure/search/)
24932493
> | Microsoft.Search/searchServices/indexes/documents/write | Upload documents to an index or modify existing documents. |
24942494
> | Microsoft.Search/searchServices/indexes/documents/delete | Delete documents from an index. |
24952495
2496+
2497+
## Microsoft.VideoIndexer
2498+
2499+
Extract the insights from your videos using Azure AI Video Indexer video and audio models.
2500+
2501+
Azure service: [Azure AI Video Indexer](/azure/azure-video-indexer/)
2502+
2503+
> [!div class="mx-tableFixed"]
2504+
> | Action | Description |
2505+
> | --- | --- |
2506+
> | Microsoft.VideoIndexer/register/action | Register the Microsoft.VideoIndexer |
2507+
> | Microsoft.VideoIndexer/unregister/action | Unregister the Microsoft.VideoIndexer |
2508+
> | Microsoft.VideoIndexer/checknameavailability/action | action checknameavailability |
2509+
> | Microsoft.VideoIndexer/accounts/generateAccessToken/action | Generate an Azure Video Indexer access token. |
2510+
> | Microsoft.VideoIndexer/accounts/generateRestrictedViewerAccessToken/action | Generate an Azure Video Indexer restricted viewer access token. |
2511+
> | Microsoft.VideoIndexer/accounts/generateExtensionAccessToken/action | Generate an Azure Video Indexer access token. |
2512+
> | Microsoft.VideoIndexer/accounts/generateExtensionRestrictedViewerAccessToken/action | Generate an Azure Video Indexer restricted viewer access token. |
2513+
> | Microsoft.VideoIndexer/accounts/read | List all Azure Video Indexer accounts available under the subscription |
2514+
> | Microsoft.VideoIndexer/accounts/read | List all Azure Video Indexer accounts available under the resource group |
2515+
> | Microsoft.VideoIndexer/accounts/read | Gets the properties of an Azure Video Indexer account. |
2516+
> | Microsoft.VideoIndexer/accounts/write | Creates or updates an Azure Video Indexer account. |
2517+
> | Microsoft.VideoIndexer/accounts/delete | Delete an Azure Video Indexer account. |
2518+
> | Microsoft.VideoIndexer/accounts/write | Updates the properties of an existing Azure Video Indexer account. |
2519+
> | Microsoft.VideoIndexer/accounts/PrivateEndpointConnectionsApproval/action | Approve Private Endpoint Connections on accounts |
2520+
> | Microsoft.VideoIndexer/accounts/privateEndpointConnections/read | List all private endpoint connections in a Video Indexer account. |
2521+
> | Microsoft.VideoIndexer/accounts/privateEndpointConnections/read | Get the specified private endpoint connection associated with the Video Indexer account. |
2522+
> | Microsoft.VideoIndexer/accounts/privateEndpointConnections/write | Update the state of specified private endpoint connection associated with the Video Indexer account. |
2523+
> | Microsoft.VideoIndexer/accounts/privateEndpointConnections/delete | Deletes the specified private endpoint connection associated with the Video Indexer account. |
2524+
> | Microsoft.VideoIndexer/accounts/privateLinkResources/read | List all private link resources in a Video Indexer account. |
2525+
> | Microsoft.VideoIndexer/accounts/privateLinkResources/read | Get the specified private link resource associated with the Video Indexer account. |
2526+
> | Microsoft.VideoIndexer/locations/classicAccounts/read | Gets the properties of an Azure Video Indexer Classic account. |
2527+
> | Microsoft.VideoIndexer/locations/operationstatuses/read | read operationstatuses |
2528+
> | Microsoft.VideoIndexer/locations/operationstatuses/write | write operationstatuses |
2529+
> | Microsoft.VideoIndexer/locations/userClassicAccounts/read | Lists all Azure Video Indexer classic accounts |
2530+
> | Microsoft.VideoIndexer/operations/read | read operations |
2531+
24962532
## Next steps
24972533

2498-
- [Azure resource providers and types](/azure/azure-resource-manager/management/resource-providers-and-types)
2534+
- [Azure resource providers and types](/azure/azure-resource-manager/management/resource-providers-and-types)

articles/virtual-network/ip-services/public-ip-upgrade-availability-set.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ If a migration fails due to a transient issue, such as a network outage or clien
8383
To recover from a failed upgrade, pass the recovery log file path to the script with the `-recoverFromFile` parameter and identify the Availability Set to recover with the `-AvailabilitySetName` parameter, as shown in this example.
8484

8585
```powershell
86-
Start-VMPublicIPUpgrade -RecoverFromFile ./AvSetPublicIPUpgrade_Recovery_2020-01-01-00-00.csv -AvailabilitySetName myAvSet -ResourceGroupName rg-myrg
86+
Start-AzAvSetPublicIPUpgrade -RecoverFromFile ./AvSetPublicIPUpgrade_Recovery_2020-01-01-00-00.csv -AvailabilitySetName myAvSet -ResourceGroupName rg-myrg
8787
```
8888

8989
## Common questions

0 commit comments

Comments
 (0)