[CosmosDB] Bug Fixes and Enhancements

src/CosmosDB/CosmosDB.Test/ScenarioTests/AccountTests.cs

@@ -47,5 +47,12 @@ public void TestAccountRelatedCmdletsUsingObject()
         {
             TestController.NewInstance.RunPowerShellTest(_logger, "Test-AccountRelatedCmdletsUsingObject");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAddRegionOperation()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-AddRegionOperation");
+        }
     }
 }

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

@@ -166,4 +166,23 @@ function Test-AccountRelatedCmdletsUsingObject
 
   $IsAccountDeleted = Remove-AzCosmosDBAccount -InputObject $cosmosDBAccount -PassThru
   Assert-AreEqual $IsAccountDeleted true
+}
+
+function Test-AddRegionOperation
+{
+  $rgName = "CosmosDBResourceGroup2"
+  $location = "East US"
+  $locationlist = "East US", "West US"
+  $cosmosDBAccountName = "testupdateregion"
+  $resourceGroup = New-AzResourceGroup -ResourceGroupName $rgName  -Location $location
+
+    $cosmosDBAccount = New-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName -Location $location  -EnableMultipleWriteLocations  -EnableAutomaticFailover
+    do 
+    {
+       $cosmosDBAccount = Get-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName
+    } while ($cosmosDBAccount.ProvisioningState -ne "Succeeded")
+
+  $updatedCosmosDBAccount = Update-AzCosmosDBAccountRegion -ResourceGroupName $rgName -Name $cosmosDBAccountName -Location $locationlist
+  $updatedCosmosDBAccount = Get-AzCosmosDBAccount -ResourceGroupName $rgName -Name $cosmosDBAccountName
+  Assert-AreEqual $cosmosDBAccount.Locations.Count $updatedCosmosDBAccount.Locations.Count - 1 
 }

src/CosmosDB/CosmosDB/CosmosDBAccount/NewAzCosmosDBAccount.cs

@@ -51,7 +51,7 @@ public class NewAzCosmosDBAccount : AzureCosmosDBCmdletBase
         public SwitchParameter EnableVirtualNetwork { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = Constants.IpRangeFilterHelpMessage)]
-        [ValidateNotNullOrEmpty]
+        [ValidateNotNull]
         public string[] IpRangeFilter { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = Constants.LocationHelpMessage)]
@@ -84,6 +84,9 @@ public class NewAzCosmosDBAccount : AzureCosmosDBCmdletBase
         [PSArgumentCompleter("GlobalDocumentDB", "MongoDB", "Gremlin", "Cassandra", "Table")]
         public string ApiKind { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = Constants.DisableKeyBasedMetadataWriteAccessHelpMessage)]
+        public bool DisableKeyBasedMetadataWriteAccess { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = Constants.AsJobHelpMessage)]
         public SwitchParameter AsJob { get; set; }
 
@@ -201,12 +204,17 @@ public override void ExecuteCmdlet()
                         IpRangeFilterAsString = string.Concat(IpRangeFilterAsString, ",", IpRangeFilter[i]);
                 }
             }
+            else if (IpRangeFilter != null)
+            {
+                IpRangeFilterAsString = "";
+            }
 
             DatabaseAccountCreateUpdateParameters databaseAccountCreateUpdateParameters = new DatabaseAccountCreateUpdateParameters(locations:LocationCollection, location: writeLocation, name:Name, consistencyPolicy:consistencyPolicy, tags:tags, ipRangeFilter:IpRangeFilterAsString);
             databaseAccountCreateUpdateParameters.EnableMultipleWriteLocations = EnableMultipleWriteLocations;
             databaseAccountCreateUpdateParameters.IsVirtualNetworkFilterEnabled = EnableVirtualNetwork;
             databaseAccountCreateUpdateParameters.EnableAutomaticFailover = EnableAutomaticFailover;
             databaseAccountCreateUpdateParameters.VirtualNetworkRules = virtualNetworkRule;
+            databaseAccountCreateUpdateParameters.DisableKeyBasedMetadataWriteAccess = DisableKeyBasedMetadataWriteAccess;
 
             if (!string.IsNullOrEmpty(ApiKind))
             {

src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccount.cs

@@ -60,7 +60,7 @@ public class UpdateAzCosmosDBAccount : AzureCosmosDBCmdletBase
         public bool EnableVirtualNetwork { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = Constants.IpRangeFilterHelpMessage)]
-        [ValidateNotNullOrEmpty]
+        [ValidateNotNull]
         public string[] IpRangeFilter { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = Constants.MaxStalenessIntervalInSecondsHelpMessage)]
@@ -81,6 +81,9 @@ public class UpdateAzCosmosDBAccount : AzureCosmosDBCmdletBase
         [ValidateNotNullOrEmpty]
         public PSVirtualNetworkRule[] VirtualNetworkRuleObject { get; set; }
 
+        [Parameter(Mandatory = false, HelpMessage = Constants.DisableKeyBasedMetadataWriteAccessHelpMessage)]
+        public bool DisableKeyBasedMetadataWriteAccess { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = Constants.AsJobHelpMessage)]
         public SwitchParameter AsJob { get; set; }
 
@@ -107,6 +110,7 @@ public override void ExecuteCmdlet()
             databaseAccountUpdateParameters.EnableMultipleWriteLocations = EnableMultipleWriteLocations;
             databaseAccountUpdateParameters.IsVirtualNetworkFilterEnabled = EnableVirtualNetwork;
             databaseAccountUpdateParameters.EnableAutomaticFailover = EnableAutomaticFailover;
+            databaseAccountUpdateParameters.DisableKeyBasedMetadataWriteAccess = DisableKeyBasedMetadataWriteAccess;
 
             if (!string.IsNullOrEmpty(DefaultConsistencyLevel))
             {
@@ -172,7 +176,7 @@ public override void ExecuteCmdlet()
                 databaseAccountUpdateParameters.VirtualNetworkRules = virtualNetworkRule;
             }
 
-            if (IpRangeFilter != null && IpRangeFilter.Length > 0)
+            if (IpRangeFilter != null)
             {
                 string IpRangeFilterAsString = null;
 

src/CosmosDB/CosmosDB/CosmosDBAccount/UpdateAzCosmosDBAccountRegion.cs

@@ -76,9 +76,11 @@ public override void ExecuteCmdlet()
             {
                 if (Location != null && Location.Length > 0)
                 {
+                    int failoverPriority = 0;
                     foreach (string location in Location)
                     {
-                        locations.Add(new Location(location));
+                        locations.Add(new Location(locationName: location, failoverPriority: failoverPriority));
+                        failoverPriority++;
                     }
                 }
                 if (LocationObject != null && LocationObject.Length > 0)

src/CosmosDB/CosmosDB/Helpers/Constants.cs

@@ -47,7 +47,8 @@ internal static class Constants
         public const string IgnoreMissingVNetServiceEndpointHelpMessage = "Boolean to indicate if to create firewall rule before the virtual network has vnet service endpoint enabled.";
         public const string ApiKindHelpMessage = "The type of Cosmos DB database account to create. Accepted values: GlobalDocumentDB, Sql, MongoDB, Gremlin, Table, Cassandra. Default value: GlobalDocumentDB ";
         public const string AccountKeyTypeHelpMessage = "Value from: {ConnectionStrings, Keys, ReadOnlyKeys}. Default is Keys.";
-
+        public const string DisableKeyBasedMetadataWriteAccessHelpMessage = "Disable write operations on metadata resources (databases, containers, throughput) via account keys";
+
         //Sql cmdlets help messages
         public const string DatabaseNameHelpMessage = "Database name.";
         public const string ContainerNameHelpMessage = "Container name.";

src/CosmosDB/CosmosDB/Models/PSDatabaseAccount.cs

@@ -31,6 +31,7 @@ public PSDatabaseAccount(DatabaseAccountGetResults databaseAccountGetResults)
             Location = databaseAccountGetResults.Location;
             EnableCassandraConnector = databaseAccountGetResults.EnableCassandraConnector;
             FailoverPolicies = databaseAccountGetResults.FailoverPolicies;
+            Locations = databaseAccountGetResults.Locations;
             ReadLocations = databaseAccountGetResults.ReadLocations;
             WriteLocations = databaseAccountGetResults.WriteLocations;
             Capabilities = databaseAccountGetResults.Capabilities;

src/CosmosDB/CosmosDB/Models/PSIndexingPolicy.cs

@@ -25,10 +25,10 @@ public PSIndexingPolicy()
 
         public PSIndexingPolicy(IndexingPolicy indexingPolicy)
         {
-            Automatic = indexingPolicy.Automatic;
-            IndexingMode = indexingPolicy.IndexingMode;
+            Automatic = indexingPolicy?.Automatic;
+            IndexingMode = indexingPolicy?.IndexingMode;
 
-            if (indexingPolicy.IncludedPaths != null)
+            if (indexingPolicy?.IncludedPaths != null)
             {
                 IncludedPaths = new List<PSIncludedPath>();
                 foreach (IncludedPath includedPath in indexingPolicy.IncludedPaths)
@@ -37,7 +37,7 @@ public PSIndexingPolicy(IndexingPolicy indexingPolicy)
                 }
             }
 
-            if (indexingPolicy.ExcludedPaths != null)
+            if (indexingPolicy?.ExcludedPaths != null)
             {
                 ExcludedPaths = new List<PSExcludedPath>();
                 foreach (ExcludedPath excludedPath in indexingPolicy.ExcludedPaths)
@@ -46,7 +46,7 @@ public PSIndexingPolicy(IndexingPolicy indexingPolicy)
                 }
             }
 
-            if (indexingPolicy.CompositeIndexes != null)
+            if (indexingPolicy?.CompositeIndexes != null)
             {
                 CompositeIndexes = new List<IList<PSCompositePath>>();
                 foreach (IList<CompositePath> compositePathList in indexingPolicy.CompositeIndexes)
@@ -60,7 +60,7 @@ public PSIndexingPolicy(IndexingPolicy indexingPolicy)
                 }
             }
 
-            if (indexingPolicy.SpatialIndexes != null)
+            if (indexingPolicy?.SpatialIndexes != null)
             {
                 SpatialIndexes = new List<PSSpatialSpec>();
                 foreach (SpatialSpec spatialSpec in indexingPolicy.SpatialIndexes)

src/CosmosDB/CosmosDB/Models/PSUniqueKeyPolicy.cs

@@ -26,7 +26,7 @@ public PSUniqueKeyPolicy()
         public PSUniqueKeyPolicy(UniqueKeyPolicy uniqueKey)
         {
             UniqueKeys = new List<PSUniqueKey>();
-            if (uniqueKey.UniqueKeys != null)
+            if (uniqueKey?.UniqueKeys != null)
             {
                 foreach (UniqueKey key in uniqueKey.UniqueKeys)
                 {

src/CosmosDB/CosmosDB/SQL/GetAzCosmosDBSqlContainer.cs

@@ -68,7 +68,7 @@ public override void ExecuteCmdlet()
                 if (Detailed)
                 {
                     ThroughputSettingsGetResults throughputSettingsGetResults = CosmosDBManagementClient.SqlResources.GetSqlContainerThroughputWithHttpMessagesAsync(ResourceGroupName, AccountName, DatabaseName, Name).GetAwaiter().GetResult().Body;
-                    WriteObject(throughputSettingsGetResults);
+                    WriteObject(new PSThroughputSettingsGetResults(throughputSettingsGetResults));
                 }
             }
             else

src/CosmosDB/CosmosDB/help/Update-AzCosmosDBAccountRegion.md

@@ -33,7 +33,10 @@ Update-AzCosmosDBAccountRegion [-Location <String[]>] [-LocationObject <PSLocati
 ```
 
 ## DESCRIPTION
-Update Regions of a CosmosDB Account.
+Update Regions of a CosmosDB Account. Location can be provided either as an object of type PSLocation or as strings of Location Name ordered by failover priority.
+LocationObject parameter expects the list of current locations (failover prioritiies included) appended by the new LocationObjects corresponding to new locations to be added.
+Location parameter expects the list of current location(ordered by failover priority) and the new locations. 
+Please note, we only support Addition of Regions. Please provide either Location or LocationObject.
 
 ## EXAMPLES