Fix logic bug in Get-AzureRmVMDiskEncryptionStatus #6431
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SudhakaraReddyEvuri-zz
previously approved these changes
Jun 11, 2018
vladimir-shcherbakov
previously approved these changes
Jun 11, 2018
maddieclayton
suggested changes
Jun 12, 2018
| @@ -514,7 +514,7 @@ public override void ExecuteCmdlet() | |||
|
|
|||
| // retrieve encryption state using per-disk instance status and report if successful | |||
| AzureDiskEncryptionStatusContext encryptionStatus = GetStatusFromInstanceView(); | |||
| if (encryptionStatus != null && !(encryptionStatus.OsVolumeEncrypted==EncryptionStatus.Unknown || encryptionStatus.DataVolumesEncrypted==EncryptionStatus.Unknown)) | |||
| if (encryptionStatus != null && (encryptionStatus.OsVolumeEncrypted!=EncryptionStatus.Unknown || encryptionStatus.DataVolumesEncrypted!=EncryptionStatus.Unknown)) | |||
| { | |||
| encryptionStatus.ProgressMessage = progressMessage; | |||
| WriteObject(encryptionStatus); | |||
There was a problem hiding this comment.
Please revert changes to the psm1 file below.
There was a problem hiding this comment.
@maddieclayton all checks have passed with the reverted file
This reverts commit 8353869.
ejarvi
dismissed stale reviews from vladimir-shcherbakov and SudhakaraReddyEvuri-zz
via
721d3aa
maddieclayton
approved these changes
Jun 12, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes a logic bug in the case of VMs with only one encrypted volume type. In particular, VMs with an OS volume and no data disks that had been encrypted with no AAD parameters.
Checklist
CONTRIBUTING.mdplatyPSmodule