Cosmos DB: Update to 2.0.0 and Add support for NetworkAclBypass in Account (#14211)

* Make changes for Network Acl Bypass

* Add help file updates

* Changes with enum not as string

* rerun tests

* Remove extra line

* rerun gremlin test with updated

* Update ChangeLog.md

Co-authored-by: Yabo Hu <[email protected]>

Author: kristynhamasaki

src/CosmosDB/CosmosDB.Test/CosmosDB.Test.csproj

@@ -5,6 +5,6 @@
   <Import Project="$(MSBuildThisFileDirectory)..\..\Az.Test.props" />
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="20.3.0" />
-    <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="1.2.1" />
+    <PackageReference Include="Microsoft.Azure.Management.CosmosDB" Version="2.0.0" />
 </ItemGroup>
 </Project>

src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.ps1

@@ -25,14 +25,16 @@ function Test-AccountRelatedCmdlets
   $cosmosDBAccountName = "cosmosdb67"
 
   #use an existing account with the following information for Account Update Operations
-  $cosmosDBExistingAccountName = "dbaccount27" 
+  $cosmosDBExistingAccountName = "dbaccount30" 
   $existingResourceGroupName = "CosmosDBResourceGroup27"
 
   $IpRule = "201.168.50.1"
   $tags = @{ name = "test"; Shape = "Square"; Color = "Blue"}
   $publicNetworkAccess = "Enabled"
+  $networkAclBypass = "AzureServices"
+  $networkAclBypassResourceId = "/subscriptions/subId/resourcegroups/rgName/providers/Microsoft.Synapse/workspaces/workspaceName"
 
-  $cosmosDBAccount = New-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10  -MaxStalenessPrefix 20 -Location $location -IpRule $IpRule -Tag $tags -EnableVirtualNetwork  -EnableMultipleWriteLocations  -EnableAutomaticFailover -ApiKind "MongoDB" -PublicNetworkAccess $publicNetworkAccess -EnableFreeTier 0 -EnableAnalyticalStorage 0 -ServerVersion "3.2"
+  $cosmosDBAccount = New-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10  -MaxStalenessPrefix 20 -Location $location -IpRule $IpRule -Tag $tags -EnableVirtualNetwork  -EnableMultipleWriteLocations  -EnableAutomaticFailover -ApiKind "MongoDB" -PublicNetworkAccess $publicNetworkAccess -EnableFreeTier 0 -EnableAnalyticalStorage 0 -ServerVersion "3.2" -NetworkAclBypass $NetworkAclBypass
 
   Assert-AreEqual $cosmosDBAccountName $cosmosDBAccount.Name
   Assert-AreEqual "BoundedStaleness" $cosmosDBAccount.ConsistencyPolicy.DefaultConsistencyLevel
@@ -45,6 +47,8 @@ function Test-AccountRelatedCmdlets
   Assert-AreEqual $cosmosDBAccount.ApiProperties.ServerVersion "3.2"
   Assert-AreEqual $cosmosDBAccount.EnableAnalyticalStorage 0
   Assert-AreEqual $cosmosDBAccount.EnableFreeTier 0
+  Assert-AreEqual $cosmosDBAccount.NetworkAclBypass $NetworkAclBypass
+  Assert-AreEqual $cosmosDBAccount.NetworkAclBypassResourceIds.Count 0
 
   # create an existing database
   Try {
@@ -54,7 +58,7 @@ function Test-AccountRelatedCmdlets
     Assert-AreEqual $_.Exception.Message ("Resource with Name " + $cosmosDBAccountName + " already exists.")
   }
 
-  $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $existingResourceGroupName -Name $cosmosDBExistingAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10  -MaxStalenessPrefix 20 -IpRule $IpRule -Tag $tags -EnableVirtualNetwork 1 -EnableAutomaticFailover 1 -PublicNetworkAccess $publicNetworkAccess
+  $updatedCosmosDBAccount = Update-AzCosmosDBAccount -ResourceGroupName $existingResourceGroupName -Name $cosmosDBExistingAccountName -DefaultConsistencyLevel "BoundedStaleness" -MaxStalenessIntervalInSeconds 10  -MaxStalenessPrefix 20 -IpRule $IpRule -Tag $tags -EnableVirtualNetwork 1 -EnableAutomaticFailover 1 -PublicNetworkAccess $publicNetworkAccess -NetworkAclBypass $NetworkAclBypass -NetworkAclBypassResourceId $networkAclBypassResourceId
 
   Assert-AreEqual $cosmosDBExistingAccountName $updatedCosmosDBAccount.Name
   Assert-AreEqual "BoundedStaleness" $updatedCosmosDBAccount.ConsistencyPolicy.DefaultConsistencyLevel
@@ -63,6 +67,8 @@ function Test-AccountRelatedCmdlets
   Assert-AreEqual $updatedCosmosDBAccount.EnableAutomaticFailover 1 
   Assert-AreEqual $updatedCosmosDBAccount.IsVirtualNetworkFilterEnabled 1
   Assert-AreEqual $updatedCosmosDBAccount.PublicNetworkAccess $publicNetworkAccess
+  Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypass $NetworkAclBypass
+  Assert-AreEqual $updatedCosmosDBAccount.NetworkAclBypassResourceIds.Count 1
 
   $cosmosDBAccountKey = Get-AzCosmosDBAccountKey -Name $cosmosDBAccountName -ResourceGroupName $rgname
   Assert-NotNull $cosmosDBAccountKey

src/CosmosDB/CosmosDB.Test/ScenarioTests/GremlinOperationsTests.ps1

@@ -23,7 +23,7 @@ function Test-GremlinOperationsCmdlets
   $DatabaseName = "dbName"
   $graphName = "graph1"
 
-  $DatabaseName2 = "dbName2"
+  $DatabaseName2 = "dbName29"
   $graphName2 = "graph2"
 
   $PartitionKeyPathValue = "/foo"
@@ -254,7 +254,7 @@ function Test-GremlinThroughputCmdlets
 {
   $AccountName = "db1002"
   $rgName = "CosmosDBResourceGroup2510"
-  $DatabaseName = "dbName3"
+  $DatabaseName = "dbName30"
   $GraphName = "graphName"
 
   $PartitionKeyPathValue = "/foo"