Skip to content

Commit 1751162

Browse files
Grayer123Grayer123
committed
Merge master to feature branch.
2 parents e58eab1 + d13c8e4 commit 1751162

File tree

47 files changed

+5197
-2942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+5197
-2942
lines changed

‎src/Compute/Compute/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
- New-AzDiskUpdateConfig, New-AzSnapshotUpdateConfig
3131
* Add ColocationStatus parameter to Get-AzProximityPlacementGroup cmdlet.
3232
* Fix broken example code for 'Revoke-AzSnapshotAccess' and 'Grant-AzSnapshotAccess'
33+
* Fix broken example code for 'Set-AzDiskDiskEncryptionKey' and 'Set-AzDiskKeyEncryptionKey'
3334

3435
## Version 3.3.0
3536
* Fix Set-AzVMCustomScriptExtension cmdlet for a VM with managed OD disk which does not have OS profile.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ PS C:\> $keyUrl = https://myvault.vault-int.azure-int.net/keys/456;
3131
PS C:\> $keyId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault456';
3232
PS C:\> $diskconfig = Set-AzDiskDiskEncryptionKey -Disk $diskconfig -SecretUrl $secretUrl -SourceVaultId $secretId;
3333
PS C:\> $diskconfig = Set-AzDiskKeyEncryptionKey -Disk $diskconfig -KeyUrl $keyUrl -SourceVaultId $keyId;
34+
PS C:\> $diskConfig.EncryptionSettingsCollection.EncryptionSettingsVersion = '1.1';
3435
PS C:\> New-AzDisk -ResourceGroupName 'ResourceGroup01' -DiskName 'Disk01' -Disk $diskconfig;
3536
```
3637

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ PS C:\> $keyUrl = https://myvault.vault-int.azure-int.net/keys/456;
3131
PS C:\> $keyId = '/subscriptions/0000000-0000-0000-0000-000000000000/resourceGroups/ResourceGroup01/providers/Microsoft.KeyVault/vaults/TestVault456';
3232
PS C:\> $diskconfig = Set-AzDiskDiskEncryptionKey -Disk $diskconfig -SecretUrl $secretUrl -SourceVaultId $secretId;
3333
PS C:\> $diskconfig = Set-AzDiskKeyEncryptionKey -Disk $diskconfig -KeyUrl $keyUrl -SourceVaultId $keyId;
34+
PS C:\> $diskconfig.EncryptionSettingsCollection.EncryptionSettingsVersion = '1.1';
3435
PS C:\> New-AzDisk -ResourceGroupName 'ResourceGroup01' -DiskName 'Disk01' -Disk $diskconfig;
3536
```
3637

‎src/CosmosDB/CosmosDB/Az.CosmosDB.psd1

Lines changed: 63 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 1/21/2020
6+
# Generated on: 2020-02-20
77
#
88

99
@{
@@ -12,7 +12,7 @@
1212
# RootModule = ''
1313

1414
# Version number of this module.
15-
ModuleVersion = '0.1.0'
15+
ModuleVersion = '0.1.1'
1616

1717
# Supported PSEditions
1818
CompatiblePSEditions = 'Core', 'Desktop'
@@ -74,49 +74,62 @@ NestedModules = @('Microsoft.Azure.PowerShell.Cmdlets.CosmosDB.dll')
7474
FunctionsToExport = @()
7575

7676
# 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.
77-
CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
78-
'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase',
79-
'Get-AzCosmosDBSqlDatabaseThroughput',
80-
'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger',
81-
'Get-AzCosmosDBSqlUserDefinedFunction',
82-
'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger',
83-
'Set-AzCosmosDBSqlUserDefinedFunction',
84-
'Remove-AzCosmosDBSqlStoredProcedure',
85-
'Remove-AzCosmosDBSqlTrigger',
86-
'Remove-AzCosmosDBSqlUserDefinedFunction',
87-
'New-AzCosmosDBSqlConflictResolutionPolicy',
88-
'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey',
89-
'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer',
90-
'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer',
91-
'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount',
92-
'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount',
93-
'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey',
94-
'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion',
95-
'Update-AzCosmosDBAccountFailoverPriority',
96-
'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject',
97-
'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath',
98-
'New-AzCosmosDBSqlIncludedPath', 'New-AzCosmosDBSqlIncludedPathIndex',
99-
'Get-AzCosmosDBGremlinDatabase', 'Get-AzCosmosDBGremlinDatabaseThroughput',
100-
'Get-AzCosmosDBGremlinGraph', 'Get-AzCosmosDBGremlinGraphThroughput',
101-
'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph',
102-
'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph',
103-
'New-AzCosmosDBGremlinIndexingPolicy', 'New-AzCosmosDBGremlinUniqueKey',
104-
'New-AzCosmosDBGremlinUniqueKeyPolicy', 'New-AzCosmosDBGremlinSpatialSpec',
105-
'New-AzCosmosDBGremlinCompositePath', 'New-AzCosmosDBGremlinConflictResolutionPolicy',
106-
'New-AzCosmosDBGremlinIncludedPath', 'New-AzCosmosDBGremlinIncludedPathIndex',
107-
'Get-AzCosmosDBTable', 'Get-AzCosmosDBTableThroughput',
108-
'Remove-AzCosmosDBTable', 'Set-AzCosmosDBTable',
109-
'Get-AzCosmosDBCassandraKeyspace', 'Get-AzCosmosDBCassandraKeyspaceThroughput',
110-
'Get-AzCosmosDBCassandraTable', 'Get-AzCosmosDBCassandraTableThroughput',
111-
'New-AzCosmosDBCassandraClusterKey', 'New-AzCosmosDBCassandraColumn',
112-
'New-AzCosmosDBCassandraSchema', 'Remove-AzCosmosDBCassandraKeyspace',
113-
'Remove-AzCosmosDBCassandraTable', 'Set-AzCosmosDBCassandraKeyspace',
114-
'Set-AzCosmosDBCassandraTable', 'Get-AzCosmosDBMongoDBCollection',
115-
'Get-AzCosmosDBMongoDBCollectionThroughput', 'Get-AzCosmosDBMongoDBDatabase',
116-
'Get-AzCosmosDBMongoDBDatabaseThroughput', 'Remove-AzCosmosDBMongoDBCollection',
117-
'Remove-AzCosmosDBMongoDBDatabase', 'Set-AzCosmosDBMongoDBCollection',
118-
'Set-AzCosmosDBMongoDBDatabase', 'New-AzCosmosDBMongoDBIndex'
119-
77+
CmdletsToExport = 'Get-AzCosmosDBSqlContainer',
78+
'Get-AzCosmosDBSqlContainerThroughput', 'Get-AzCosmosDBSqlDatabase',
79+
'Get-AzCosmosDBSqlDatabaseThroughput',
80+
'Get-AzCosmosDBSqlStoredProcedure', 'Get-AzCosmosDBSqlTrigger',
81+
'Get-AzCosmosDBSqlUserDefinedFunction',
82+
'Set-AzCosmosDBSqlStoredProcedure', 'Set-AzCosmosDBSqlTrigger',
83+
'Set-AzCosmosDBSqlUserDefinedFunction',
84+
'Remove-AzCosmosDBSqlStoredProcedure',
85+
'Remove-AzCosmosDBSqlTrigger',
86+
'Remove-AzCosmosDBSqlUserDefinedFunction',
87+
'New-AzCosmosDBSqlConflictResolutionPolicy',
88+
'New-AzCosmosDBSqlIndexingPolicy', 'New-AzCosmosDBSqlUniqueKey',
89+
'New-AzCosmosDBSqlUniqueKeyPolicy', 'Remove-AzCosmosDBSqlContainer',
90+
'Remove-AzCosmosDBSqlDatabase', 'Set-AzCosmosDBSqlContainer',
91+
'Set-AzCosmosDBSqlDatabase', 'New-AzCosmosDBAccount',
92+
'Remove-AzCosmosDBAccount', 'Get-AzCosmosDBAccount',
93+
'Get-AzCosmosDBAccountKey', 'New-AzCosmosDBAccountKey',
94+
'Update-AzCosmosDBAccount', 'Update-AzCosmosDBAccountRegion',
95+
'Update-AzCosmosDBAccountFailoverPriority',
96+
'New-AzCosmosDBVirtualNetworkRule', 'New-AzCosmosDBLocationObject',
97+
'New-AzCosmosDBSqlSpatialSpec', 'New-AzCosmosDBSqlCompositePath',
98+
'New-AzCosmosDBSqlIncludedPath',
99+
'New-AzCosmosDBSqlIncludedPathIndex',
100+
'Get-AzCosmosDBGremlinDatabase',
101+
'Get-AzCosmosDBGremlinDatabaseThroughput',
102+
'Get-AzCosmosDBGremlinGraph',
103+
'Get-AzCosmosDBGremlinGraphThroughput',
104+
'Remove-AzCosmosDBGremlinDatabase', 'Remove-AzCosmosDBGremlinGraph',
105+
'Set-AzCosmosDBGremlinDatabase', 'Set-AzCosmosDBGremlinGraph',
106+
'New-AzCosmosDBGremlinIndexingPolicy',
107+
'New-AzCosmosDBGremlinUniqueKey',
108+
'New-AzCosmosDBGremlinUniqueKeyPolicy',
109+
'New-AzCosmosDBGremlinSpatialSpec',
110+
'New-AzCosmosDBGremlinCompositePath',
111+
'New-AzCosmosDBGremlinConflictResolutionPolicy',
112+
'New-AzCosmosDBGremlinIncludedPath',
113+
'New-AzCosmosDBGremlinIncludedPathIndex', 'Get-AzCosmosDBTable',
114+
'Get-AzCosmosDBTableThroughput', 'Remove-AzCosmosDBTable',
115+
'Set-AzCosmosDBTable', 'Get-AzCosmosDBCassandraKeyspace',
116+
'Get-AzCosmosDBCassandraKeyspaceThroughput',
117+
'Get-AzCosmosDBCassandraTable',
118+
'Get-AzCosmosDBCassandraTableThroughput',
119+
'New-AzCosmosDBCassandraClusterKey',
120+
'New-AzCosmosDBCassandraColumn', 'New-AzCosmosDBCassandraSchema',
121+
'Remove-AzCosmosDBCassandraKeyspace',
122+
'Remove-AzCosmosDBCassandraTable',
123+
'Set-AzCosmosDBCassandraKeyspace', 'Set-AzCosmosDBCassandraTable',
124+
'Get-AzCosmosDBMongoDBCollection',
125+
'Get-AzCosmosDBMongoDBCollectionThroughput',
126+
'Get-AzCosmosDBMongoDBDatabase',
127+
'Get-AzCosmosDBMongoDBDatabaseThroughput',
128+
'Remove-AzCosmosDBMongoDBCollection',
129+
'Remove-AzCosmosDBMongoDBDatabase',
130+
'Set-AzCosmosDBMongoDBCollection', 'Set-AzCosmosDBMongoDBDatabase',
131+
'New-AzCosmosDBMongoDBIndex'
132+
120133
# Variables to export from this module
121134
# VariablesToExport = @()
122135

@@ -150,7 +163,11 @@ PrivateData = @{
150163
# IconUri = ''
151164

152165
# ReleaseNotes of this module
153-
ReleaseNotes = '* Preview release of ''Az.CosmosDB'' module'
166+
ReleaseNotes = '* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
167+
* Updated .NET SDK Version to 1.0.1
168+
- .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1
169+
* Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
170+
* Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath'
154171

155172
# Prerelease string of this module
156173
# Prerelease = ''

‎src/CosmosDB/CosmosDB/ChangeLog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,13 @@
2020

2121
## Upcoming Release
2222

23+
## Version 0.1.1
24+
* Added cmdlets for Gremlin, MongoDB, Cassandra and Table APIs.
25+
* Updated .NET SDK Version to 1.0.1
26+
- .NET SDK Version used in the CosmosDB-Account and SQL cmdlets is updated to 1.0.1
27+
* Added parameters ConflictResolutionPolicyMode, ConflictResolutionPolicyPath and ConflictResolutionPolicyPath in Set-AzCosmosDBSqlContainer.
28+
* Added new cmdlets for Sql API : New-CosmosDBSqlSpatialSpec, New-CosmosDBSqlCompositePath, New-CosmosDBSqlIncludedPathIndex, New-CosmosDBSqlIncludedPath
29+
2330
## Version 0.1.0
2431
* Preview release of `Az.CosmosDB` module
2532

‎src/CosmosDB/CosmosDB/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
[assembly: ComVisible(false)]
2626
[assembly: CLSCompliant(false)]
2727
[assembly: Guid("d90791a2-8102-47fc-8150-de25ae796eb1")]
28-
[assembly: AssemblyVersion("0.1.0")]
29-
[assembly: AssemblyFileVersion("0.1.0")]
28+
[assembly: AssemblyVersion("0.1.1")]
29+
[assembly: AssemblyFileVersion("0.1.1")]

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,20 @@ function Test-AzureRmIotHubDeviceLifecycle
7777
Assert-True { $updatedDevice1.StatusReason -eq 'Reason1' }
7878

7979
# Update iot device to edge device
80-
$updatedDevice2 = Set-AzIoTHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device3 -EdgeEnabled $true
81-
Assert-True { $updatedDevice2.Capabilities.IotEdge }
80+
$updatedDevice3 = Set-AzIoTHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device3 -EdgeEnabled $true
81+
Assert-True { $updatedDevice3.Capabilities.IotEdge }
82+
83+
# Set parent device Id
84+
$updatedChildDevice = Set-AzIotHubDeviceParent -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -ParentDeviceId $device3
85+
Assert-False { $updatedChildDevice.Capabilities.IotEdge }
86+
Assert-True { $updatedChildDevice.Id -eq $device1 }
87+
Assert-True { $updatedChildDevice.Scope -eq $updatedDevice3.Scope }
88+
89+
# Get parent device Id
90+
$parentDevice = Get-AzIotHubDeviceParent -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1
91+
Assert-True { $parentDevice.Capabilities.IotEdge }
92+
Assert-True { $parentDevice.Id -eq $device3 }
93+
Assert-True { $updatedChildDevice.Scope -eq $updatedDevice3.Scope }
8294

8395
# Get device detail
8496
$iotDevice = Get-AzIotHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1

0 commit comments

Comments
 (0)