Skip to content

Commit 0d453c0

Browse files
authored
Merge pull request #215812 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 63e5a04 + 55f25b4 commit 0d453c0

File tree

9 files changed

+38
-19
lines changed

9 files changed

+38
-19
lines changed

articles/active-directory/external-identities/azure-ad-account.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ms.author: mimart
1313
author: msmimart
1414
manager: celestedg
1515
ms.collection: M365-identity-device-management
16+
ms.custom: engagement-fy23
1617
---
1718

1819
# Add Azure Active Directory (Azure AD) as an identity provider for External Identities

articles/active-directory/external-identities/b2b-quickstart-add-guest-users-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 05/10/2022
99
ms.topic: quickstart
1010
ms.service: active-directory
1111
ms.subservice: B2B
12-
ms.custom: it-pro, seo-update-azuread-jan, mode-ui
12+
ms.custom: engagement-fy23, it-pro, seo-update-azuread-jan, mode-ui
1313
ms.collection: M365-identity-device-management
1414
#Customer intent: As a tenant admin, I want to walk through the B2B invitation workflow so that I can understand how to add a guest user in the portal, and understand the end user experience.
1515
---

articles/active-directory/external-identities/cross-tenant-access-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 08/05/2022
1010
ms.author: mimart
1111
author: msmimart
1212
manager: celestedg
13-
ms.custom: "it-pro"
13+
ms.custom: engagement-fy23, "it-pro"
1414
ms.collection: M365-identity-device-management
1515
---
1616

articles/active-directory/external-identities/cross-tenant-access-settings-b2b-collaboration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.date: 06/30/2022
1010
ms.author: mimart
1111
author: msmimart
1212
manager: celestedg
13-
ms.custom: "it-pro"
13+
ms.custom: engagement-fy23, "it-pro"
1414
ms.collection: M365-identity-device-management
1515
---
1616

articles/active-directory/external-identities/leave-the-organization.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ manager: celestedg
1616

1717
ms.collection: M365-identity-device-management
1818
adobe-target: true
19+
ms.custom: engagement-fy23
1920
---
2021

2122
# Leave an organization as an external user
@@ -111,4 +112,4 @@ Permanent deletion can be initiated by the admin, or it happens at the end of th
111112
## Next steps
112113

113114
- Learn more about [Azure AD B2B collaboration](what-is-b2b.md) and [Azure AD B2B direct connect](b2b-direct-connect-overview.md)
114-
- [Close your Microsoft account](/microsoft-365/commerce/close-your-account)
115+
- [Close your Microsoft account](/microsoft-365/commerce/close-your-account)

articles/communication-services/quickstarts/create-communication-resource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ az communication delete --name "acsResourceName" --resource-group "resourceGroup
131131
If you have any phone numbers assigned to your resource upon resource deletion, the phone numbers will be released from your resource automatically at the same time.
132132

133133
> [!Note]
134-
> Resource deletion is **permanent** and no data, including event gird filters, phone numbers, or other data tied to your resource, can be recovered if you delete the resource.
134+
> Resource deletion is **permanent** and no data, including event grid filters, phone numbers, or other data tied to your resource, can be recovered if you delete the resource.
135135
136136
## Next steps
137137

articles/container-registry/intro-connected-registry.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
title: What is a connected registry
33
description: Overview and scenarios of the connected registry feature of Azure Container Registry
4-
ms.author: memladen
4+
ms.author: jeburke
55
ms.service: container-registry
66
ms.topic: overview
7-
ms.date: 10/11/2022
7+
ms.date: 10/25/2022
88
ms.custom: references_regions, ignite-fall-2021
99
---
1010

@@ -17,10 +17,14 @@ In this article, you learn about the *connected registry* feature of [Azure Cont
1717
1818
## Available regions
1919

20-
* Asia East
21-
* EU North
22-
* EU West
23-
* US East
20+
* Canada Central
21+
* East Asia
22+
* East US
23+
* North Europe
24+
* Norway East
25+
* Southeast Asia
26+
* West Central US
27+
* West Europe
2428

2529
## Scenarios
2630

articles/synapse-analytics/spark/data-sources/apache-spark-sql-connector.md

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Azure SQL and SQL Server
33
description: This article provides information on how to use the connector for moving data between Azure MS SQL and serverless Apache Spark pools.
44
services: synapse-analytics
5-
author: midesa
6-
ms.author: midesa
5+
author: eskot
6+
ms.author: eskot
77
ms.service: synapse-analytics
88
ms.topic: overview
99
ms.subservice: spark
@@ -30,6 +30,8 @@ dbname = "<< database name >>"
3030
url = servername + ";" + "databaseName=" + dbname + ";"
3131
dbtable = "<< table name >> "
3232
user = "<< username >>"
33+
principal_client_id = "<< service principal client id >>"
34+
principal_secret = "<< service principal secret ho>>"
3335
password = mssparkutils.credentials.getSecret('azure key vault name','secret name')
3436
```
3537

@@ -87,20 +89,31 @@ except ValueError as error :
8789

8890
### Python example with service principal
8991
```python
90-
import adal
92+
import msal
9193

9294
# Located in App Registrations from Azure Portal
9395
tenant_id = "<< tenant id >> "
9496

9597
# Located in App Registrations from Azure Portal
9698
resource_app_id_url = "https://database.windows.net/"
9799

100+
# Define scope of the Service for the app registration before requesting from AAD
101+
scope ="https://database.windows.net/.default"
102+
98103
# Authority
99-
authority = "https://login.windows.net/" + tenant_id
104+
authority = "https://login.microsoftonline.net/" + tenant_id
105+
106+
# Get service principal
107+
service_principal_id = mssparkutils.credentials.getSecret('azure key vault name','principal_client_id')
108+
service_principal_secret = mssparkutils.credentials.getSecret('azure key vault name','principal_secret')
109+
110+
111+
context = msal.ConfidentialClientApplication(
112+
service_principal_id, service_principal_secret, authority
113+
)
100114

101-
context = adal.AuthenticationContext(authority)
102-
token = context.acquire_token_with_client_credentials(resource_app_id_url, service_principal_id, service_principal_secret)
103-
access_token = token["accessToken"]
115+
token = app.acquire_token_silent([scope])
116+
access_token = token["access_token"]
104117

105118
jdbc_df = spark.read \
106119
.format("com.microsoft.sqlserver.jdbc.spark") \

includes/virtual-wan-nva-hub-partners.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The following SD-WAN connectivity Network Virtual Appliances can be deployed in
1111
|Partners|Configuration/How-to/Deployment guide| Dedicated support model |
1212
|---|---| --- |
1313
|[Barracuda Networks](https://azuremarketplace.microsoft.com/marketplace/apps/barracudanetworks.barracuda_cloudgenwan_gateway?tab=Overviewus/marketplace/apps/barracudanetworks.barracuda_cloudgenwan_gateway?tab=Overview)| [Barracuda CloudGen WAN deployment guide](https://campus.barracuda.com/product/cloudgenwan/doc/91980640/deployment/)| Yes|
14-
|[Cisco Cloud Service Router(CSR) VWAN](https://aka.ms/ciscoMarketPlaceOffer)| The integration of the Cisco SD-WAN solution with Azure virtual WAN enhances Cloud OnRamp for Multi-Cloud deployments and enables configuring Cisco Catalyst 8000V Edge Software (Cisco Catalyst 8000V) as a network virtual appliance (NVA) in Azure Virtual WAN hubs. [View Cisco SD-WAN Cloud OnRamp, Cisco IOS XE Release 17.x configuration guide](https://www.cisco.com/c/en/us/td/docs/routers/sdwan/configuration/cloudonramp/ios-xe-17/cloud-onramp-book-xe/cloud-onramp-multi-cloud.html#Cisco_Concept.dita_c61e0e7a-fff8-4080-afee-47b81e8df701) | Yes|
14+
|[Cisco SD-WAN](https://aka.ms/ciscoMarketPlaceOffer)| The integration of the Cisco SD-WAN solution with Azure virtual WAN enhances Cloud OnRamp for Multi-Cloud deployments and enables configuring Cisco Catalyst 8000V Edge Software (Cisco Catalyst 8000V) as a network virtual appliance (NVA) in Azure Virtual WAN hubs. [View Cisco SD-WAN Cloud OnRamp, Cisco IOS XE Release 17.x configuration guide](https://www.cisco.com/c/en/us/td/docs/routers/sdwan/configuration/cloudonramp/ios-xe-17/cloud-onramp-book-xe/cloud-onramp-multi-cloud.html#Cisco_Concept.dita_c61e0e7a-fff8-4080-afee-47b81e8df701) | Yes|
1515
|[VMware SD-WAN ](https://sdwan.vmware.com/partners/microsoft) | [VMware SD-WAN in Virtual WAN hub deployment guide](https://kb.vmware.com/s/article/82746). The managed application for deployment can be found at this [Azure Marketplace link](https://azuremarketplace.microsoft.com/marketplace/apps/velocloud.vmware_sdwan_in_vwan).| Yes|
1616
| [Versa Networks](https://versa-networks.com/partners/microsoft-azure.php) | If you're an existing Versa Networks customer, log on to your Versa account and access the deployment guide using the following link [Versa Deployment Guide](https://docs.versa-networks.com/Special:AuthenticationProviders?returntotitle=Getting_Started%2FDeployment_and_Initial_Configuration%2FBranch_Deployment%2FInitial_Configuration%2FInstall_a_VOS_Cloud_Gateway_on_an_Azure_Virtual_WAN). If you're a new Versa customer, sign-up using the [Versa preview sign-up link](https://versa-networks.com/demo/). | Yes |
1717
| [Fortinet SD-WAN](https://www.fortinet.com/products/next-generation-firewall) | [Fortinet SD-WAN deployment guide](https://aka.ms/fortinetsdwandeploy). The managed application for this deployment can be found at this [Azure Marketplace Link](https://portal.azure.com/#create/fortinet.fortigate_vwan_nvamanagedfgtvwan). | No|

0 commit comments

Comments
 (0)