Skip to content

Commit d5a1eb6

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into waf-jsc
2 parents 6ebecef + 1084722 commit d5a1eb6

File tree

260 files changed

+7899
-1456
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+7899
-1456
lines changed

articles/active-directory-b2c/string-transformations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ The following example generates an error message when an account is already in t
446446
</Localization>
447447
```
448448

449-
The claims transformation creates a response message based on the localized string. The message contains the user's email address embedded into the localized sting *ResponseMessage_EmailExists*.
449+
The claims transformation creates a response message based on the localized string. The message contains the user's email address embedded into the localized string *ResponseMessage_EmailExists*.
450450

451451
```xml
452452
<ClaimsTransformation Id="SetResponseMessageForEmailAlreadyExists" TransformationMethod="FormatLocalizedString">

articles/api-management/applications.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: Protect Access to Product APIs with Microsoft Entra Application - Azure API Management
2+
title: Securely Access Products and APIs - Microsoft Entra Applications - Azure API Management
33
titleSuffix: Azure API Management
44
description: Configure OAuth 2.0 access to product APIs in Azure API Management with Microsoft Entra ID applications.
55
services: api-management
@@ -11,7 +11,7 @@ ms.date: 05/19/2025
1111
ms.author: danlep
1212
ms.custom:
1313
---
14-
# Secure product API access with Microsoft Entra applications
14+
# Securely access products and APIs with Microsoft Entra applications
1515

1616
[!INCLUDE [api-management-availability-premium-dev-standard-basic](../../includes/api-management-availability-premium-dev-standard-basic.md)]
1717

@@ -64,14 +64,14 @@ The following example uses the **Starter** product, but choose any published pro
6464
1. In the left menu, under **APIs**, select **Products**.
6565
1. Choose the product that you want to configure, such as the **Starter** product.
6666
1. In the left menu, under **Product**, select **Properties**.
67-
1. Enable the **Application based access** setting.
68-
1. Optionally, enable the **Requires subscription** setting. If you enable both application based access and a subscription requirement, the API Management gateway can accept either OAuth 2.0 authorization or a subscription key for access to the product's APIs.
67+
1. In the **Application based access** section, enable the **OAuth 2.0 token (most secure)** setting.
68+
1. Optionally, enable the **Subscription key** setting. If you enable both application based access and a subscription requirement, the API Management gateway can accept either an OAuth 2.0 token or a subscription key for access to the product's APIs.
6969
1. Select **Save**.
7070

7171
:::image type="content" source="media/applications/enable-application-based-access.png" alt-text="Screenshot of enabling application based access in the portal.":::
7272

7373
> [!TIP]
74-
> You can also enable the **Application based access** setting when creating a new product.
74+
> You can also enable the **OAuth 2.0 token** setting when creating a new product.
7575
7676
Enabling application based access creates a backend enterprise application in Microsoft Entra ID to represent the product. The backend application ID is displayed in the product's **Properties** page.
7777

42.4 KB
Loading
9.03 KB
Loading

articles/api-management/sap-api.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ Choose one of the following methods to import your API to API Management:
116116
|---------|---------|
117117
|`HEAD /` | Enables the client to exchange cross-site request forgery (CSRF) tokens with the SAP server when required.<br/><br/>SAP also allows CSRF token exchange via the GET verb.<br/><br/> CSRF token exchange isn’t covered in this article. See an [example API Management policy snippet](https://github.com/Azure/api-management-policy-snippets/blob/master/examples/Get%20X-CSRF%20token%20from%20SAP%20gateway%20using%20send%20request.policy.xml) to broker token exchange. |
118118

119-
:::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Sceenshot that shows the operation for fetching tokens.":::
119+
:::image type="content" source="media/sap-api/head-root-operation.png" alt-text="Screenshot that shows the operation for fetching tokens.":::
120120

121121
- `GET /`
122122

articles/app-service/app-service-key-vault-references.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ If the secret version isn't specified in the reference, the app uses the latest
9595

9696
The delay is because App Service caches the values of the Key Vault references and refetches them every 24 hours. Any configuration change to the app causes an app restart and an immediate refetch of all referenced secrets.
9797

98+
To force resolution of your app's Key Vault references, make an authenticated POST request to the API endpoint `https://management.azure.com/[Resource ID]/config/configreferences/appsettings/refresh?api-version=2022-03-01`.
99+
98100
## <a name = "source-app-settings-from-key-vault"></a> Understand source app settings from Key Vault
99101

100102
To use a Key Vault reference, set the reference as the value of the setting. Your app can reference the secret through its key as normal. No code changes are required.

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-azure-portal-pivot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For more information about containerized applications in a serverless environmen
1515
## Prerequisites
1616

1717
- An [Azure account](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension)
18-
- An [Azure container registry](/azure/container-registry/container-registry-get-started-portal)
18+
- An [Azure Container Registry](/azure/container-registry/container-registry-get-started-portal)
1919
- [Azure CLI](/cli/azure/install-azure-cli)
2020
- [Docker](https://www.docker.com/community-edition)
2121

@@ -91,7 +91,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
9191

9292
1. At the top of the page, select the **Container** tab.
9393

94-
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry**. Under **Azure container registry options**, set the following values:
94+
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry**. Under **Azure Container Registry options**, set the following values:
9595

9696
- **Registry**: Select your Azure Container Registry.
9797
- **Image**: Select **dotnetcore-docs-hello-world-linux**.

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-visual-studio-code-pivot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ This quickstart uses Azure Container Registry as the registry. You can use other
2727
Create a container registry by following the instructions in [Quickstart: Create a private container registry using the Azure portal](/azure/container-registry/container-registry-get-started-portal).
2828

2929
> [!IMPORTANT]
30-
> Be sure to set the **Admin User** option to **Enable** when you create the Azure container registry. You can also set it from the **Access keys** section of your registry page in the Azure portal. This setting is required for App Service access. For managed identity, see [Deploy from ACR tutorial](../../tutorial-custom-container.md?pivots=container-linux#vi-configure-the-web-app).
30+
> Be sure to set the **Admin User** option to **Enable** when you create the Azure Container Registry. You can also set it from the **Access keys** section of your registry page in the Azure portal. This setting is required for App Service access. For managed identity, see [Deploy from ACR tutorial](../../tutorial-custom-container.md?pivots=container-linux#vi-configure-the-web-app).
3131
3232
## Sign in
3333

@@ -132,7 +132,7 @@ docker --version
132132
1. Make sure the image tag begins with `<acr-name>.azurecr.io` and press **Enter**.
133133
1. When Visual Studio Code finishes pushing the image to your container registry, select **Refresh** at the top of the **REGISTRIES** explorer and verify that the image is pushed successfully.
134134

135-
:::image type="content" source="../../media/quickstart-docker/image-in-registry.png" alt-text="Screenshot shows the image deployed to Azure container registry.":::
135+
:::image type="content" source="../../media/quickstart-docker/image-in-registry.png" alt-text="Screenshot shows the image deployed to Azure Container Registry.":::
136136

137137
## Deploy to App Service
138138

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This quickstart shows you how to deploy an ASP.NET app in a Windows image from A
1414
## Prerequisites
1515

1616
- An [Azure account](https://azure.microsoft.com/free/?utm_source=campaign&utm_campaign=vscode-tutorial-docker-extension&mktingSource=vscode-tutorial-docker-extension)
17-
- An [Azure container registry](/azure/container-registry/container-registry-get-started-portal)
17+
- An [Azure Container Registry](/azure/container-registry/container-registry-get-started-portal)
1818
- [Azure CLI](/cli/azure/install-azure-cli)
1919
- [Install Docker for Windows](https://docs.docker.com/docker-for-windows/install/)
2020
- [Switch Docker to run Windows containers](/virtualization/windowscontainers/quick-start/quick-start-windows-10)
@@ -94,7 +94,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
9494
9595
1. At the top of the page, select the **Container** tab.
9696
97-
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry** . Under **Azure container registry options**, set the following values:
97+
1. In the **Container** tab, for **Image Source**, select **Azure Container Registry** . Under **Azure Container Registry options**, set the following values:
9898
9999
- **Registry**: Select your Azure Container Registry.
100100
- **Image**: Select **dotnetcore-docs-hello-world-linux**.
@@ -137,7 +137,7 @@ The App Service app pulls from the container registry each time it starts. If yo
137137
- [Secure with custom domain and certificate](../../tutorial-secure-domain-certificate.md)
138138
- [Integrate your app with an Azure virtual network](../../overview-vnet-integration.md)
139139
- [Use Private Endpoints for App Service apps](../../networking/private-endpoint.md)
140-
- [Use Azure container registry with Private Link](/azure/container-registry/container-registry-private-link)
140+
- [Use Azure Container Registry with Private Link](/azure/container-registry/container-registry-private-link)
141141
- [Migrate to Windows container in Azure](../../tutorial-custom-container.md)
142142
- [Deploy a container with Azure Pipelines](../../deploy-container-azure-pipelines.md)
143143
- [Deploy a container with GitHub Actions](../../deploy-container-github-action.md)

articles/app-service/includes/tutorial-sidecar/common-faqs.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,29 @@ No. App Service routes internet requests only to the main container. For code-ba
1818

1919
For more information on configuring `IsMain`, see [Microsoft.Web sites/sitecontainers](/azure/templates/microsoft.web/sites/sitecontainers).
2020

21+
### How do I use volume mounts?
22+
23+
The Volume mounts feature enables you to share non-persistent files and directories between containers within your Web App.
24+
25+
:::image type="content" source="../../media/tutorial-custom-container-sidecar/configure-volume-mounts.png" alt-text="Screenshot showing a volume mount configuration for a sidecar container.":::
26+
27+
**Volume sub path:** This is a logical directory path that is automatically created, and is not referenced within the container. Containers that are configured with the same volume sub path can share files and directories with each other.
28+
29+
**Container mount path:** This corresponds to a directory path that you reference within the container. The container mount path is mapped to the volume sub path.
30+
31+
For example, suppose the following volume mounts are configured:
32+
33+
| Sidecar name | Volume sub path | Container mount path | Read-only |
34+
| ------------ | --------------- | -------------------- | --------- |
35+
| Container1 | /directory1/directory2 | /container1Vol | False |
36+
| Container2 | /directory1/directory2 | /container2Vol | True |
37+
| Container3 | /directory1/directory2/directory3 | /container3Vol | False |
38+
| Container4 | /directory4 | /container1Vol | False |
39+
40+
Based on these settings, the following conditions apply:
41+
- If Container1 creates **/container1Vol/myfile.txt**, Container2 can read the file via **/container2Vol/myfile.txt**.
42+
- If Container1 creates **/container1Vol/directory3/myfile.txt**, Container2 can read the file via **/container2Vol/directory3/myfile.txt**, and Container3 can read and write to the file via **/container3Vol/myfile.txt**.
43+
- Container4 does not share a volume mount in common with any of the other containers.
44+
45+
> [!Note]
46+
> For code-based Linux apps, the built-in Linux container cannot use volume mounts.

0 commit comments

Comments
 (0)