Skip to content

[Compute] Fix #31885: az vm encryption: Fix request body serialization #31894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhoxing-ms merged 2 commits into from
Jul 31, 2025
Merged

[Compute] Fix #31885: az vm encryption: Fix request body serialization #31894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53bab1f
convert uuid to str for json serialization
cxznmhdcxz Jul 30, 2025
d619774
live test
cxznmhdcxz Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/vm/disk_encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def encrypt_vm(cmd, resource_group_name, vm_name, # pylint: disable=too-many-lo
'EncryptionOperation': 'EnableEncryption' if not encrypt_format_all else 'EnableEncryptionFormatAll',
'KeyEncryptionKeyURL': key_encryption_key,
'KeyEncryptionAlgorithm': key_encryption_algorithm,
Copy link

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from integer to string conversion should be documented with a comment explaining why the string conversion is necessary for request body serialization.

Suggested change
'KeyEncryptionAlgorithm': key_encryption_algorithm,
'KeyEncryptionAlgorithm': key_encryption_algorithm,
# Convert sequence_version to a string to ensure compatibility with JSON serialization for the request body.

Copilot uses AI. Check for mistakes.
'SequenceVersion': sequence_version,
'SequenceVersion': str(sequence_version),
}
if use_new_ade:
public_config.update({
Expand Down Expand Up @@ -334,7 +334,7 @@ def decrypt_vm(cmd, resource_group_name, vm_name, volume_type=None, force=False)
public_config = {
'VolumeType': volume_type,
'EncryptionOperation': 'DisableEncryption',
Copy link

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change from integer to string conversion should be documented with a comment explaining why the string conversion is necessary for request body serialization.

Suggested change
'EncryptionOperation': 'DisableEncryption',
'EncryptionOperation': 'DisableEncryption',
# Convert sequence_version to a string because public_config is serialized into a JSON object,
# and JSON requires all values to be JSON-compatible types (e.g., strings).

Copilot uses AI. Check for mistakes.
'SequenceVersion': sequence_version,
'SequenceVersion': str(sequence_version),
}

from .operations.vm_extension import VMExtensionCreate
Expand Down
Loading
Loading