Added a fix and test for the removed-extension scenario for the Get-AzureDiskEncryptionStatus cmdlet #6861
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
markcowl
requested changes
Aug 7, 2018
| [Fact(Skip = "Updated Storage, needs re-recorded")] | ||
| [Trait(Category.RunType, Category.DesktopOnly)] | ||
| #else | ||
| [Fact(Skip = "TODO: only works for live mode due to key vault dependency")] |
There was a problem hiding this comment.
Why would it only work for live mode? KeyVault is just as mockable as network is.
markcowl
requested changes
Aug 7, 2018
| private bool isVMRunning (VirtualMachine vm) | ||
| { | ||
| string lastCode = ""; | ||
| foreach (InstanceViewStatus ivs in vm.InstanceView.Statuses) |
There was a problem hiding this comment.
Do you know that instanceView is non-null in this case?
| string lastCode = ""; | ||
| foreach (InstanceViewStatus ivs in vm.InstanceView.Statuses) | ||
| { | ||
| if (ivs.Code.StartsWith("PowerState/")) |
There was a problem hiding this comment.
Do you know that ivs.Code is non-null in this case?
| @@ -495,7 +508,7 @@ private AzureDiskEncryptionStatusContext getStatusDualPass(VirtualMachine vm) | |||
| }; | |||
| break; | |||
| case OperatingSystemTypes.Linux: | |||
| if (!IsExtensionInstalled(vm)) | |||
| if (!this.IsExtensionInstalled(vm) && this.isVMRunning(vm)) | |||
| @@ -560,7 +573,7 @@ private AzureDiskEncryptionStatusContext getStatusSinglePass(VirtualMachine vm) | |||
| AzureDiskEncryptionStatusContext status = this.GetStatusFromInstanceView(vm); | |||
|
|
|||
| // Get Data Disk status from extension for Native Disk VMs | |||
| if (isNativeDiskVM(vm)) | |||
| if ( status.DataVolumesEncrypted != EncryptionStatus.NoDiskFound && isNativeDiskVM(vm)) | |||
There was a problem hiding this comment.
GetStatusFromInstanceView can return null, so this should likely be status?.DataVolumesEncrypted
There was a problem hiding this comment.
GetStatusFromInstanceView never returns null.
|
@markcowl Any further changes needed? |
markcowl
approved these changes
Aug 9, 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.
Fixed a bug where the correct status was not reported on native disk VMs when extension was removed.
Checklist
CONTRIBUTING.mdplatyPSmodule