Skip to content

Commit df3e9a4

Browse files
authored
Merge pull request #229194 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 3c5d50f + 533ac25 commit df3e9a4

File tree

10 files changed

+27
-20
lines changed

10 files changed

+27
-20
lines changed

articles/active-directory/manage-apps/manage-application-permissions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ $assignments | ForEach-Object {
103103
Using the following Microsoft Graph PowerShell script revokes all permissions granted to an application.
104104

105105
```powershell
106-
Connect-MgGraph -Scopes "Application.ReadWrite.All", "Directory.ReadWrite.All", "DelegatedPermissionGrant.ReadWrite.All" "AppRoleAssignment.ReadWrite.All"
106+
Connect-MgGraph -Scopes "Application.ReadWrite.All", "Directory.ReadWrite.All", "DelegatedPermissionGrant.ReadWrite.All", "AppRoleAssignment.ReadWrite.All"
107107
108108
# Get Service Principal using objectId
109109
$sp = Get-MgServicePrincipal -ServicePrincipalID "$ServicePrincipalID"
@@ -119,7 +119,7 @@ $spOauth2PermissionsGrants |ForEach-Object {
119119
}
120120
121121
# Get all application permissions for the service principal
122-
$spApplicationPermissions = Get-MgServicePrincipalAppRoleAssignedTo -ServicePrincipalId $Sp.Id -All | Where-Object { $_.PrincipalType -eq "ServicePrincipal" }
122+
$spApplicationPermissions = Get-MgServicePrincipalAppRoleAssignment -ServicePrincipalId $Sp.Id -All | Where-Object { $_.PrincipalType -eq "ServicePrincipal" }
123123
124124
# Remove all application permissions
125125
$spApplicationPermissions | ForEach-Object {

articles/cosmos-db/free-tier.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,11 @@ To create an account with free tier using Azure PowerShell, set the `-EnableFree
7878
```powershell-interactive
7979
# Create a free tier account for API for NoSQL.
8080
New-AzCosmosDBAccount -ResourceGroupName "MyResourcegroup" `
81-
-Name "Myaccount" `
81+
-Name "myaccount" `
8282
-ApiKind "sql" `
83-
-EnableFreeTier true `
83+
-EnableFreeTier $true `
8484
-DefaultConsistencyLevel "Session" `
85+
-Location "East US" `
8586
```
8687

8788
### Unable to create a free-tier account

articles/cosmos-db/partial-document-update-getting-started.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ key definition.
225225

226226
const { resource: updated } = await container
227227
.item(
228-
id = 'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
229-
partitionKeyValue = 'road-bikes'
228+
'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
229+
'road-bikes'
230230
)
231231
.patch(operations);
232232
```
@@ -242,8 +242,8 @@ key definition.
242242

243243
const { resource: updated } = await container
244244
.item(
245-
id = 'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
246-
partitionKeyValue = 'road-bikes'
245+
'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
246+
'road-bikes'
247247
)
248248
.patch(operations);
249249
```
@@ -260,8 +260,8 @@ key definition.
260260

261261
const { resource: updated } = await container
262262
.item(
263-
id = 'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
264-
partitionKeyValue = 'road-bikes'
263+
'e379aea5-63f5-4623-9a9b-4cd9b33b91d5',
264+
'road-bikes'
265265
)
266266
.patch(
267267
body = operations,

articles/dev-box/how-to-customize-devbox-azure-image-builder.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ The next step is to use Azure VM Image Builder and Azure PowerShell to create an
9797
Install-Module -Name Az.ManagedServiceIdentity
9898
9999
# Create an identity
100-
New-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName
100+
New-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName -Location $location
101101
102102
$identityNameResourceId=$(Get-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName).Id
103103
$identityNamePrincipalId=$(Get-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName).PrincipalId
@@ -272,4 +272,4 @@ Once the compute gallery images are available in the dev center. You can use the
272272

273273
## Next steps
274274
- [Create dev box definitions](./quickstart-configure-dev-box-service.md#create-a-dev-box-definition)
275-
- [Configure an Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md)
275+
- [Configure an Azure Compute Gallery](./how-to-configure-azure-compute-gallery.md)

articles/dms/howto-sql-server-to-azure-sql-powershell.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@ The following example creates a service named *MyDMS* in the resource group *MyD
7676
7777
$vSubNet = Get-AzVirtualNetworkSubnetConfig -VirtualNetwork $vNet -Name MySubnet
7878
79-
$service = New-AzDms -ResourceGroupName myResourceGroup `
79+
$service = New-AzDms -ResourceGroupName MyDMSResourceGroup `
8080
-ServiceName MyDMS `
8181
-Location EastUS `
82-
-Sku Basic_2vCores `
82+
-Sku GeneralPurpose_4vCores `
8383
-VirtualSubnetId $vSubNet.Id`
8484
```
8585

@@ -105,6 +105,9 @@ $sourceConnInfo = New-AzDmsConnInfo -ServerType SQL `
105105
-TrustServerCertificate:$true
106106
```
107107

108+
> [!NOTE]
109+
> If the migration ends with an error when providing source DataSource as public IP address or the DNS of SQL Server, then use the name of the Azure VM running the SQL Server.
110+
108111
The next example shows creation of Connection Info for a server called SQLAzureTarget using sql authentication:
109112

110113
```powershell
@@ -252,4 +255,4 @@ Remove-AzDms -ResourceGroupName myResourceGroup -ServiceName MyDMS
252255

253256
## Next step
254257

255-
* Review the migration guidance in the Microsoft [Database Migration Guide](/data-migration/).
258+
* Review the migration guidance in the Microsoft [Database Migration Guide](/data-migration/).

articles/dms/pre-reqs.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ When using the Azure Database Migration Service to perform SQL Server to Azure S
131131
* Ensure that the service account running the source SQL Server instance has write privileges on the network share that you created and that the computer account for the source server has read/write access to the same share.
132132
* Make a note of a Windows user (and password) that has full control privilege on the network share that you previously created. The Azure Database Migration Service impersonates the user credential to upload the backup files to Azure Storage container for restore operation.
133133
* Create a blob container and retrieve its SAS URI by using the steps in the article [Manage Azure Blob Storage resources with Storage Explorer](../vs-azure-tools-storage-explorer-blobs.md#get-the-sas-for-a-blob-container). Be sure to select all permissions (Read, Write, Delete, List) on the policy window while creating the SAS URI.
134+
* Ensure both Azure Database Migration Service IP address and Azure SQL Managed Instance subnet can communicate with blob container.
134135
135136
> [!NOTE]
136137
> For a complete listing of the prerequisites required to use the Azure Database Migration Service to perform migrations from SQL Server to SQL Managed Instance, see the tutorial [Migrate SQL Server to SQL Managed Instance](./tutorial-sql-server-to-managed-instance.md).

articles/load-testing/how-to-test-private-endpoint.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ When you start the load test, Azure Load Testing service injects the following A
3636

3737
These resources are ephemeral and exist only during the load test run. If you restrict access to your virtual network, you need to [configure your virtual network](#configure-your-virtual-network) to enable communication between these Azure Load Testing and the injected VMs.
3838

39-
> [!NOTE]
40-
> Virtual network support for Azure Load Testing is available in the following Azure regions: Australia East, East US, East US 2, North Europe, South Central US, UK South, and West US 2.
41-
4239
## Prerequisites
4340

4441
- An existing virtual network and a subnet to use with Azure Load Testing.

articles/postgresql/migrate/how-to-migrate-from-oracle.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ ora2pg -t COPY -o data.sql -b %namespace/data -c %namespace/config/ora2pg.conf
267267
Finally, compile all files against the Azure Database for PostgreSQL server. You can choose to load the manually generated DDL files or use the second script *import_all.sh* to import those files interactively.
268268

269269
```
270-
psql -f %namespace%\schema\sequences\sequence.sql -h server1-server.postgres.database.azure.com -p 5432 -U username@server1-server -d database -l %namespace%\ schema\sequences\create_sequences.log
270+
psql -f %namespace%\schema\sequences\sequence.sql -h server1-server.postgres.database.azure.com -p 5432 -U username@server1-server -d database -L %namespace%\ schema\sequences\create_sequences.log
271271
272-
psql -f %namespace%\schema\tables\table.sql -h server1-server.postgres.database.azure.com p 5432 -U username@server1-server -d database -l %namespace%\schema\tables\create_table.log
272+
psql -f %namespace%\schema\tables\table.sql -h server1-server.postgres.database.azure.com -p 5432 -U username@server1-server -d database -L %namespace%\schema\tables\create_table.log
273273
```
274274

275275
Here's the data import command:

articles/private-link/private-endpoint-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ A private-link resource is the destination target of a specified private endpoin
116116
| Azure Media Services | Microsoft.Media/mediaservices | keydelivery, liveevent, streamingendpoint |
117117
| Resource Management Private Links | Microsoft.Authorization/resourceManagementPrivateLinks | ResourceManagement |
118118
| Azure Databricks | Microsoft.Databricks/workspaces | databricks_ui_api, browser_authentication |
119+
| Azure Monitor Private Link Scope | Microsoft.Insights/privatelinkscopes | azuremonitor |
119120

120121
> [!NOTE]
121122
> You can create private endpoints only on a General Purpose v2 (GPv2) storage account.

articles/service-bus-messaging/service-bus-transactions.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ The disposition of the message (complete, abandon, dead-letter, defer) then occu
4141
> [!IMPORTANT]
4242
> Azure Service Bus doesn't retry an operation in case of an exception when the operation is in a transaction scope.
4343
44+
## Operations that do not enlist in transaction scopes
45+
46+
Be aware that message processing code that calls into databases and other services like Cosmos DB does not automatically enlist those downstream resources into the same transactional scope. For more information on how to handle these scenarios, look into the [guidelines on idempotent message processing](/azure/architecture/reference-architectures/containers/aks-mission-critical/mission-critical-data-platform#idempotent-message-processing).
47+
4448
## Transfers and "send via"
4549

4650
To enable transactional handover of data from a queue or topic to a processor, and then to another queue or topic, Service Bus supports *transfers*. In a transfer operation, a sender first sends a message to a *transfer queue or topic*, and the transfer queue or topic immediately moves the message to the intended destination queue or topic using the same robust transfer implementation that the autoforward capability relies on. The message is never committed to the transfer queue or topic's log in a way that it becomes visible for the transfer queue or topic's consumers.

0 commit comments

Comments
 (0)