Skip to content

Commit 46a47c1

Browse files
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into files-dev-docs
2 parents d76b7b8 + 321435e commit 46a47c1

File tree

744 files changed

+4361
-2619
lines changed

Some content is hidden

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

744 files changed

+4361
-2619
lines changed

.github/policies/disallow-edits.yml

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ configuration:
1010
- payloadType: Pull_Request
1111
- isAction:
1212
action: Opened
13-
- or:
13+
- or:
1414
- filesMatchPattern:
1515
matchAny: true
1616
pattern: articles/aks/*
@@ -121,4 +121,74 @@ configuration:
121121
reply: >-
122122
@${issueAuthor} - You tried to add content to a folder path that has been removed from this repository. Your pull request will be automatically closed. Submit your changes to the updated repository, which can be identified by clicking the Edit this Document link at the top of any published article for that product or service.
123123
- closePullRequest
124+
125+
- description: Alert authors to edits in the /articles/reliability folder.
126+
if:
127+
# If a PR in the articles/reliability folder is opened, and the PR author isn't Anastasia or John...
128+
- payloadType: Pull_Request
129+
- filesMatchPattern:
130+
matchAny: true
131+
pattern: articles/reliability/*
132+
- isAction:
133+
action: Opened
134+
- not:
135+
or:
136+
- isActivitySender:
137+
user: anaharris-ms
138+
- isActivitySender:
139+
user: johndowns
140+
then:
141+
# Mention Anastasia and John, add a reply asking the PR author not to sign off on the PR, and add the needs-human-review label.
142+
- mentionUsers:
143+
mentionees:
144+
- anaharris-ms
145+
- johndowns
146+
replyTemplate: >-
147+
Tagging authors for this folder: ${mentionees}
148+
- addReply:
149+
reply: >-
150+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
151+
- addLabel:
152+
label: needs-human-review
153+
154+
- description: Disallow sign-off for articles in the /articles/reliability folder.
155+
if:
156+
# If a 'sign-off' comment is added to a PR in the articles/reliability folder , and the PR author isn't Anastasia or John...
157+
- payloadType: Issue_Comment
158+
- isPullRequest
159+
- filesMatchPattern:
160+
matchAny: true
161+
pattern: articles/reliability/*
162+
- commentContains:
163+
pattern: \#sign-off
164+
isRegex: false
165+
- not:
166+
or:
167+
- isActivitySender:
168+
user: anaharris-ms
169+
- isActivitySender:
170+
user: johndowns
171+
then:
172+
# Add the do-not-merge label, remove the ready-to-merge label, and add a reply asking the PR author not to sign off on the PR.
173+
- addReply:
174+
reply: >-
175+
@${issueAuthor} - Please do NOT sign off on this pull request. The Reliability Hub owners will sign off for you.
176+
- addLabel:
177+
label: do-not-merge
178+
- removeLabel:
179+
label: ready-to-merge
180+
181+
- description: Write a message if the breadcrumb file is modified in the azure-docs-pr repository.
182+
if:
183+
- payloadType: Pull_Request
184+
- isAction:
185+
action: Opened
186+
- filesMatchPattern:
187+
matchAny: true
188+
pattern: bread/*
189+
190+
then:
191+
- addReply:
192+
reply: >-
193+
@${issueAuthor} - This PR modifies the breadcrumb file for the entire repository: bread/toc.yml. This file supports the on-site navigation for 100s of services. Please make sure your changes to the breadcrumb file are intentional. Do not delete this file.
124194

.github/workflows/stale.yml

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
name: Mark stale pull requests
2+
3+
permissions:
4+
issues: write
5+
pull-requests: write
6+
7+
on:
8+
schedule:
9+
- cron: "0 */6 * * *"
10+
11+
jobs:
12+
stale:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/stale@v3
18+
with:
19+
repo-token: ${{ secrets.GITHUB_TOKEN }}
20+
days-before-pr-stale: 14
21+
days-before-pr-close: 90
22+
stale-pr-label: inactive
23+
close-pr-label: auto-close
24+
exempt-pr-labels: keep-open
25+
operations-per-run: 1300
26+
ascending: false
27+
# start-date: '2021-03-19'
28+
stale-pr-message: >
29+
This pull request has been inactive for at least 14 days.
30+
31+
If you are finished with your changes, don't forget to sign off. See the [platform guide](https://review.learn.microsoft.com/help/platform/prmerger-hashtag-commands?branch=main) for instructions.
32+
33+
[Get Help](https://review.learn.microsoft.com/help/platform/help-options?branch=main)
34+
35+
[Learn Support Teams Channel](https://teams.microsoft.com/l/channel/19%3a7ecffca1166a4a3986fed528cf0870ee%40thread.skype/General?groupId=de9ddba4-2574-4830-87ed-41668c07a1ca&tenantId=72f988bf-86f1-41af-91ab-2d7cd011db47)
36+
37+
[Resolve Merge Conflicts](https://review.learn.microsoft.com/help/contribute/resolve-merge-conflicts?branch=main)
38+
close-pr-message: >
39+
This pull request has been inactive for 90 days, and an `auto-close` label has been added. At this time, the system is closing the PR automatically. If you decide to continue working on your changes, scroll to the bottom of the pull request comments and select the **Reopen pull request** button.
40+
<br/>

articles/api-management/api-management-howto-protect-backend-with-aad.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ For details about app registration, see [Quickstart: Configure an application to
7979

8080
## Authorization workflow
8181

82-
1. A user or application acquires a token from Microsoft Entra ID with permissions that grant access to the backend-app.
82+
1. A user or application acquires a token from Microsoft Entra ID with permissions that grant access to the backend-app. If you use the v2 endpoint, ensure that the accessTokenAcceptedVersion property is set to 2 in the application manifest of the back end app and any client app that you configure.
8383

8484
1. The token is added in the Authorization header of API requests to API Management.
8585

articles/api-management/api-management-howto-setup-delegation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ using (var encoder = new HMACSHA512(Convert.FromBase64String(key)))
178178
}
179179
```
180180

181-
### NodeJS code to generate hash of returnUrl
181+
### Node.js code to generate hash of returnUrl
182182

183183
```
184184
var crypto = require('crypto');

articles/app-service/configure-authentication-file-based.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ The following exhausts possible configuration options within the file:
8181
"url_scheme_of_your_app://easyauth.callback"
8282
],
8383
"cookieExpiration": {
84-
"convention": "FixedTime|IdentityDerived",
84+
"convention": "FixedTime|IdentityProviderDerived",
8585
"timeToExpiration": "<timespan>"
8686
},
8787
"nonce": {

articles/app-service/configure-language-python.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ This article describes how [Azure App Service](overview.md) runs Python apps, ho
1919

2020
The App Service deployment engine automatically activates a virtual environment and runs `pip install -r requirements.txt` for you when you deploy a [Git repository](deploy-local-git.md), or when you deploy a [zip package](deploy-zip.md) [with build automation enabled](deploy-zip.md#enable-build-automation-for-zip-deploy).
2121

22+
> [!NOTE]
23+
> Currently App Service requires `requirements.txt` in your project's root directory, even if you're using modern Python packaging tools such as `pyproject.toml`.
24+
2225
This guide provides key concepts and instructions for Python developers who use a built-in Linux container in App Service. If you've never used Azure App Service, first follow the [Python quickstart](quickstart-python.md) and [Flask](tutorial-python-postgresql-app-flask.md), [Django](tutorial-python-postgresql-app-django.md), or [FastAPI](tutorial-python-postgresql-app-fastapi.md) with PostgreSQL tutorial.
2326

2427
You can use either the [Azure portal](https://portal.azure.com) or the Azure CLI for configuration:

articles/app-service/includes/configure-language-java/java-variants.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,3 @@ Azure App Service runs Java web applications on a fully managed service in three
1010
* Java SE - Can run an app deployed as a JAR package that contains an embedded server (such as Spring Boot, Dropwizard, Quarkus, or one with an embedded Tomcat or Jetty server).
1111
* Tomcat - The built-in Tomcat server can run an app deployed as a WAR package.
1212
* JBoss EAP - Supported for Linux apps in the Free, Premium v3, and Isolated v2 pricing tiers only. The built-in JBoss EAP server can run an app deployed as a WAR or EAR package.
13-
14-
::: zone pivot="java-javase"
15-
16-
> [!NOTE]
17-
> For Spring applications, we recommend using Azure Spring Apps. However, you can still use Azure App Service as a destination. See [Java Workload Destination Guidance](https://aka.ms/javadestinations) for advice.
18-
19-
::: zone-end

articles/app-service/includes/deploy-github-actions/deploy-github-actions-openid-connect.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122

123123
# [Java SE](#tab/java)
124124

125-
Build and deploy a Java Spring app to Azure using an Azure service principal. The example uses GitHub secrets for the `client-id`, `tenant-id`, and `subscription-id` values. You can also pass these values directly in the sign-in action.
125+
Build and deploy a Java Spring Boot app to Azure using an Azure service principal. The example uses GitHub secrets for the `client-id`, `tenant-id`, and `subscription-id` values. You can also pass these values directly in the sign-in action.
126126

127127
```yaml
128128
name: Java CI with Maven

articles/app-service/includes/deploy-github-actions/deploy-github-actions-publish-profile.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393

9494
# [Java SE](#tab/java)
9595

96-
Build and deploy a Java Spring app to Azure using an Azure publish profile. The `publish-profile` input references the `AZURE_WEBAPP_PUBLISH_PROFILE` secret that you created earlier.
96+
Build and deploy a Java Spring Boot app to Azure using an Azure publish profile. The `publish-profile` input references the `AZURE_WEBAPP_PUBLISH_PROFILE` secret that you created earlier.
9797

9898
```yaml
9999
name: Java CI with Maven

articles/app-service/includes/deploy-github-actions/deploy-github-actions-service-principal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110

111111
# [Java SE](#tab/java)
112112

113-
Build and deploy a Java Spring app to Azure using an Azure service principal. The `creds` input references the `AZURE_CREDENTIALS` secret that you created earlier.
113+
Build and deploy a Java Spring Boot app to Azure using an Azure service principal. The `creds` input references the `AZURE_CREDENTIALS` secret that you created earlier.
114114

115115
```yaml
116116
name: Java CI with Maven

0 commit comments

Comments
 (0)