Skip to content

Commit d173960

Browse files
authored
Merge pull request #185548 from MicrosoftDocs/master
Merge master to live, 4 AM
2 parents 20ebc30 + 6bb621b commit d173960

File tree

518 files changed

+2303
-1891
lines changed

Some content is hidden

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

518 files changed

+2303
-1891
lines changed

.acrolinx-config.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
{:allowed-branchname-matches ["main" "master" "release-.*"]
2-
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml))" "includes/"]}
2+
:allowed-filename-matches ["(?i)articles/(?:(?!active-directory/saas-apps/toc.yml|role-based-access-control/resource-provider-operations.md))" "includes/"]}

articles/active-directory/app-provisioning/user-provisioning-sync-attributes-for-mapping.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Azure Active Directory (Azure AD) must contain all the data (attributes) require
1919

2020
For users only in Azure AD, you can [create schema extensions using PowerShell or Microsoft Graph](#create-an-extension-attribute-on-a-cloud-only-user).
2121

22-
For users in on-premises Active Directory, you must sync the users to Azure AD. You can sync users and attributes using [Azure AD Connect](../hybrid/whatis-azure-ad-connect.md). Azure AD Connect automatically synchronizes certain attributes to Azure AD, but not all attributes. Furthermore, some attributes (such as SAMAccountName) that are synchronized by default might not be exposed using the Azure AD Graph API. In these cases, you can [use the Azure AD Connect directory extension feature to synchronize the attribute to Azure AD](#create-an-extension-attribute-using-azure-ad-connect). That way, the attribute will be visible to the Azure AD Graph API and the Azure AD provisioning service.
22+
For users in on-premises Active Directory, you must sync the users to Azure AD. You can sync users and attributes using [Azure AD Connect](../hybrid/whatis-azure-ad-connect.md). Azure AD Connect automatically synchronizes certain attributes to Azure AD, but not all attributes. Furthermore, some attributes (such as SAMAccountName) that are synchronized by default might not be exposed using the Graph API. In these cases, you can [use the Azure AD Connect directory extension feature to synchronize the attribute to Azure AD](#create-an-extension-attribute-using-azure-ad-connect). That way, the attribute will be visible to the Graph API and the Azure AD provisioning service.
2323

2424
## Create an extension attribute on a cloud only user
2525
You can use Microsoft Graph and PowerShell to extend the user schema for users in Azure AD. These extension attributes are automatically discovered in most cases.

articles/active-directory/hybrid/reference-connect-version-history.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,16 @@ If you want all the latest features and updates, check this page and install wha
5858

5959
To read more about auto-upgrade, see [Azure AD Connect: Automatic upgrade](how-to-connect-install-automatic-upgrade.md).
6060

61+
## 2.0.91.0
62+
63+
### Release status
64+
65+
01/19/2022: Released for download only, not available for auto upgrade
66+
67+
### Functional changes
68+
69+
- We updated the Azure AD Connect Health component in this release from version 3.1.110.0 to version 3.2.1823.12. This new version provides compliance of the Azure AD Connect Health component with the [Federal Information Processing Standards (FIPS)](https://www.nist.gov/standardsgov/compliance-faqs-federal-information-processing-standards-fips) requirements.
70+
6171
## 2.0.89.0
6272

6373
### Release status

articles/active-directory/hybrid/tshoot-connect-sync-errors.md

Lines changed: 193 additions & 149 deletions
Large diffs are not rendered by default.

articles/active-directory/managed-identities-azure-resources/services-azure-active-directory-support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ The following services support Azure AD authentication. New services are added t
2323
| Azure Batch | [Authenticate Batch service solutions with Active Directory](../../batch/batch-aad-auth.md) |
2424
| Azure Container Registry | [Authenticate with an Azure container registry](../../container-registry/container-registry-authentication.md) |
2525
| Azure Cognitive Services | [Authenticate requests to Azure Cognitive Services](../../cognitive-services/authentication.md?tabs=powershell#authenticate-with-azure-active-directory) |
26+
| Azure Communication Services | [Authenticate to Azure Communication Services](../../communication-services/concepts/authentication.md) |
2627
| Azure Databricks | [Authenticate using Azure Active Directory tokens](/azure/databricks/dev-tools/api/latest/aad/)
2728
| Azure Data Explorer | [How-To Authenticate with Azure Active Directory for Azure Data Explorer Access](/azure/data-explorer/kusto/management/access-control/how-to-authenticate-with-aad) |
2829
| Azure Data Lake Storage Gen1 | [Authentication with Azure Data Lake Storage Gen1 using Azure Active Directory](../../data-lake-store/data-lakes-store-authentication-using-azure-active-directory.md) |
@@ -49,4 +50,4 @@ The following services support Azure AD authentication. New services are added t
4950

5051
- [Azure China developer guide](/azure/china/resources-developer-guide)
5152
- [Compare Azure Government and global Azure](../../azure-government/compare-azure-government-global-azure.md)
52-
- [Azure services that can use Managed identities to access other services](managed-identities-status.md)
53+
- [Azure services that can use Managed identities to access other services](managed-identities-status.md)

articles/aks/security-controls-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Azure Policy Regulatory Compliance controls for Azure Kubernetes Service (AKS)
33
description: Lists Azure Policy Regulatory Compliance controls available for Azure Kubernetes Service (AKS). These built-in policy definitions provide common approaches to managing the compliance of your Azure resources.
4-
ms.date: 12/17/2021
4+
ms.date: 01/19/2022
55
ms.topic: sample
66
ms.service: container-service
77
ms.custom: subject-policy-compliancecontrols

articles/api-management/api-management-howto-add-products.md

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,21 @@ description: In this tutorial, you create and publish a product in Azure API Man
55
author: dlepow
66
ms.service: api-management
77
ms.topic: tutorial
8-
ms.date: 12/15/2021
8+
ms.date: 01/18/2022
99
ms.author: danlep
1010
ms.custom: devdivchpfy22
1111

1212
---
1313
# Tutorial: Create and publish a product
1414

15-
In Azure API Management, a [*product*](api-management-terminology.md#term-definitions) contains one or more APIs, a usage quota, and the terms of use. After a product is published, developers can subscribe to the product and begin to use the product's APIs.
15+
In Azure API Management, a [*product*](api-management-terminology.md#term-definitions) contains one or more APIs, a usage quota, and the terms of use. After a product is published, developers can [subscribe](api-management-subscriptions.md) to the product and begin to use the product's APIs.
1616

1717
In this tutorial, you learn how to:
1818

1919
> [!div class="checklist"]
2020
> * Create and publish a product
2121
> * Add an API to the product
22+
> * Access product APIs
2223
2324
:::image type="content" source="media/api-management-howto-add-products/added-product-1.png" alt-text="API Management products in portal":::
2425

@@ -46,12 +47,12 @@ In this tutorial, you learn how to:
4647
|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
4748
| Display name | The name as you want it to be shown in the [developer portal](api-management-howto-developer-portal.md). |
4849
| Description | Provide information about the product such as its purpose, the APIs it provides access to, and other details. |
49-
| Published | Select **Published** if you want to publish the product. Before the APIs in a product can be called, the product must be published. By default, new products are unpublished, and are visible only to the **Administrators** group. |
50-
| Requires subscription | Select if a user is required to subscribe to use the product. |
50+
| State | Select **Published** if you want to publish the product. Before the APIs in a product can be called, the product must be published. By default, new products are unpublished, and are visible only to the **Administrators** group. |
51+
| Requires subscription | Select if a user is required to subscribe to use the product (the product is *protected*) and a subscription key must be used to access the product's APIs. If a subscription isn't required (the product is *open*), a subscription key isn't required to access the product's APIs. See [Access to product APIs](#access-to-product-apis) later in this article. |
5152
| Requires approval | Select if you want an administrator to review and accept or reject subscription attempts to this product. If not selected, subscription attempts are auto-approved. |
52-
| Subscription count limit | Optionally, limit the count of multiple simultaneous subscriptions. |
53-
| Legal terms | You can include the terms of use for the product, which subscribers must accept to use the product. |
54-
| APIs | Select one or more APIs. You can also add APIs after creating the product. For more information, see [Add APIs to a product](#add-apis-to-a-product) later in this article. |
53+
| Subscription count limit | Optionally limit the count of multiple simultaneous subscriptions. |
54+
| Legal terms | You can include the terms of use for the product which subscribers must accept in order to use the product. |
55+
| APIs | Select one or more APIs. You can also add APIs after creating the product. For more information, see [Add APIs to a product](#add-apis-to-a-product) later in this article. <br/><br/>If the product is open (doesn't require a subscription), you can only add an API that isn't associated with another open product. |
5556

5657
1. Select **Create** to create your new product.
5758

@@ -77,7 +78,7 @@ You can specify various values for your product:
7778
| `--product-name` | The name as you want it to be shown in the [developer portal](api-management-howto-developer-portal.md). |
7879
| `--description` | Provide information about the product such as its purpose, the APIs it provides access to, and other details. |
7980
| `--state` | Select **published** if you want to publish the product. Before the APIs in a product can be called, the product must be published. By default, new products are unpublished, and are visible only to the **Administrators** group. |
80-
| `--subscription-required` | Select if a user is required to subscribe to use the product. |
81+
| `--subscription-required` | Select if a user is required to subscribe to use the product (the product is *protected*) or a subscription isn't required (the product is *open*). See [Access to product APIs](#access-to-product-apis) later in this article. |
8182
| `--approval-required` | Select if you want an administrator to review and accept or reject subscription attempts to this product. If not selected, subscription attempts are auto-approved. |
8283
| `--subscriptions-limit` | Optionally, limit the count of multiple simultaneous subscriptions.|
8384
| `--legal-terms` | You can include the terms of use for the product, which subscribers must accept to use the product. |
@@ -115,8 +116,6 @@ Continue configuring the product after saving it. In your API Management instanc
115116

116117
Products are associations of one or more APIs. You can include many APIs and offer them to developers through the developer portal. During the product creation, you can add one or more existing APIs. You can also add APIs to the product later, either from the Products **Settings** page or while creating an API.
117118

118-
Developers must first subscribe to a product to get access to the API. When they subscribe, they get a subscription key that is good for any API in that product. If you created the API Management instance, you're an administrator already, so you're subscribed to every product by default.
119-
120119
### Add an API to an existing product
121120

122121
### [Portal](#tab/azure-portal)
@@ -162,8 +161,26 @@ az apim product api delete --resource-group apim-hello-word-resource-group \
162161

163162
---
164163

165-
> [!TIP]
166-
> You can create or update a user's subscription to a product with custom subscription keys through a [REST API](/rest/api/apimanagement/current-ga/subscription/create-or-update) or PowerShell command.
164+
## Access to product APIs
165+
166+
After you publish a product, developers can access the APIs. Depending on how the product is configured, they may need to subscribe to the product for access.
167+
168+
* **Protected product** - Developers must first subscribe to a protected product to get access to the product's APIs. When they subscribe, they get a subscription key that can access any API in that product. If you created the API Management instance, you are an administrator already, so you are subscribed to every product by default. For more information, see [Subscriptions in Azure API Management](api-management-subscriptions.md).
169+
170+
When a client makes an API request with a valid product subscription key, API Management processes the request and permits access in the context of the product. Policies and access control rules configured for the product can be applied.
171+
172+
> [!TIP]
173+
> You can create or update a user's subscription to a product with custom subscription keys through a [REST API](/rest/api/apimanagement/current-ga/subscription/create-or-update) or PowerShell command.
174+
175+
* **Open product** - Developers can access an open product's APIs without a subscription key. However, you can configure other mechanisms to secure client access to the APIs, including [OAuth 2.0](api-management-howto-protect-backend-with-aad.md), [client certificates](api-management-howto-mutual-certificates-for-clients.md), and [restricting caller IP addresses](./api-management-access-restriction-policies.md#RestrictCallerIPs).
176+
177+
When a client makes an API request without a subscription key:
178+
179+
* API Management checks whether the API is associated with an open product.
180+
181+
* If the open product exists, it then processes the request in the context of that open product. Policies and access control rules configured for the open product can be applied.
182+
183+
For more information, see [How API Management handles requests with or without subscription keys](api-management-subscriptions.md#how-api-management-handles-requests-with-or-without-subscription-keys).
167184

168185
## Next steps
169186

@@ -172,6 +189,7 @@ In this tutorial, you learned how to:
172189
> [!div class="checklist"]
173190
> * Create and publish a product
174191
> * Add an API to the product
192+
> * Access product APIs
175193
176194
Advance to the next tutorial:
177195

articles/api-management/api-management-revisions.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,20 @@ When you create a revision, you can set a description for your own tracking purp
5252

5353
When you set a revision as current you can also optionally specify a public change log note. The change log is included in the developer portal for your API users to view. You can modify your change log note using the `Update-AzApiManagementApiRelease` PowerShell cmdlet.
5454

55-
> [!NOTE]
56-
> Certain API properties such as **Display name** and the **API suffix** can only be updated in the current revision.
55+
> [!CAUTION]
56+
> If you are editing a non-current revision of an API, you cannot change the following properties:
57+
>
58+
> * Name
59+
> * Type
60+
> * Description
61+
> * Subscription required
62+
> * API version
63+
> * API version description
64+
> * Path
65+
> * Protocols
66+
>
67+
> These properties can only be changed in the current revision. If your edits change any of the above
68+
> properties of a non-current revision, the error message `Can't change property for non-current revision` will be displayed.
5769
5870
## Versions and revisions
5971

0 commit comments

Comments
 (0)