Skip to content

Commit 25f6d61

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ip-sfi-06
2 parents e6ce326 + fcb2fec commit 25f6d61

File tree

86 files changed

+1241
-1013
lines changed

Some content is hidden

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

86 files changed

+1241
-1013
lines changed

.github/policies/disallow-edits.yml

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
name: GitOps.PullRequestIssueManagement
2+
description: GitOps.PullRequestIssueManagement primitive
3+
resource: repository
4+
5+
configuration:
6+
resourceManagementConfiguration:
7+
eventResponderTasks:
8+
- description: Close PRs that contain content for services that have been migrated out of the azure-docs-pr repository.
9+
if:
10+
- payloadType: Pull_Request
11+
- isAction:
12+
action: Opened
13+
- or:
14+
- includesModifiedFiles:
15+
files:
16+
- articles/aks/*
17+
- includesModifiedFiles:
18+
files:
19+
- articles/defender-for-cloud/*
20+
- includesModifiedFiles:
21+
files:
22+
- articles/attestation/*
23+
- includesModifiedFiles:
24+
files:
25+
- articles/confidential-ledger/*
26+
- includesModifiedFiles:
27+
files:
28+
- articles/dedicated-hsm/*
29+
- includesModifiedFiles:
30+
files:
31+
- articles/key-vault/*
32+
- includesModifiedFiles:
33+
files:
34+
- articles/payment-hsm/*
35+
- includesModifiedFiles:
36+
files:
37+
- articles/postgresql/*
38+
- includesModifiedFiles:
39+
files:
40+
- articles/cosmos-db/*
41+
- includesModifiedFiles:
42+
files:
43+
- articles/dms/*
44+
- includesModifiedFiles:
45+
files:
46+
- articles/mariadb/*
47+
- includesModifiedFiles:
48+
files:
49+
- articles/mysql/*
50+
- includesModifiedFiles:
51+
files:
52+
- articles/managed-instance-apache-cassandra/*
53+
- includesModifiedFiles:
54+
files:
55+
- articles/virtual-machines/*
56+
- includesModifiedFiles:
57+
files:
58+
- articles/virtual-machines-scale-sets/*
59+
- includesModifiedFiles:
60+
files:
61+
- articles/container-instances/*
62+
- includesModifiedFiles:
63+
files:
64+
- articles/service-fabric/*
65+
- includesModifiedFiles:
66+
files:
67+
- articles/machine-learning/*
68+
- includesModifiedFiles:
69+
files:
70+
- articles/ai-studio/*
71+
- includesModifiedFiles:
72+
files:
73+
- articles/ai-services/*
74+
- includesModifiedFiles:
75+
files:
76+
- articles/genomics/*
77+
- includesModifiedFiles:
78+
files:
79+
- articles/open-datasets/*
80+
- includesModifiedFiles:
81+
files:
82+
- articles/search/*
83+
- includesModifiedFiles:
84+
files:
85+
- articles/azure-monitor/*
86+
- includesModifiedFiles:
87+
files:
88+
- articles/advisor/*
89+
- includesModifiedFiles:
90+
files:
91+
- articles/chaos-studio/*
92+
- includesModifiedFiles:
93+
files:
94+
- articles/service-health/*
95+
- includesModifiedFiles:
96+
files:
97+
- articles/azure-arc/*
98+
- includesModifiedFiles:
99+
files:
100+
- articles/azure-linux/*
101+
- includesModifiedFiles:
102+
files:
103+
- articles/azure-portal/*
104+
- includesModifiedFiles:
105+
files:
106+
- articles/copilot/*
107+
- includesModifiedFiles:
108+
files:
109+
- articles/lighthouse/*
110+
- includesModifiedFiles:
111+
files:
112+
- articles/quotas/*
113+
- includesModifiedFiles:
114+
files:
115+
- articles/container-registry/*
116+
- includesModifiedFiles:
117+
files:
118+
- articles/kubernetes-fleet/*
119+
then:
120+
- addReply:
121+
reply: >-
122+
@${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.
123+
- if:
124+
- or:
125+
- activitySenderHasPermission:
126+
permission: None
127+
- activitySenderHasPermission:
128+
permission: Read
129+
- activitySenderHasPermission:
130+
permission: Write
131+
- activitySenderHasPermission:
132+
permission: Triage
133+
- activitySenderHasPermission:
134+
permission: Maintain
135+
- activitySenderHasPermission:
136+
permission: Admin
137+
then:
138+
- closePullRequest

articles/active-directory-b2c/force-password-reset.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
title: Configure a force password reset flow in Azure AD B2C
33
titleSuffix: Azure AD B2C
44
description: Learn how to set up a forced password reset flow in Azure Active Directory B2C.
5-
65
author: kengaderdus
76
manager: CelesteDG
8-
97
ms.service: azure-active-directory
10-
118
ms.topic: how-to
12-
ms.date: 01/11/2024
9+
ms.date: 10/11/2024
1310
ms.author: kengaderdus
1411
ms.subservice: b2c
1512
ms.custom: b2c-support, has-azure-ad-ps-ref,azure-ad-ref-level-one-done
@@ -160,16 +157,13 @@ Connect-MgGraph -Scopes 'Domain.ReadWrite.All'
160157
$domainId = "contoso.com"
161158
$params = @{
162159
passwordValidityPeriodInDays = 90
163-
passwordNotificationWindowInDays = 15
164160
}
165161
166162
Update-MgDomain -DomainId $domainId -BodyParameter $params
167163
```
168164

169-
> [!NOTE]
170-
> `passwordValidityPeriodInDays` indicates the length of time in days that a password remains valid before it must be changed. `passwordNotificationWindowInDays` indicates the length of time in days before the password expiration date when users receive their first notification to indicate that their password is about to expire.
171-
172-
## Next steps
165+
- `passwordValidityPeriodInDays` is the length of time in days that a password remains valid before it must be changed.
173166

174-
Set up a [self-service password reset](add-password-reset-policy.md).
167+
## Related content
175168

169+
Set up a [self-service password reset](add-password-reset-policy.md).

articles/api-management/api-management-subscriptions.md

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

77
ms.service: azure-api-management
88
ms.topic: conceptual
9-
ms.date: 08/02/2023
9+
ms.date: 09/03/2024
1010
ms.author: danlep
1111
ms.custom: engagement-fy23
1212
---
@@ -133,7 +133,7 @@ After the subscription requirement is disabled, the selected API or APIs can be
133133

134134
When API Management receives an API request from a client with a subscription key, it handles the request according to these rules:
135135

136-
1. Check if it's a valid key associated with an active subscription, either:
136+
1. Check first if it's a valid key associated with an active subscription, either:
137137

138138
* A subscription scoped to the API
139139
* A subscription scoped to a product that's assigned to the API
@@ -142,13 +142,15 @@ When API Management receives an API request from a client with a subscription ke
142142

143143
If a valid key for an active subscription at an appropriate scope is provided, access is allowed. Policies are applied depending on the configuration of the policy definition at that scope.
144144

145+
1. If the key isn't valid but a product exists that includes the API but doesn't require a subscription (an *open* product), ignore the key and handle as an API request without a subscription key (see below).
146+
145147
1. Otherwise, access is denied (401 Access denied error).
146148

147149
### API request without a subscription key
148150

149151
When API Management receives an API request from a client without a subscription key, it handles the request according to these rules:
150152

151-
1. Check first for the existence of a product that includes the API but doesn't require a subscription (an *open* product). If the open product exists, handle the request in the context of the APIs, policies, and access rules configured for the product. An API can be associated with at most one open product.
153+
1. Check first for the existence of a product that includes the API but doesn't require a subscription (an *open* product). If the open product exists, handle the request in the context of the APIs, policies, and access rules configured for the open product. An API can be associated with at most one open product.
152154
1. If an open product including the API isn't found, check whether the API requires a subscription. If a subscription isn't required, handle the request in the context of that API and operation.
153155
1. If no configured product or API is found, then access is denied (401 Access denied error).
154156

@@ -162,14 +164,14 @@ The following table summarizes how the gateway handles API requests with or with
162164
|✔️ | ✔️ | Access allowed:<br/><br/>• Product-scoped key<br/>• API-scoped key<br/>• All APIs-scoped key<br/>• Service-scoped key<br/><br/>Access denied:<br/><br/>• Other key not scoped to applicable product or API | Access denied | Protected API access using product-scoped or API-scoped subscription |
163165
|✔️ || Access allowed:<br/><br/>• Product-scoped key<br/>• API-scoped key<br/>• All APIs-scoped key<br/>• Service-scoped key<br/><br/>Access denied:<br/><br/>• Other key not scoped to applicable product or API | Access allowed (API context) | • Protected API access with product-scoped subscription<br/><br/>• Anonymous access to API. If anonymous access isn’t intended, configure API-level policies to enforce authentication and authorization. |
164166
|❌<sup>1</sup> | ✔️ | Access allowed:<br/><br/>• Product-scoped key<br/>• API-scoped key<br/>• All APIs-scoped key<br/>• Service-scoped key<br/><br/>Access denied:<br/><br/>• Other key not scoped to applicable product or API | Access allowed (open product context) | • Protected API access with API-scoped subscription<br/><br/>• Anonymous access to API. If anonymous access isn’t intended, configure with product policies to enforce authentication and authorization |
165-
|❌<sup>1</sup> || Access allowed:<br/><br/>• Product-scoped key<br/>• API-scoped key<br/>• All APIs-scoped key<br/>• Service-scoped key<br/><br/>Access denied:<br/><br/>• Other key not scoped to applicable product or API | Access allowed (open product context) | Anonymous access to API. If anonymous access isn’t intended, configure with product policies to enforce authentication and authorization |
167+
|❌<sup>1</sup> || Access allowed:<br/><br/>• Product-scoped key<br/>• API-scoped key<br/>• All APIs-scoped key<br/>• Service-scoped key<br/>• Other key not scoped to applicable product or API | Access allowed (open product context) | Anonymous access to API. If anonymous access isn’t intended, configure with product policies to enforce authentication and authorization |
166168

167169
<sup>1</sup> An open product exists that's associated with the API.
168170

169171
### Considerations
170172

171173
- API access in a product context is the same, whether the product is published or not. Unpublishing the product hides it from the developer portal, but it doesn’t invalidate new or existing subscription keys.
172-
- Even if a product or API doesn't require a subscription, a valid key from an active subscription that enables access to the product or API can still be used.
174+
- If an API doesn't require subscription authentication, any API request that includes a subscription key is treated the same as a request without a subscription key. The subscription key is ignored.
173175
- API access "context" means the policies and access controls that are applied at a particular scope (for example, API or product).
174176

175177
## Next steps

articles/api-management/developer-portal-wordpress-plugin.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ In this step, create a new Microsoft Entra app. In later steps, you configure th
6969

7070
`https://<apim-instance-name>.developer.azure-api.net/signin`
7171

72-
1. On the **Authentication** page, under **Single-page application**, select **Add URI** and enter the following URI, substituting the name of your API Management instance:
72+
1. Select **+ Add a platform** again. Select **Single-page application** agaain.
73+
1. On the **Configure single-page application** page, enter the following redirect URI, substituting the name of your API Management instance, and select **Configure**:
7374

7475
`https://<apim-instance-name>.developer.azure-api.net/`
7576

articles/api-management/quota-by-key-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: article
9-
ms.date: 07/23/2024
9+
ms.date: 09/16/2024
1010
ms.author: danlep
1111
---
1212
# Set usage quota by key
@@ -29,6 +29,7 @@ To understand the difference between rate limits and quotas, [see Rate limits an
2929
bandwidth="kilobytes"
3030
renewal-period="seconds"
3131
increment-condition="condition"
32+
increment-count="number"
3233
counter-key="key value"
3334
first-period-start="date-time" />
3435
```
@@ -41,6 +42,7 @@ To understand the difference between rate limits and quotas, [see Rate limits an
4142
| calls | The maximum total number of calls allowed during the time interval specified in the `renewal-period`. Policy expressions aren't allowed. | Either `calls`, `bandwidth`, or both together must be specified. | N/A |
4243
| counter-key | The key to use for the `quota policy`. For each key value, a single counter is used for all scopes at which the policy is configured. Policy expressions are allowed. | Yes | N/A |
4344
| increment-condition | The Boolean expression specifying if the request should be counted towards the quota (`true`). Policy expressions are allowed. | No | N/A |
45+
| increment-count | The number by which the counter is increased per request. Policy expressions are allowed. | No | 1 |
4446
| renewal-period | The length in seconds of the fixed window after which the quota resets. The start of each period is calculated relative to `first-period-start`. Minimum period: 300 seconds. When `renewal-period` is set to 0, the period is set to infinite. Policy expressions aren't allowed. | Yes | N/A |
4547
| first-period-start | The starting date and time for quota renewal periods, in the following format: `yyyy-MM-ddTHH:mm:ssZ` as specified by the ISO 8601 standard. Policy expressions aren't allowed. | No | `0001-01-01T00:00:00Z` |
4648

articles/api-management/xml-to-json-policy.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: dlepow
66

77
ms.service: azure-api-management
88
ms.topic: article
9-
ms.date: 07/23/2024
9+
ms.date: 09/06/2024
1010
ms.author: danlep
1111
---
1212

@@ -21,7 +21,7 @@ The `xml-to-json` policy converts a request or response body from XML to JSON. T
2121
## Policy statement
2222

2323
```xml
24-
<xml-to-json kind="javascript-friendly | direct" apply="always | content-type-xml" consider-accept-header="true | false"/>
24+
<xml-to-json kind="javascript-friendly | direct" apply="always | content-type-xml" consider-accept-header="true | false" always-array-children="true | false"/>
2525
```
2626

2727

@@ -32,6 +32,7 @@ The `xml-to-json` policy converts a request or response body from XML to JSON. T
3232
|kind|The attribute must be set to one of the following values.<br /><br /> - `javascript-friendly` - the converted JSON has a form friendly to JavaScript developers.<br />- `direct` - the converted JSON reflects the original XML document's structure.<br/><br/>Policy expressions are allowed.|Yes|N/A|
3333
|apply|The attribute must be set to one of the following values.<br /><br /> - `always` - convert always.<br />- `content-type-xml` - convert only if response Content-Type header indicates presence of XML.<br/><br/>Policy expressions are allowed.|Yes|N/A|
3434
|consider-accept-header|The attribute must be set to one of the following values.<br /><br /> - `true` - apply conversion if JSON is requested in request Accept header.<br />- `false` -always apply conversion.<br/><br/>Policy expressions are allowed.|No|`true`|
35+
|always-array-children|The attribute must be set to one of the following values.<br /><br /> - `true` - Always convert child elements into a JSON array.<br />- `false` - Only convert multiple child elements into a JSON array. Convert a single child element into a JSON object.<br/><br/>Policy expressions are allowed.|No|`false`|
3536

3637
## Usage
3738

Loading
26.4 KB
Loading
18.5 KB
Loading
11.3 KB
Loading

0 commit comments

Comments
 (0)