Merge branch 'master' into rgTagFilterOnServer

Author: hamidtirmizi

src/Compute/Compute/ChangeLog.md

@@ -30,6 +30,7 @@
     - New-AzDiskUpdateConfig, New-AzSnapshotUpdateConfig
 * Add ColocationStatus parameter to Get-AzProximityPlacementGroup cmdlet.
 * Fix broken example code for 'Revoke-AzSnapshotAccess' and 'Grant-AzSnapshotAccess'
+* Fix broken example code for 'Set-AzDiskDiskEncryptionKey' and 'Set-AzDiskKeyEncryptionKey'
 
 ## Version 3.3.0
 * Fix Set-AzVMCustomScriptExtension cmdlet for a VM with managed OD disk which does not have OS profile.

src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md

@@ -31,6 +31,7 @@ PS C:\> $keyUrl = https://myvault.vault-int.azure-int.net/keys/456;
 PS C:\> $keyId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault456';
 PS C:\> $diskconfig = Set-AzDiskDiskEncryptionKey -Disk $diskconfig -SecretUrl $secretUrl -SourceVaultId $secretId;
 PS C:\> $diskconfig = Set-AzDiskKeyEncryptionKey -Disk $diskconfig -KeyUrl $keyUrl -SourceVaultId $keyId;
+PS C:\> $diskConfig.EncryptionSettingsCollection.EncryptionSettingsVersion = '1.1'; 
 PS C:\> New-AzDisk -ResourceGroupName 'ResourceGroup01' -DiskName 'Disk01' -Disk $diskconfig;
 ```
 

src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md

@@ -31,6 +31,7 @@ PS C:\> $keyUrl = https://myvault.vault-int.azure-int.net/keys/456;
 PS C:\> $keyId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault456';
 PS C:\> $diskconfig = Set-AzDiskDiskEncryptionKey -Disk $diskconfig -SecretUrl $secretUrl -SourceVaultId $secretId;
 PS C:\> $diskconfig = Set-AzDiskKeyEncryptionKey -Disk $diskconfig -KeyUrl $keyUrl -SourceVaultId $keyId;
+PS C:\> $diskconfig.EncryptionSettingsCollection.EncryptionSettingsVersion = '1.1';
 PS C:\> New-AzDisk -ResourceGroupName 'ResourceGroup01' -DiskName 'Disk01' -Disk $diskconfig;
 ```
 

src/CosmosDB/CosmosDB/Az.CosmosDB.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/21/2020
+# Generated on: 2020-02-20
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.0'
+ModuleVersion = '0.1.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -74,49 +74,62 @@ NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.CosmosDB.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
-               'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase',
-               'Get-AzCosmosDBSqlDatabaseThroughput',
-               'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger',
-               'Get-AzCosmosDBSqlUserDefinedFunction',
-               'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger',
-               'Set-AzCosmosDBSqlUserDefinedFunction',
-               'Remove-AzCosmosDBSqlStoredProcedure',
-               'Remove-AzCosmosDBSqlTrigger',
-               'Remove-AzCosmosDBSqlUserDefinedFunction',
-               'New-AzCosmosDBSqlConflictResolutionPolicy',
-               'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey',
-               'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer',
-               'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer',
-               'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount',
-               'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount',
-               'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey',
-               'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion',
-               'Update-AzCosmosDBAccountFailoverPriority',
-               'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject',
-               'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath',
-               'New-AzCosmosDBSqlIncludedPath', 'New-AzCosmosDBSqlIncludedPathIndex',
-               'Get-AzCosmosDBGremlinDatabase', 'Get-AzCosmosDBGremlinDatabaseThroughput',
-               'Get-AzCosmosDBGremlinGraph', 'Get-AzCosmosDBGremlinGraphThroughput',
-               'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph',
-               'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph',
-               'New-AzCosmosDBGremlinIndexingPolicy', 'New-AzCosmosDBGremlinUniqueKey', 
-               'New-AzCosmosDBGremlinUniqueKeyPolicy', 'New-AzCosmosDBGremlinSpatialSpec',
-               'New-AzCosmosDBGremlinCompositePath', 'New-AzCosmosDBGremlinConflictResolutionPolicy',
-               'New-AzCosmosDBGremlinIncludedPath', 'New-AzCosmosDBGremlinIncludedPathIndex',
-               'Get-AzCosmosDBTable', 'Get-AzCosmosDBTableThroughput',
-               'Remove-AzCosmosDBTable', 'Set-AzCosmosDBTable',
-               'Get-AzCosmosDBCassandraKeyspace', 'Get-AzCosmosDBCassandraKeyspaceThroughput',
-               'Get-AzCosmosDBCassandraTable', 'Get-AzCosmosDBCassandraTableThroughput',
-               'New-AzCosmosDBCassandraClusterKey', 'New-AzCosmosDBCassandraColumn',
-               'New-AzCosmosDBCassandraSchema', 'Remove-AzCosmosDBCassandraKeyspace',
-               'Remove-AzCosmosDBCassandraTable', 'Set-AzCosmosDBCassandraKeyspace',
-               'Set-AzCosmosDBCassandraTable', 'Get-AzCosmosDBMongoDBCollection',
-               'Get-AzCosmosDBMongoDBCollectionThroughput', 'Get-AzCosmosDBMongoDBDatabase',
-               'Get-AzCosmosDBMongoDBDatabaseThroughput', 'Remove-AzCosmosDBMongoDBCollection',
-               'Remove-AzCosmosDBMongoDBDatabase', 'Set-AzCosmosDBMongoDBCollection',
-               'Set-AzCosmosDBMongoDBDatabase', 'New-AzCosmosDBMongoDBIndex'
- 
+CmdletsToExport = 'Get-AzCosmosDBSqlContainer', 
+               'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase', 
+               'Get-AzCosmosDBSqlDatabaseThroughput', 
+               'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger', 
+               'Get-AzCosmosDBSqlUserDefinedFunction', 
+               'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger', 
+               'Set-AzCosmosDBSqlUserDefinedFunction', 
+               'Remove-AzCosmosDBSqlStoredProcedure', 
+               'Remove-AzCosmosDBSqlTrigger', 
+               'Remove-AzCosmosDBSqlUserDefinedFunction', 
+               'New-AzCosmosDBSqlConflictResolutionPolicy', 
+               'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey', 
+               'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer', 
+               'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer', 
+               'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount', 
+               'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount', 
+               'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey', 
+               'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion', 
+               'Update-AzCosmosDBAccountFailoverPriority', 
+               'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject', 
+               'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath', 
+               'New-AzCosmosDBSqlIncludedPath', 
+               'New-AzCosmosDBSqlIncludedPathIndex', 
+               'Get-AzCosmosDBGremlinDatabase', 
+               'Get-AzCosmosDBGremlinDatabaseThroughput', 
+               'Get-AzCosmosDBGremlinGraph', 
+               'Get-AzCosmosDBGremlinGraphThroughput', 
+               'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph', 
+               'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph', 
+               'New-AzCosmosDBGremlinIndexingPolicy', 
+               'New-AzCosmosDBGremlinUniqueKey', 
+               'New-AzCosmosDBGremlinUniqueKeyPolicy', 
+               'New-AzCosmosDBGremlinSpatialSpec', 
+               'New-AzCosmosDBGremlinCompositePath', 
+               'New-AzCosmosDBGremlinConflictResolutionPolicy', 
+               'New-AzCosmosDBGremlinIncludedPath', 
+               'New-AzCosmosDBGremlinIncludedPathIndex', 'Get-AzCosmosDBTable', 
+               'Get-AzCosmosDBTableThroughput', 'Remove-AzCosmosDBTable', 
+               'Set-AzCosmosDBTable', 'Get-AzCosmosDBCassandraKeyspace', 
+               'Get-AzCosmosDBCassandraKeyspaceThroughput', 
+               'Get-AzCosmosDBCassandraTable', 
+               'Get-AzCosmosDBCassandraTableThroughput', 
+               'New-AzCosmosDBCassandraClusterKey', 
+               'New-AzCosmosDBCassandraColumn', 'New-AzCosmosDBCassandraSchema', 
+               'Remove-AzCosmosDBCassandraKeyspace', 
+               'Remove-AzCosmosDBCassandraTable', 
+               'Set-AzCosmosDBCassandraKeyspace', 'Set-AzCosmosDBCassandraTable', 
+               'Get-AzCosmosDBMongoDBCollection', 
+               'Get-AzCosmosDBMongoDBCollectionThroughput', 
+               'Get-AzCosmosDBMongoDBDatabase', 
+               'Get-AzCosmosDBMongoDBDatabaseThroughput', 
+               'Remove-AzCosmosDBMongoDBCollection', 
+               'Remove-AzCosmosDBMongoDBDatabase', 
+               'Set-AzCosmosDBMongoDBCollection', 'Set-AzCosmosDBMongoDBDatabase', 
+               'New-AzCosmosDBMongoDBIndex'
+
 # Variables to export from this module
 # VariablesToExport = @()
 
@@ -150,7 +163,11 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Preview release of ''Az.CosmosDB'' module'
+        ReleaseNotes = '* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
+* Updated .NET SDK Version to 1.0.1
+    - .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1
+* Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
+* Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath'
 
         # Prerelease string of this module
         # Prerelease = ''

src/CosmosDB/CosmosDB/ChangeLog.md

@@ -20,6 +20,13 @@
 
 ## Upcoming Release
 
+## Version 0.1.1
+* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
+* Updated .NET SDK Version to 1.0.1
+    - .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1
+* Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
+* Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath
+
 ## Version 0.1.0
 * Preview release of `Az.CosmosDB` module
 

src/CosmosDB/CosmosDB/Properties/AssemblyInfo.cs

@@ -25,5 +25,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
+[assembly: AssemblyVersion("0.1.1")]
+[assembly: AssemblyFileVersion("0.1.1")]

src/DataLakeStore/DataLakeStore/Az.DataLakeStore.psd1

@@ -57,7 +57,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.7.2'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'Microsoft.Azure.Management.DataLake.Store.dll', 
-               'Microsoft.Azure.DataLake.Store.dll', 'NLog.dll'
+               'Microsoft.Azure.DataLake.Store.dll', 'NLog.dll', 'System.Buffers.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

src/DataLakeStore/DataLakeStore/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Add reference to System.Buffers explicitly in csproj and psd1.
 
 ## Version 1.2.6
 * Update references in .psd1 to use relative path

src/DataLakeStore/DataLakeStore/DataLakeStore.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.Azure.DataLake.Store" Version="1.2.3-alpha" />
     <PackageReference Include="Microsoft.Azure.Management.DataLake.Store" Version="2.4.2-preview" />
     <PackageReference Include="NLog" Version="4.5.0" />
+    <PackageReference Include="System.Buffers" Version="4.3.0" />
     <PackageReference Include="System.Net.Requests" Version="4.3.0" />
   </ItemGroup>
 

src/IotHub/IotHub.Test/ScenarioTests/IotHubDPDeviceTests.ps1

@@ -65,15 +65,32 @@ function Test-AzureRmIotHubDeviceLifecycle
 	$devices = Get-AzIotHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName
 	Assert-True { $devices.Count -eq 3}
 
+	# Get device connection string
+	$deviceCS = Get-AzIotHubDCS -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device3
+	Assert-True { $deviceCS.DeviceId -eq $device3 }
+	Assert-True { $deviceCS.ConnectionString -eq "HostName=$IotHubName.azure-devices.net;DeviceId=$device3;x509=true" }
+
 	# Update Device
 	$updatedDevice1 = Set-AzIoTHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -Status 'Disabled' -StatusReason 'Reason1'
 	Assert-True { $updatedDevice1.Id -eq $device1 }
 	Assert-True { $updatedDevice1.Status -eq 'Disabled' }
 	Assert-True { $updatedDevice1.StatusReason -eq 'Reason1' }
 
 	# Update iot device to edge device
-	$updatedDevice2 = Set-AzIoTHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device3 -EdgeEnabled $true
-	Assert-True { $updatedDevice2.Capabilities.IotEdge }
+	$updatedDevice3 = Set-AzIoTHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device3 -EdgeEnabled $true
+	Assert-True { $updatedDevice3.Capabilities.IotEdge }
+
+	# Set parent device Id
+	$updatedChildDevice = Set-AzIotHubDeviceParent -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -ParentDeviceId $device3
+	Assert-False { $updatedChildDevice.Capabilities.IotEdge }
+	Assert-True { $updatedChildDevice.Id -eq $device1 }
+	Assert-True { $updatedChildDevice.Scope -eq $updatedDevice3.Scope }
+
+	# Get parent device Id
+	$parentDevice = Get-AzIotHubDeviceParent -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1
+	Assert-True { $parentDevice.Capabilities.IotEdge }
+	Assert-True { $parentDevice.Id -eq $device3 }
+	Assert-True { $updatedChildDevice.Scope -eq $updatedDevice3.Scope }
 
 	# Get device detail
 	$iotDevice = Get-AzIotHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1

src/IotHub/IotHub.Test/ScenarioTests/IotHubDPModuleTests.ps1

@@ -65,6 +65,11 @@ function Test-AzureRmIotHubModuleLifecycle
 	$modules = Get-AzIotHubModule -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1
 	Assert-True { $modules.Count -eq 2}
 
+	# Get module connection string
+	$moduleCS = Get-AzIotHubMCS -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -ModuleId $module2
+	Assert-True { $moduleCS.ModuleId -eq $module2 }
+	Assert-True { $moduleCS.ConnectionString -eq "HostName=$IotHubName.azure-devices.net;DeviceId=$device1;ModuleId=$module2;x509=true" }
+
 	# Get module detail
 	$module = Get-AzIotHubModule -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -ModuleId $module2
 	Assert-True { $module.Id -eq $module2 }