Verify encryptionSettings.enabled for Windows OS enc status

Kamran Khan · Kamran Khan · commit 5c6f694b8a4c · 2016-05-25T10:56:01.000-07:00
diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/AzureDiskEncryption/GetAzureDiskEncryptionStatus.cs
@@ -70,7 +70,9 @@ private EncryptionStatus IsOsVolumeEncrypted(VirtualMachine vmParameters)
             switch (osType)
             {
                 case OSType.Windows:
-                    if (GetOsVolumeEncryptionSettings(vmParameters) != null)
+                    DiskEncryptionSettings osEncryptionSettings = GetOsVolumeEncryptionSettings(vmParameters);
+
+                    if (osEncryptionSettings != null && osEncryptionSettings.DiskEncryptionKey != null && osEncryptionSettings.Enabled == true)
                     {
                         return EncryptionStatus.Encrypted;
                     }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,9 @@ private EncryptionStatus IsOsVolumeEncrypted(VirtualMachine vmParameters)`
`70`	`70`	`switch (osType)`
`71`	`71`	`{`
`72`	`72`	`case OSType.Windows:`
`73`		`- if (GetOsVolumeEncryptionSettings(vmParameters) != null)`
	`73`	`+ DiskEncryptionSettings osEncryptionSettings = GetOsVolumeEncryptionSettings(vmParameters);`
	`74`	`+`
	`75`	`+ if (osEncryptionSettings != null && osEncryptionSettings.DiskEncryptionKey != null && osEncryptionSettings.Enabled == true)`
`74`	`76`	`{`
`75`	`77`	`return EncryptionStatus.Encrypted;`
`76`	`78`	`}`