Skip to content

Commit e903ec0

Browse files
authored
Merge pull request #171815 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents a4035ec + fb5dd2e commit e903ec0

File tree

9 files changed

+38
-14
lines changed

9 files changed

+38
-14
lines changed

articles/active-directory/develop/msal-net-client-assertions.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ string signedClientAssertion = ComputeAssertion();
5252
app = ConfidentialClientApplicationBuilder.Create(config.ClientId)
5353
.WithClientAssertion(() => { return GetSignedClientAssertion(); } )
5454
.Build();
55+
56+
// or in async manner
57+
58+
app = ConfidentialClientApplicationBuilder.Create(config.ClientId)
59+
.WithClientAssertion(async cancellationToken => { return await GetClientAssertionAsync(cancellationToken); })
60+
.Build();
5561
```
5662

5763
The [claims expected by Azure AD](active-directory-certificate-credentials.md) in the signed assertion are:

articles/active-directory/managed-identities-azure-resources/managed-identities-faq.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ You can find the list of resources that have a system-assigned managed identity
3333
az resource list --query "[?identity.type=='SystemAssigned'].{Name:name, principalId:identity.principalId}" --output table
3434
```
3535

36-
3736
### What Azure RBAC permissions are required to work with managed identities?
3837

3938
- System-assigned managed identity: You need write permissions over the resource. For example, for virtual machines you need `Microsoft.Compute/virtualMachines/write`. This action is included in resource specific built-in roles like [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor).

articles/active-directory/roles/list-role-assignments-users.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ A role can be assigned to a user directly or transitively via a group. This arti
2323

2424
- AzureADPreview module when using PowerShell
2525
- Microsoft.Graph module when using PowerShell
26-
- Admin consent when using Graph explorer for Microsoft Graph API
26+
- Admin consent when using Graph Explorer for Microsoft Graph API
2727

2828
For more information, see [Prerequisites to use PowerShell or Graph Explorer](prerequisites.md).
2929

@@ -156,4 +156,4 @@ Follow these steps to list Azure AD roles assigned to a user using the Microsoft
156156
157157
* [List Azure AD role assignments](view-assignments.md).
158158
* [Assign Azure AD roles to users](manage-roles-portal.md).
159-
* [Assign Azure AD roles to groups](groups-assign-role.md)
159+
* [Assign Azure AD roles to groups](groups-assign-role.md)

articles/active-directory/verifiable-credentials/decentralized-identifier-overview.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ ms.reviewer:
2222
2323
Our digital and physical lives are increasingly linked to the apps, services, and devices we use to access a rich set of experiences. This digital transformation allows us to interact with hundreds of companies and thousands of other users in ways that were previously unimaginable.
2424

25-
But identity data has too often been exposed in security breaches. These breaches are impactful to people's lives affecting our social, professional, and financial lives. Microsoft believes that there’s a better way. Every person has a right to an identity that they own and control, one that securely stores elements of their digital identity and preserves privacy. This primer explains how we are joining hands with a diverse community to build an open, trustworthy, interoperable, and standards-based Decentralized Identity (DID) solution for individuals and organizations.
25+
But identity data has too often been exposed in security breaches. These breaches affect our social, professional, and financial lives. Microsoft believes that there’s a better way. Every person has a right to an identity that they own and control, one that securely stores elements of their digital identity and preserves privacy. This primer explains how we are joining hands with a diverse community to build an open, trustworthy, interoperable, and standards-based Decentralized Identity (DID) solution for individuals and organizations.
2626

2727
## Why we need Decentralized Identity
2828

2929
Today we use our digital identity at work, at home, and across every app, service, and device we use. It’s made up of everything we say, do, and experience in our lives—purchasing tickets for an event, checking into a hotel, or even ordering lunch. Currently, our identity and all our digital interactions are owned and controlled by other parties, some of whom we aren’t even aware of.
3030

3131
Generally, users grant consent to several apps and devices. This approach requires a high degree of vigilance on the user's part to track who has access to what information. On the enterprise front, collaboration with consumers and partners requires high-touch orchestration to securely exchange data in a way that maintains privacy and security for all involved.
3232

33-
We believe a standards-based Decentralized Identity system can unlock a new set of experiences that give users and organizations to have greater control over their data—and deliver a higher degree of trust and security for apps, devices, and service providers
33+
We believe a standards-based Decentralized Identity system can unlock a new set of experiences that give users and organizations to have greater control over their data—and deliver a higher degree of trust and security for apps, devices, and service providers.
3434

3535
## Lead with open standards
3636

3737
We’re committed to working closely with customers, partners, and the community to unlock the next generation of Decentralized Identity–based experiences, and we’re excited to partner with the individuals and organizations that are making incredible contributions in this space. If the DID ecosystem is to grow, standards, technical components, and code deliverables must be open source and accessible to all.
3838

39-
Microsoft is actively collaborating with members of the Decentralized Identity Foundation (DIF), the W3C Credentials Community Group, and the wider identity community. We’re worked with these groups to identify and develop critical standards, and the following standards have been implemented in our services.
39+
Microsoft is actively collaborating with members of the Decentralized Identity Foundation (DIF), the W3C Credentials Community Group, and the wider identity community. We’ve worked with these groups to identify and develop critical standards, and the following standards have been implemented in our services.
4040

4141
* [W3C Decentralized Identifiers](https://www.w3.org/TR/did-core/)
4242
* [W3C Verifiable Credentials](https://www.w3.org/TR/vc-data-model/)
@@ -52,17 +52,18 @@ Before we can understand DIDs, it helps to compare them with current identity sy
5252

5353
Decentralized Identifiers (DIDs) are different. DIDs are user-generated, self-owned, globally unique identifiers rooted in decentralized systems like ION. They possess unique characteristics, like greater assurance of immutability, censorship resistance, and tamper evasiveness. These attributes are critical for any ID system that is intended to provide self-ownership and user control.
5454

55-
Microsoft’s verifiable credential solution uses decentralized credentials (DIDs) to cryptographically sign as proof that a relying party (verifier) is attesting to information proving they are the owners of a verifiable credential. Therefore, a basic understanding of decentralized identifiers is recommended for anyone creating a verifiable credential solution based on the Microsoft offering.
55+
Microsoft’s verifiable credential solution uses decentralized credentials (DIDs) to cryptographically sign as proof that a relying party (verifier) is attesting to information proving they are the owners of a verifiable credential. A basic understanding of DIDs is recommended for anyone creating a verifiable credential solution based on the Microsoft offering.
56+
5657
## What are Verifiable Credentials?
5758

58-
We use IDs in our daily lives. We have drivers licenses that we use as evidence of our ability to operate a car. Universities issue diplomas that prove we attained a level of education. We use passports to prove who we are to authorities as we arrive to other countries. The data model describes how we could handle these types of scenarios when working over the internet but in a secure manner that respects user's privacy. You can get additional information in The [Verifiable Credentials Data Model 1.0](https://www.w3.org/TR/vc-data-model/)
59+
We use IDs in our daily lives. We have drivers licenses that we use as evidence of our ability to operate a car. Universities issue diplomas that prove we attained a level of education. We use passports to prove who we are to authorities as we arrive to other countries. The data model describes how we could handle these types of scenarios when working over the internet but in a secure manner that respects users' privacy. You can get additional information in The [Verifiable Credentials Data Model 1.0](https://www.w3.org/TR/vc-data-model/).
5960

6061
In short, verifiable credentials are data objects consisting of claims made by the issuer attesting information about a subject. These claims are identified by schema and include the DID the issuer and subject. The issuer's DID creates a digital signature as proof that they attest to this information.
6162

6263

6364
## How does Decentralized Identity work?
6465

65-
We need a new form of identity. We need an identity that brings together technologies and standards to deliver key identity attributes like self-ownership, and censorship resistance. These capabilities are difficult to achieve using existing systems.
66+
We need a new form of identity. We need an identity that brings together technologies and standards to deliver key identity attributes like self-ownership and censorship resistance. These capabilities are difficult to achieve using existing systems.
6667

6768
To deliver on these promises, we need a technical foundation made up of seven key innovations. One key innovation is identifiers that are owned by the user, a user agent to manage keys associated with such identifiers, and encrypted, user-controlled datastores.
6869

@@ -123,4 +124,4 @@ Now that you know about DIDs and verifiable credentials try them yourself by fol
123124

124125
- [Get started with verifiable credentials](get-started-verifiable-credentials.md)
125126
- [How to customize your credentials](credential-design.md)
126-
- [Verifiable credentials FAQ](verifiable-credentials-faq.md)
127+
- [Verifiable credentials FAQ](verifiable-credentials-faq.md)

articles/automanage/automanage-virtual-machines.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ In addition to the standard services we onboard you to, we allow you to configur
134134
You can adjust the settings of a default environment through preferences. Learn how to create a preference [here](virtual-machines-custom-preferences.md).
135135

136136
> [!NOTE]
137-
> You cannot change the enivonrment configuration on your VM while Automanage is enabled. You will need to disable Automanage for that VM and then re-enable Automanage with the desired environment and preferences.
137+
> You cannot change the environment configuration on your VM while Automanage is enabled. You will need to disable Automanage for that VM and then re-enable Automanage with the desired environment and preferences.
138138
139139
For the complete list of participating Azure services and if they support preferences, see here:
140140
- [Automanage for Linux](automanage-windows-server.md)
@@ -197,4 +197,4 @@ In this article, you learned that Automanage for virtual machines provides a mea
197197
Try enabling Automanage for virtual machines in the Azure portal.
198198

199199
> [!div class="nextstepaction"]
200-
> [Enable Automanage for virtual machines in the Azure portal](quick-create-virtual-machines-portal.md)
200+
> [Enable Automanage for virtual machines in the Azure portal](quick-create-virtual-machines-portal.md)

articles/azure-netapp-files/snapshots-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ The following diagram shows a volume reverting to an earlier snapshot:
128128
![Diagram that shows a volume reverting to an earlier snapshot](../media/azure-netapp-files/snapshot-volume-revert.png)
129129

130130
> [!IMPORTANT]
131-
> Active filesystem data that was written and snapshots that were taken after the selected snapshot was taken will be lost. The snapshot revert operation will replace all the data in the targeted volume with the data in the selected snapshot. You should pay attention to the snapshot contents and creation date when you select a snapshot. You cannot undo the snapshot revert operation.
131+
> Active filesystem data that was written and snapshots that were taken after the selected snapshot will be lost. The snapshot revert operation will replace all the data in the targeted volume with the data in the selected snapshot. You should pay attention to the snapshot contents and creation date when you select a snapshot. You cannot undo the snapshot revert operation.
132132
133133
See [Revert a volume using snapshot revert](azure-netapp-files-manage-snapshots.md#revert-a-volume-using-snapshot-revert) about how to use this feature.
134134

articles/connectors/connectors-native-http.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,22 @@ HTTP requests have a [timeout limit](../logic-apps/logic-apps-limits-and-config.
302302

303303
<a name="disable-location-header-check"></a>
304304

305+
### Set up interval between retry attempts with the Retry-After header
306+
307+
To specify the number of seconds between retry attempts, you can add the `Retry-After` header to the HTTP action response. For example, if the target endpoint returns the `429 - Too many requests` status code, you can specify a longer interval between retries. The `Retry-After` header also works with the `202 - Accepted` status code.
308+
309+
Here is the same example that shows the HTTP action response that contains `Retry-After`:
310+
311+
```json
312+
{
313+
"statusCode": 429,
314+
"headers": {
315+
"Retry-After": "300"
316+
}
317+
}
318+
```
319+
320+
305321
## Disable checking location headers
306322

307323
Some endpoints, services, systems, or APIs return a `202 ACCEPTED` response that doesn't have a `location` header. To avoid having an HTTP action continually check the request status when the `location` header doesn't exist, you can have these options:

articles/logic-apps/customer-managed-keys-integration-service-environment.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ This topic shows how to set up and specify your own encryption key to use when y
2626

2727
* You can specify a customer-managed key *only when you create your ISE*, not afterwards. You can't disable this key after your ISE is created. Currently, no support exists for rotating a customer-managed key for an ISE.
2828

29+
* The key vault that stores your customer-managed key must exist in the same Azure region as your ISE.
30+
2931
* To support customer-managed keys, your ISE requires that you enable either the [system-assigned or user-assigned managed identity](../active-directory/managed-identities-azure-resources/overview.md#managed-identity-types). This identity lets your ISE authenticate access to secured resources, such as virtual machines and other systems or services, that are in or connected to an Azure virtual network. That way, you don't have to sign in with your credentials.
3032

3133
* Currently, to create an ISE that supports customer-managed keys and has either managed identity type enabled, you have to call the Logic Apps REST API by using an HTTPS PUT request.

articles/logic-apps/edit-app-settings-host-settings.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Your logic app also has *host settings*, which specify the runtime configuration
1919

2020
## App settings, parameters, and deployment
2121

22-
In *multi-tenant* Azure Logic Apps, deployment depends on Azure Resource Manager templates (ARM templates), which combine and handle resource provisioning for both logic apps and infrastructure. This design poses a challenge when you have to maintain environment variables for logic apps across across various dev, test, and production environments. Everything in an ARM template is defined at deployment. If you need to change just a single variable, you have to redeploy everything.
22+
In *multi-tenant* Azure Logic Apps, deployment depends on Azure Resource Manager templates (ARM templates), which combine and handle resource provisioning for both logic apps and infrastructure. This design poses a challenge when you have to maintain environment variables for logic apps across various dev, test, and production environments. Everything in an ARM template is defined at deployment. If you need to change just a single variable, you have to redeploy everything.
2323

2424
In *single-tenant* Azure Logic Apps, deployment becomes easier because you can separate resource provisioning between apps and infrastructure. You can use *parameters* to abstract values that might change between environments. By defining parameters to use in your workflows, you can first focus on designing your workflows, and then insert your environment-specific variables later. You can call and reference your environment variables at runtime by using app settings and parameters. That way, you don't have to redeploy as often.
2525

0 commit comments

Comments
 (0)