Skip to content

Commit 5124858

Browse files
authored
Merge pull request #212711 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 5c0bd3a + 6b1ab26 commit 5124858

File tree

10 files changed

+79
-56
lines changed

10 files changed

+79
-56
lines changed

articles/active-directory/enterprise-users/directory-delete-howto.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ You can't delete a organization in Azure AD until it passes several checks. Thes
3030
* There can be no multifactor authentication providers linked to the organization.
3131
* There can be no subscriptions for any Microsoft Online Services such as Microsoft Azure, Microsoft 365, or Azure AD Premium associated with the organization. For example, if a default Azure AD tenant was created for you in Azure, you can't delete this organization if your Azure subscription still relies on it for authentication. You also can't delete a tenant if another user has associated an Azure subscription with it.
3232

33+
[!NOTE] Microsoft is aware that customers with certain tenant configurations may be unable to successfully delete their Azure AD organization. We are working to address this problem. In the meantime, if needed, you can contact Microsoft support for details about the issue.
34+
3335
## Delete the organization
3436

3537
1. Sign in to the [Azure AD admin center](https://aad.portal.azure.com) with an account that is the Global Administrator for your organization.

articles/active-directory/standards/memo-22-09-enterprise-wide-identity-management-system.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,20 @@ Memorandum 22-09 requires agencies to develop a plan to consolidate their identi
3333

3434
## Why Azure Active Directory?
3535

36-
Azure Active Directory (Azure AD) provides the capabilities necessary to implement the recommendations from memorandum 22-09. It also provides broad identity controls that support Zero Trust initiatives. If your agency uses Microsoft Office 365, you already have an Azure AD back end to which you can consolidate.
36+
Azure Active Directory (Azure AD) provides the capabilities necessary to implement the recommendations from memorandum 22-09. It also provides broad identity controls that support Zero Trust initiatives. Today, If your agency uses Microsoft Office 365 or Azure, you already have Azure AD as an identity provider (IdP) and you can connect your applications and resources to Azure AD as your enterprise-wide identity system.
3737

3838
## Single sign-on requirements
3939

4040
The memo requires that users sign in once and then directly access applications. Microsoft's robust single sign-on (SSO) capabilities enable users to sign in once and then access cloud and other applications. For more information, see [Azure Active Directory single sign-on](../hybrid/how-to-connect-sso.md).
4141

4242
## Integration across agencies
4343

44-
[Azure AD B2B collaboration](../external-identities/what-is-b2b.md) helps you meet the requirement to facilitate integration among agencies. It does this by:
44+
[Azure AD B2B collaboration](../external-identities/what-is-b2b.md) helps you meet the requirement to facilitate integration/collaboration among agencies. Whether the users reside in different Microsoft tenant in the same cloud, [tenant on another microsoft cloud](../external-identities/b2b-government-national-clouds.md), or a [non Azure AD tenant (SAML/WS-Fed identity provider)](..//external-identities/direct-federation.md).
45+
46+
Azure AD cross-tenant access settings allow agencies to manage how they collaborate with other Azure AD organizations and other Microsoft Azure clouds. It does this by:
4547

4648
- Limiting what other Microsoft tenants your users can access.
47-
- Enabling you to allow access to users whom you don't have to manage in your own tenant, but whom you can subject to your multifactor authentication (MFA) and other access requirements.
49+
- Granular settings to control access for external users including enforcement of multifactor authentication (MFA) and device signal.
4850

4951
## Connecting applications
5052

@@ -119,6 +121,8 @@ Devices integrated with Azure AD can be either [hybrid joined devices](../device
119121

120122
* [Azure Linux virtual machines](../devices/howto-vm-sign-in-azure-ad-linux.md)
121123

124+
* [Azure Virtual Desktop](https://learn.microsoft.com/azure/architecture/example-scenario/wvd/azure-virtual-desktop-azure-active-directory-join)
125+
122126
* [Virtual desktop infrastructure](../devices/howto-device-identity-virtual-desktop-infrastructure.md)
123127

124128
## Next steps

articles/analysis-services/analysis-services-manage-users.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,13 @@ Roles at this level apply to users or accounts that need to perform tasks that c
7171

7272
By default, when you create a new tabular model project, the model project does not have any roles. Roles can be defined by using the Role Manager dialog box in Visual Studio. When roles are defined during model project design, they are applied only to the model workspace database. When the model is deployed, the same roles are applied to the deployed model. After a model has been deployed, server and database administrators can manage roles and members by using SSMS. To learn more, see [Manage database roles and users](analysis-services-database-users.md).
7373

74+
## Considerations and limitations
75+
76+
* Azure Analysis Services does not support the use of One-Time Password for B2B users
77+
7478
## Next steps
7579

7680
[Manage access to resources with Azure Active Directory groups](../active-directory/fundamentals/active-directory-manage-groups.md)
7781
[Manage database roles and users](analysis-services-database-users.md)
7882
[Manage server administrators](analysis-services-server-admins.md)
79-
[Azure role-based access control (Azure RBAC)](../role-based-access-control/overview.md)
83+
[Azure role-based access control (Azure RBAC)](../role-based-access-control/overview.md)

articles/azure-resource-manager/bicep/bicep-functions-lambda.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 09/20/2022
99
---
1010
# Lambda functions for Bicep
1111

12-
This article describes the lambda functions to use in Bicep. Lambda expressions (or lambda functions) are essentially blocks of code that can be passed as an argument. In Bicep, lambda expression is in this format:
12+
This article describes the lambda functions to use in Bicep. [Lambda expressions (or lambda functions)](https://learn.microsoft.com/dotnet/csharp/language-reference/operators/lambda-expressions) are essentially blocks of code that can be passed as an argument. They can take multiple parameters, but are resticted to a single line of code. In Bicep, lambda expression is in this format:
1313

1414
```bicep
1515
<lambda variable> => <expression>

articles/azure-resource-manager/management/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ There are some important factors to consider when defining your resource group:
8484

8585
The resource group stores metadata about the resources. When you specify a location for the resource group, you're specifying where that metadata is stored. For compliance reasons, you may need to ensure that your data is stored in a particular region.
8686

87-
If a resource group's region is temporarily unavailable, you can't update resources in the resource group because the metadata is unavailable. The resources in other regions will still function as expected, but you can't update them. This condition doesn't apply to global resources like Azure Content Delivery Network, Azure DNS, Azure Traffic Manager, and Azure Front Door.
87+
If a resource group's region is temporarily unavailable, you can't update resources in the resource group because the metadata is unavailable. The resources in other regions will still function as expected, but you can't update them. This condition doesn't apply to global resources like Azure Content Delivery Network, Azure DNS, Azure DNS Private Zones, Azure Traffic Manager, and Azure Front Door.
8888

8989
For more information about building reliable applications, see [Designing reliable Azure applications](/azure/architecture/checklist/resiliency-per-service).
9090

articles/azure-vmware/concepts-storage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Now that you've covered Azure VMware Solution storage concepts, you may want to
7070

7171
- [Scale clusters in the private cloud][tutorial-scale-private-cloud] - You can scale the clusters and hosts in a private cloud as required for your application workload. Performance and availability limitations for specific services should be addressed on a case by case basis.
7272

73-
- [Azure NetApp Files with Azure VMware Solution](netapp-files-with-azure-vmware-solution.md) - You can use Azure NetApp Files to migrate and run the most demanding enterprise file-workloads in the cloud: databases, SAP, and high-performance computing applications, with no code changes. Azure NetApp Files volumes can be attached to virtual machines and can also be connected as data stores directly to Azure VMware Solution. This functionality is in preview.
73+
- [Azure NetApp Files with Azure VMware Solution](netapp-files-with-azure-vmware-solution.md) - You can use Azure NetApp Files to migrate and run the most demanding enterprise file-workloads in the cloud: databases, and general purpose computing applications, with no code changes. Azure NetApp Files volumes can be attached to virtual machines and can also be connected as data stores directly to Azure VMware Solution. This functionality is in preview.
7474

7575
- [vSphere role-based access control for Azure VMware Solution](concepts-identity.md) - You use vCenter Server to manage VM workloads and NSX-T Manager to manage and extend the private cloud. Access and identity management use the CloudAdmin role for vCenter Server and restricted administrator rights for NSX-T Manager.
7676

articles/cognitive-services/personalizer/toc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
displayName: best practice, design
6767
- name: Personalizer fundamentals
6868
items:
69-
- name: "Features Action and Context"
69+
- name: "Context and Action Features"
7070
href: concepts-features.md
7171
displayName: action, context, feature, namespace, JSON, best practice, set, ID, guid, event id,
7272
- name: Learning policy
@@ -98,11 +98,11 @@
9898
href: concepts-scalability-performance.md
9999
- name: Tutorials
100100
items:
101-
- name: Use Web app
101+
- name: Web app integration tutorial
102102
href: tutorial-use-personalizer-web-app.md
103-
- name: Use Chat bot
103+
- name: Chat bot integration tutorial
104104
href: tutorial-use-personalizer-chat-bot.md
105-
- name: Use Azure Notebook
105+
- name: Jupyter notebook walkthrough
106106
href: tutorial-use-azure-notebook-generate-loop-data.md
107107
displayName: jupyter, notebook, python, cell, graph, chart, aggregate, model update frequency
108108
- name: Reference

articles/event-grid/communication-services-voice-video-events.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -246,22 +246,22 @@ This section contains an example of what that data would look like for each even
246246
{
247247
"id": "d5546be8-227a-4db8-b2c3-4f06fd675fd6",
248248
"topic": "/subscriptions/{subscription-id}/resourcegroups/{group-name}/providers/microsoft.communication/communicationservices/{communication-services-resource-name}",
249-
"subject": "/caller/4:+16041234567/recipient/8:acs:ff4181e1-324c-4cd1-9c4f-bda3e5d348f5_00000000-0000-0000-0000-000000000000",
249+
"subject": "/caller/8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-2033-438d-1000-343a0d006e10/recipient/8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-1889-f3a7-6a0b-343a0d0061f3",
250250
"data": {
251-
"to": {
252-
"kind": "PhoneNumber",
253-
"rawId": "4:+18331234567",
254-
"phoneNumber": {
255-
"value": "+18331234567"
256-
}
257-
},
251+
"to": {
252+
"kind": "communicationUser",
253+
"rawId": "8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-1889-f3a7-6a0b-343a0d0061f3",
254+
"communicationUser": {
255+
"id": "8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-1889-f3a7-6a0b-343a0d0061f3"
256+
}
257+
},
258258
"from": {
259-
"kind": "PhoneNumber",
260-
"rawId": "4:+16041234567",
261-
"phoneNumber": {
262-
"value": "+16041234567"
263-
}
264-
},
259+
"kind": "communicationUser",
260+
"rawId": "8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-2033-438d-1000-343a0d006e10",
261+
"communicationUser": {
262+
"id": "8:acs:98e4cbef-70e7-4733-8594-063c4a72d711_00000014-2033-438d-1000-343a0d006e10"
263+
}
264+
},
265265
"callerDisplayName": "",
266266
"incomingCallContext": "eyJhbGciOiJub25lIiwidHliSldUIn0.eyJjYyI6Ikg0c0lBQi9iT0JiOUs0SVhtQS9UMGhJbFVaUUlHQVBIc1J1M1RlbzgyNW4xcmtHJNa2hCNVVTQkNUbjFKTVo1NCt3ZDk1WFY0ZnNENUg0VDV2dk5VQ001NWxpRkpJb0pDUWlXS0F3OTJRSEVwUWo4aFFleDl4ZmxjRi9lMTlaODNEUmN6QUpvMVRWVXoxK1dWYm1lNW5zNmF5cFRyVGJ1KzMxU3FMY3E1SFhHWHZpc3FWd2kwcUJWSEhta0xjVFJEQ0hlSjNhdzA5MHE2T0pOaFNqS0pFdXpCcVdidzRoSmJGMGtxUkNaOFA4T3VUMTF0MzVHN0kvS0w3aVQyc09aS2F0NHQ2cFV5d0UwSUlEYm4wQStjcGtiVjlUK0E4SUhLZ2JKUjc1Vm8vZ0hFZGtRT3RCYXl1akc4cUt2U1dITFFCR3JFYjJNY3RuRVF0TEZQV1JEUzJHMDk3TGU5VnhhTktob2JIV0wzOHdab3dWcGVWZmsrL2QxYVZnQ2U1bVVLQTh1T056YmpvdXdnQjNzZTlnTEhjNFlYem5BVU9nRGY5dUFQMndsMXA0WU5nK1cySVRxSEtZUzJDV25IcEUySkhVZzd2UnVHOTBsZ081cU81MngvekR0OElYWHBFSi9peUxtNkdibmR1eEdZREozRXNWWXh4ZzZPd1hqc0pCUjZvR1U3NDIrYTR4M1RpQXFaV245UVIrMHNaVDg3YXpRQzbDNUR3BuZFhST1FTMVRTRzVVTkRGeU5UVjNORTFHU2kxck1UTk9VMUF0TWtWNVNreFRUVVI0YlMxRk1VdEVabnBRTjFsQ1EwWkVlVTQxZURCc1IyaHljVTVYTFROeWVTMVJNVjgyVFhrdGRFNUJZV3hrZW5SSVUwMTFVVE5GWkRKUkluMTlmUS5hMTZ0eXdzTDhuVHNPY1RWa2JnV3FPbTRncktHZmVMaC1KNjZUZXoza0JWQVJmYWYwOTRDWDFJSE5tUXRJeDN1TWk2aXZ3QXFFQWV1UlNGTjhlS3gzWV8yZXppZUN5WDlaSHp6Q1ZKemdZUVprc0RjYnprMGJoR09laWkydkpEMnlBMFdyUW1SeGFxOGZUM25EOUQ1Z1ZSUVczMGRheGQ5V001X1ZuNFNENmxtLVR5TUSVEifQ.",
267267
"correlationId": "d732db64-4803-462d-be9c-518943ea2b7a"

articles/machine-learning/how-to-datastore.md

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -124,19 +124,20 @@ ml_client.create_or_update(store)
124124

125125
```python
126126
from azure.ai.ml.entities import AzureBlobDatastore
127+
from azure.ai.ml.entities._datastore.credentials import AccountKeyCredentials
127128
from azure.ai.ml import MLClient
128129

129130
ml_client = MLClient.from_config()
130131

131132
store = AzureBlobDatastore(
132-
name="blob-protocol-example",
133+
name="blob_protocol_example",
133134
description="Datastore pointing to a blob container using wasbs protocol.",
134135
account_name="mytestblobstore",
135136
container_name="data-container",
136137
protocol="wasbs",
137-
credentials={
138-
"account_key": "XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
139-
},
138+
credentials=AccountKeyCredentials(
139+
account_key="XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
140+
),
140141
)
141142

142143
ml_client.create_or_update(store)
@@ -146,18 +147,19 @@ ml_client.create_or_update(store)
146147

147148
```python
148149
from azure.ai.ml.entities import AzureBlobDatastore
150+
from azure.ai.ml.entities._datastore.credentials import SasTokenCredentials
149151
from azure.ai.ml import MLClient
150152

151153
ml_client = MLClient.from_config()
152154

153155
store = AzureBlobDatastore(
154-
name="blob-sas-example",
156+
name="blob_sas_example",
155157
description="Datastore pointing to a blob container using SAS token.",
156158
account_name="mytestblobstore",
157159
container_name="data-container",
158-
credentials={
159-
"sas_token": "?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
160-
},
160+
credentials=SasTokenCredentials(
161+
sas_token= "?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
162+
),
161163
)
162164

163165
ml_client.create_or_update(store)
@@ -230,20 +232,22 @@ ml_client.create_or_update(store)
230232

231233
```python
232234
from azure.ai.ml.entities import AzureDataLakeGen2Datastore
235+
from azure.ai.ml.entities._datastore.credentials import ServicePrincipalCredentials
236+
233237
from azure.ai.ml import MLClient
234238

235239
ml_client = MLClient.from_config()
236240

237241
store = AzureDataLakeGen2Datastore(
238-
name="adls-gen2-example",
242+
name="adls_gen2_example",
239243
description="Datastore pointing to an Azure Data Lake Storage Gen2.",
240244
account_name="mytestdatalakegen2",
241245
filesystem="my-gen2-container",
242-
credentials={
243-
"tenant_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
244-
"client_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
245-
"client_secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
246-
},
246+
credentials=ServicePrincipalCredentials(
247+
tenant_id= "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
248+
client_id= "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
249+
client_secret= "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
250+
),
247251
)
248252

249253
ml_client.create_or_update(store)
@@ -298,18 +302,19 @@ az ml datastore create --file my_files_datastore.yml
298302

299303
```python
300304
from azure.ai.ml.entities import AzureFileDatastore
305+
from azure.ai.ml.entities._datastore.credentials import AccountKeyCredentials
301306
from azure.ai.ml import MLClient
302307

303308
ml_client = MLClient.from_config()
304309

305310
store = AzureFileDatastore(
306-
name="file-example",
311+
name="file_example",
307312
description="Datastore pointing to an Azure File Share.",
308313
account_name="mytestfilestore",
309314
file_share_name="my-share",
310-
credentials={
311-
"account_key": "XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
312-
},
315+
credentials=AccountKeyCredentials(
316+
account_key= "XXXxxxXXXxXXXXxxXXXXXxXXXXXxXxxXxXXXxXXXxXXxxxXXxxXXXxXxXXXxxXxxXXXXxxxxxXXxxxxxxXXXxXXX"
317+
),
313318
)
314319

315320
ml_client.create_or_update(store)
@@ -319,18 +324,19 @@ ml_client.create_or_update(store)
319324

320325
```python
321326
from azure.ai.ml.entities import AzureFileDatastore
327+
from azure.ai.ml.entities._datastore.credentials import SasTokenCredentials
322328
from azure.ai.ml import MLClient
323329

324330
ml_client = MLClient.from_config()
325331

326332
store = AzureFileDatastore(
327-
name="file-sas-example",
333+
name="file_sas_example",
328334
description="Datastore pointing to an Azure File Share using SAS token.",
329335
account_name="mytestfilestore",
330336
file_share_name="my-share",
331-
credentials={
332-
"sas_token": "?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
333-
},
337+
credentials=SasTokenCredentials(
338+
sas_token="?xx=XXXX-XX-XX&xx=xxxx&xxx=xxx&xx=xxxxxxxxxxx&xx=XXXX-XX-XXXXX:XX:XXX&xx=XXXX-XX-XXXXX:XX:XXX&xxx=xxxxx&xxx=XXxXXXxxxxxXXXXXXXxXxxxXXXXXxxXXXXXxXXXXxXXXxXXxXX"
339+
),
334340
)
335341

336342
ml_client.create_or_update(store)
@@ -400,19 +406,20 @@ ml_client.create_or_update(store)
400406

401407
```python
402408
from azure.ai.ml.entities import AzureDataLakeGen1Datastore
409+
from azure.ai.ml.entities._datastore.credentials import ServicePrincipalCredentials
403410
from azure.ai.ml import MLClient
404411

405412
ml_client = MLClient.from_config()
406413

407414
store = AzureDataLakeGen1Datastore(
408-
name="adls-gen1-example",
415+
name="adls_gen1_example",
409416
description="Datastore pointing to an Azure Data Lake Storage Gen1.",
410417
store_name="mytestdatalakegen1",
411-
credentials={
412-
"tenant_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
413-
"client_id": "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
414-
"client_secret": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
415-
},
418+
credentials=ServicePrincipalCredentials(
419+
tenant_id= "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
420+
client_id= "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX",
421+
client_secret= "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
422+
),
416423
)
417424

418425
ml_client.create_or_update(store)

0 commit comments

Comments
 (0)