From b8d7f51896cdcbadf8d2ddfaf451f5b236605d92 Mon Sep 17 00:00:00 2001 From: Simone Savi <16479009+simonesavi@users.noreply.github.com> Date: Wed, 5 Feb 2020 08:49:13 +0100 Subject: [PATCH 1/4] Update example to insert missing parameter The procedure provided in example work only for OS. If you try to use the same command for data disk, mounting operation in Virtual Machine will fail. The fix it was discovered during an analysis with product group. --- src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md b/src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md index ec48b898039a..08cb21217a83 100644 --- a/src/Compute/Compute/help/Set-AzDiskDiskEncryptionKey.md +++ b/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; ``` From d7623ff1e1320b1dfa367d30759d35660c5fa2c0 Mon Sep 17 00:00:00 2001 From: Simone Savi <16479009+simonesavi@users.noreply.github.com> Date: Wed, 5 Feb 2020 09:11:01 +0100 Subject: [PATCH 2/4] Update the example inserting a missing parameter Provided example works only for OS disk. If you try to mount a data disk with this configuration, the operation fail. With setting inserted in example the problem is solved. The solution it was an outcome of an analysis done with Product Group --- src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md b/src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md index 0b399b051502..ae266440b870 100644 --- a/src/Compute/Compute/help/Set-AzDiskKeyEncryptionKey.md +++ b/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; ``` From d5ddbe5ea0c25706b0715fc3fa925b33975fa02e Mon Sep 17 00:00:00 2001 From: Simone Savi <16479009+simonesavi@users.noreply.github.com> Date: Wed, 5 Feb 2020 09:33:38 +0100 Subject: [PATCH 3/4] Inserted change log update Fix broken example code for 'Set-AzDiskDiskEncryptionKey' and 'Set-AzDiskKeyEncryptionKey' --- src/Compute/Compute/ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Compute/Compute/ChangeLog.md b/src/Compute/Compute/ChangeLog.md index b2ee23ea67b0..5537f188fd97 100644 --- a/src/Compute/Compute/ChangeLog.md +++ b/src/Compute/Compute/ChangeLog.md @@ -27,6 +27,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. From 8b4dae1f5d930884fc4a538a8bcce6aca30a7e5e Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Mon, 17 Feb 2020 09:20:20 +0800 Subject: [PATCH 4/4] Update Network.sln add Sql to Network.sln --- src/Network/Network.sln | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/Network/Network.sln b/src/Network/Network.sln index 6df692440e18..1089ba780dde 100644 --- a/src/Network/Network.sln +++ b/src/Network/Network.sln @@ -22,6 +22,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ManagedServiceIdentity", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Storage", "..\Storage\Storage\Storage.csproj", "{A2591FA5-BF93-4358-9097-E6D58FE1DDC4}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sql", "..\Sql\Sql\Sql.csproj", "{F5235941-9E3A-4C98-8D69-FBBDD0E8C6F0}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Storage.Management", "..\Storage\Storage.Management\Storage.Management.csproj", "{3D03EFA7-4C10-480E-89E3-C2FDF0580AB5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{FF81DC73-B8EC-4082-8841-4FBF2B16E7CE}" @@ -74,6 +76,10 @@ Global {A2591FA5-BF93-4358-9097-E6D58FE1DDC4}.Debug|Any CPU.Build.0 = Debug|Any CPU {A2591FA5-BF93-4358-9097-E6D58FE1DDC4}.Release|Any CPU.ActiveCfg = Release|Any CPU {A2591FA5-BF93-4358-9097-E6D58FE1DDC4}.Release|Any CPU.Build.0 = Release|Any CPU + {F5235941-9E3A-4C98-8D69-FBBDD0E8C6F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F5235941-9E3A-4C98-8D69-FBBDD0E8C6F0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F5235941-9E3A-4C98-8D69-FBBDD0E8C6F0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F5235941-9E3A-4C98-8D69-FBBDD0E8C6F0}.Release|Any CPU.Build.0 = Release|Any CPU {3D03EFA7-4C10-480E-89E3-C2FDF0580AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3D03EFA7-4C10-480E-89E3-C2FDF0580AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU {3D03EFA7-4C10-480E-89E3-C2FDF0580AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU