Skip to content

Commit ae46ebe

Browse files
authored
Merge branch 'MicrosoftDocs:main' into main
2 parents 4abbc7d + fca0a76 commit ae46ebe

File tree

75 files changed

+853
-378
lines changed

Some content is hidden

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

75 files changed

+853
-378
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6978,6 +6978,26 @@
69786978
"source_path": "articles/defender-for-iot/organizations/eiot-sensor.md",
69796979
"redirect_url": "/azure/defender-for-iot/organizations/concept-enterprise",
69806980
"redirect_document_id": false
6981+
},
6982+
{
6983+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.09.18.md",
6984+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-09-18",
6985+
"redirect_document_id": false
6986+
},
6987+
{
6988+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.11.08.md",
6989+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-11-08",
6990+
"redirect_document_id": false
6991+
},
6992+
{
6993+
"source_path": "articles/cyclecloud/release-notes/ccws/2024.12.18.md",
6994+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2024-12-18",
6995+
"redirect_document_id": false
6996+
},
6997+
{
6998+
"source_path": "articles/cyclecloud/release-notes/ccws/2025.02.06.md",
6999+
"redirect_url": "/azure/cyclecloud/release-notes/ccws/2025-02-06",
7000+
"redirect_document_id": false
69817001
}
69827002
]
69837003
}

articles/api-management/configure-custom-domain.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ author: dlepow
77

88
ms.service: azure-api-management
99
ms.topic: how-to
10-
ms.date: 05/09/2025
10+
ms.date: 05/30/2025
1111
ms.author: danlep
1212
ms.custom:
1313
- engagement-fy23
@@ -50,10 +50,10 @@ There are several API Management endpoints to which you can assign a custom doma
5050
| Endpoint | Default |
5151
| -------- | ----------- |
5252
| **Gateway** | Default is: `<apim-service-name>.azure-api.net`. Gateway is the only endpoint available for configuration in the Consumption tier.<br/><br/>The default Gateway endpoint configuration remains available after a custom Gateway domain is added. |
53-
| **Developer portal** | Default is: `<apim-service-name>.developer.azure-api.net` |
54-
| **Management** | Default is: `<apim-service-name>.management.azure-api.net` |
55-
| **Configuration API (v2)** | Default is: `<apim-service-name>.configuration.azure-api.net` |
56-
| **SCM** | Default is: `<apim-service-name>.scm.azure-api.net` |
53+
| **Developer portal** (all tiers except Consumption) | Default is: `<apim-service-name>.developer.azure-api.net` |
54+
| **Management** (classic tiers only) | Default is: `<apim-service-name>.management.azure-api.net` |
55+
| **Self-hosted gateway configuration API (v2)** | Default is: `<apim-service-name>.configuration.azure-api.net` |
56+
| **SCM** (classic tiers only) | Default is: `<apim-service-name>.scm.azure-api.net` |
5757

5858
### Considerations
5959

@@ -62,6 +62,7 @@ There are several API Management endpoints to which you can assign a custom doma
6262
* Only API Management instance owners can use **Management** and **SCM** endpoints internally. These endpoints are less frequently assigned a custom domain name.
6363
* The **Premium** and **Developer** tiers support setting multiple hostnames for the **Gateway** endpoint.
6464
* Wildcard domain names, like `*.contoso.com`, are supported in all tiers except the Consumption tier. A specific subdomain certificate (for example, api.contoso.com) would take precedence over a wildcard certificate (*.contoso.com) for requests to api.contoso.com.
65+
* When configuing a custom domain for the **Developer portal**, you can [enable CORS](enable-cors-developer-portal.md) for the new domain name. This is needed for developer portal visitors to use the interactive console in the API reference pages.
6566

6667
## Domain certificate options
6768

articles/api-management/enable-cors-developer-portal.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,20 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: how-to
9-
ms.date: 12/22/2023
9+
ms.date: 05/30/2025
1010
ms.author: danlep
1111
---
1212

1313
# Enable CORS for interactive console in the API Management developer portal
14+
15+
[!INCLUDE [premium-dev-standard-basic-premiumv2-standarv2-basicv2.md](../../includes/api-management-availability-premium-dev-standard-basic-premiumv2-standardv2-basicv2.md)]
16+
1417
Cross-origin resource sharing (CORS) is an HTTP-header based mechanism that allows a server to indicate any origins (domain, scheme, or port) other than its own from which a browser should permit loading resources.
1518

1619
To let visitors to the API Management [developer portal](developer-portal-overview.md) use the interactive test console in the API reference pages, enable a [CORS policy](cors-policy.md) for APIs in your API Management instance. If the developer portal's domain name isn't an allowed origin for cross-domain API requests, test console users will see a CORS error.
1720

1821
For certain scenarios, you can configure the developer portal as a CORS proxy instead of enabling a CORS policy for APIs.
1922

20-
[!INCLUDE [premium-dev-standard-basic.md](../../includes/api-management-availability-premium-dev-standard-basic.md)]
21-
2223
## Prerequisites
2324

2425
+ Complete the following quickstart: [Create an Azure API Management instance](get-started-create-service-instance.md)
@@ -41,7 +42,6 @@ You can enable a setting to configure a CORS policy automatically for all APIs i
4142

4243
![Screenshot that shows where to check status of your CORS policy in the developer portal.](media/enable-cors-developer-portal/cors-azure-portal.png)
4344

44-
4545
### Enable CORS policy manually
4646

4747
1. Select the **Manually apply it on the global level** link to see the generated policy code.
@@ -57,6 +57,12 @@ You can enable a setting to configure a CORS policy automatically for all APIs i
5757
>
5858
> As a workaround, you can pass the subscription key in a query parameter.
5959
60+
## CORS configuration for custom domain name
61+
62+
If you configure a [custom domain](configure-custom-domain.md) for the developer portal and want visitors to use the test console on API reference pages, ensure that you enable CORS for the custom developer portal domain name.
63+
64+
When configuring the custom domain, you can enable a setting to add an origin for your custom developer portal domain in the CORS policy. If CORS was already enabled for the default domain, both origins will be included in the CORS policy. You can change the CORS policy settings anytime.
65+
6066
## CORS proxy option
6167

6268
For some scenarios (for example, if the API Management gateway is network isolated), you can choose to configure the developer portal as a CORS proxy itself, instead of enabling a CORS policy for your APIs. The CORS proxy routes the interactive console's API calls through the portal's backend in your API Management instance.
@@ -84,4 +90,4 @@ If you [self-host](developer-portal-self-host.md) the developer portal, the foll
8490
## Related content
8591

8692
* For more information about configuring a policy, see [Set or edit policies](set-edit-policies.md).
87-
* For details about the CORS policy, see the [cors](cors-policy.md) policy reference.
93+
* For details about the CORS policy, see the [cors](cors-policy.md) policy reference.

articles/app-service/includes/quickstart-python/create-app-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ az webapp up --runtime PYTHON:3.13 --sku B1 --logs
2626
* You can optionally specify a name with the argument `--name <app-name>`. If you don't provide one, then a name will be automatically generated.
2727
* You can optionally include the argument `--location <location-name>` where `<location_name>` is an available Azure region. You can retrieve a list of allowable regions for your Azure account by running the [`az appservice list-locations`](/cli/azure/appservice#az-appservice-list-locations) command.
2828

29-
The command may take a few minutes to complete. While the command is running, it provides messages about creating the resource group, the App Service plan, and the app resource, configuring logging, and doing ZIP deployment. It then gives the message, "You can launch the app at http://&lt;app-name&gt;.azurewebsites.net", which is the app's URL on Azure.
29+
The command may take a few minutes to complete. While the command is running, it provides messages about creating the resource group, the App Service plan, and the app resource, configuring logging, and doing ZIP deployment. It then returns a message that includes the app's URL, which is the app's URL on Azure.
3030

3131
<pre>
3232
The webapp '&lt;app-name>' doesn't exist
@@ -39,9 +39,9 @@ Creating zip with contents of dir /home/cephas/myExpressApp ...
3939
Getting scm site credentials for zip deployment
4040
Starting zip deployment. This operation can take a while to complete ...
4141
Deployment endpoint responded with status code 202
42-
You can launch the app at http://&lt;app-name>.azurewebsites.net
42+
You can launch the app at &lt;URL>
4343
{
44-
"URL": "http://&lt;app-name>.azurewebsites.net",
44+
"URL": "&lt;URL>",
4545
"appserviceplan": "&lt;app-service-plan-name>",
4646
"location": "centralus",
4747
"name": "&lt;app-name>",

articles/app-service/includes/quickstart-python/create-app-service-visual-studio-code-4.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ ms.date: 04/30/2022
66
---
77
Enter the name *msdocs-python-webapp-quickstart-XYZ* for this web app, where *XYZ* is any three unique characters.<br>
88
<br>
9-
When deployed, this name is used as your app name in the form `https://<app-name>.azurewebsites.net`.
9+
When deployed, this name is used as your app name.

articles/app-service/includes/quickstart-python/deploy-zip-curl-commands.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,19 @@ ms.author: daberry
44
ms.topic: include
55
ms.date: 01/29/2022
66
---
7+
Get the \<URL> from your Kudu Environment:
8+
9+
1. Open your app in the Azure portal and select **Development Tools** > **Advanced Tools**, then select **Go**.
10+
1. Copy the value from the address bar and append */api/zipdeploy*.
11+
712
##### [bash](#tab/terminal-bash)
813

914
```bash
1015
curl -X POST \
1116
-H 'Content-Type: application/zip' \
1217
-u '<deployment-user>' \
1318
-T <zip-file-name> \
14-
https://<app-name>.scm.azurewebsites.net/api/zipdeploy
19+
<URL>
1520
```
1621

1722
##### [PowerShell terminal](#tab/terminal-powershell)
@@ -23,7 +28,7 @@ curl -X POST `
2328
-H 'Content-Type: application/zip' `
2429
-u '<deployment-user>' `
2530
-T <zip-file-name> `
26-
https://<app-name>.scm.azurewebsites.net/api/zipdeploy
31+
<URL>
2732
```
2833

2934
---

articles/app-service/includes/tutorial-set-up-app-service-authentication/after.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ When you enabled the App Service authentication/authorization module in the prev
156156
1. Select the app registration that was created.
157157
1. In the overview, verify that **Supported account types** is set to **My organization only**.
158158

159-
1. To verify that access to your app is limited to users in your organization, go to your web app **Overview** and select the **Default domain** link. Or, start a browser in incognito or private mode and go to `https://<app-name>.azurewebsites.net` (see [note at top](#dnl-note)).
159+
1. To verify that access to your app is limited to users in your organization, go to your web app **Overview** and select the **Default domain** link.
160160

161161
:::image type="content" alt-text="Screenshot that shows verifying access." source="../../media/scenario-secure-app-authentication-app-service/verify-access.png":::
162162

articles/app-service/overview-hosting-plans.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ms.custom: UpdateFrequency3
1414

1515
An *Azure App Service plan* defines a set of compute resources for a web app to run. An app service always runs in an App Service plan. [Azure Functions](../azure-functions/dedicated-plan.md) also has the option of running in an App Service plan.
1616

17-
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
18-
1917
When you create an App Service plan in a certain region, you create a set of compute resources for that plan in that region. Whatever apps you put into the App Service plan run on those compute resources, as defined in the plan.
2018

2119
Each App Service plan defines:

articles/app-service/overview-managed-identity.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ ai-usage: ai-assisted
1515

1616
This article shows you how to create a managed identity for Azure App Service and Azure Functions applications, and how to use it to access other resources.
1717

18-
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
19-
2018
[!INCLUDE [app-service-managed-identities](../../includes/app-service-managed-identities.md)]
2119

22-
The managed identity configuration is specific to the slot. To configure a managed identity for a deployment slot in the portal, go to the slot first. To find the managed identity for your web app or deployment slot in your Microsoft Entra tenant from the Azure portal, search for it directly from the **Overview** page of your tenant. Usually, the slot name is similar to `<app-name>/slots/<slot-name>`.
20+
The managed identity configuration is specific to the slot. To configure a managed identity for a deployment slot in the portal, go to the slot first. To find the managed identity for your web app or deployment slot in your Microsoft Entra tenant from the Azure portal, search for it directly from the **Overview** page of your tenant.
2321

2422
> [!NOTE]
2523
> Managed identities aren't available for [apps deployed in Azure Arc](overview-arc-integration.md).

articles/app-service/overview-private-endpoint.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ ms.assetid: 2dceac28-1ba6-4904-a15d-9e91d5ee162c
1414

1515
# Use private endpoints for Azure App Service apps
1616

17-
[!INCLUDE [regionalization-note](./includes/regionalization-note.md)]
18-
1917
You can use a private endpoint for your Azure App Service apps. The private endpoint allows clients located in your private network to securely access an app over Azure Private Link. The private endpoint uses an IP address from your Azure virtual network address space. Network traffic between a client on your private network and the app goes over the virtual network and Private Link on the Microsoft backbone network. This configuration eliminates exposure from the public internet.
2018

2119
When you use a private endpoint for your app, you can:
@@ -57,9 +55,7 @@ You can find the client source IP in the web HTTP logs of your app. This feature
5755

5856
## DNS
5957

60-
When you use private endpoint for App Service apps, the requested URL must match the name of your app, which is by default `<app-name>.azurewebsites.net`. When you use a [unique default hostname](#dnl-note), your app name has the format `<app-name>-<random-hash>.<region>.azurewebsites.net`. In the following examples, `mywebapp` could also represent the full regionalized unique hostname.
61-
62-
By default, without a private endpoint, the public name of your web app is a canonical name to the cluster. For example, the name resolution is:
58+
When you use private endpoint for App Service apps, the requested URL must match the address of your app. By default, without a private endpoint, the public name of your web app is a canonical name to the cluster. For example, the name resolution is:
6359

6460
| Name | Type | Value |
6561
|:-----|:-----|:------|

0 commit comments

Comments
 (0)