Skip to content

[Compute] Fix #33556: az vm boot-diagnostics get-boot-log: Fix TypeError with azure-mgmt-storage 25.0.0 #33872

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

Open
Pavel Dostál (pdostal) wants to merge 1 commit into
base: dev
Choose a base branch
from
+44 −2
Open

[Compute] Fix #33556: az vm boot-diagnostics get-boot-log: Fix TypeError with azure-mgmt-storage 25.0.0 #33872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def _get_disk_lun_by_aaz(data_disks):
def _get_private_config(cli_ctx, resource_group_name, storage_account):
storage_mgmt_client = _get_storage_management_client(cli_ctx)
# pylint: disable=no-member
keys = storage_mgmt_client.storage_accounts.list_keys(resource_group_name, storage_account).keys
keys = storage_mgmt_client.storage_accounts.list_keys(resource_group_name, storage_account).keys_property

private_config = {
'storageAccountName': storage_account,
Expand Down Expand Up @@ -2300,7 +2300,7 @@ def get_boot_log(cmd, resource_group_name, vm_name):
# Get account key
keys = storage_mgmt_client.storage_accounts.list_keys(rg, storage_account.name)

blob_client = BlobClient.from_blob_url(blob_url=blob_uri, credential=keys.keys[0].value)
blob_client = BlobClient.from_blob_url(blob_url=blob_uri, credential=keys.keys_property[0].value)

# our streamwriter not seekable, so no parallel.
downloader = blob_client.download_blob(max_concurrency=1)
Expand Down
42 changes: 42 additions & 0 deletions src/azure-cli/azure/cli/command_modules/vm/tests/latest/test_custom_vm_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,48 @@ class ErrorToExitCommandEarly(Exception):
except ErrorToExitCommandEarly:
get_sdk_mock.assert_called_with(cli_ctx_mock, ResourceType.DATA_STORAGE_BLOB, '_blob_client#BlobClient')

@mock.patch('azure.cli.command_modules.vm.custom.BootLogStreamWriter', autospec=True)
@mock.patch('azure.cli.command_modules.vm.custom._get_storage_management_client', autospec=True)
@mock.patch('azure.cli.command_modules.vm.custom.get_instance_view', autospec=True)
@mock.patch('azure.cli.core.profiles.get_sdk', autospec=True)
def test_vm_boot_log_uses_keys_property(self, get_sdk_mock, get_instance_view_mock,
get_storage_client_mock, stream_writer_mock):
# azure-mgmt-storage>=25.0.0 renamed the account keys list from `keys` to
# `keys_property` (`.keys` now resolves to `MutableMapping.keys`).
blob_url = 'https://mystorage.blob.core.windows.net/bootdiagnostics/vm1.serialconsole.log'
get_instance_view_mock.return_value = {
'instanceView': {
'bootDiagnostics': {'serialConsoleLogBlobUri': blob_url}
}
}

storage_account = mock.MagicMock()
storage_account.primary_endpoints.blob = 'https://mystorage.blob.core.windows.net/'
storage_account.id = '/subscriptions/sub1/resourceGroups/rg1/providers/Microsoft.Storage/storageAccounts/mystorage'
storage_account.name = 'mystorage'

storage_key = mock.MagicMock()
storage_key.value = 'the-account-key'
list_keys_result = mock.MagicMock(spec=['keys_property'])
list_keys_result.keys_property = [storage_key]

storage_client_mock = get_storage_client_mock.return_value
storage_client_mock.storage_accounts.list.return_value = [storage_account]
storage_client_mock.storage_accounts.list_keys.return_value = list_keys_result

blob_client_mock = mock.MagicMock()
blob_client_class_mock = mock.MagicMock()
blob_client_class_mock.from_blob_url.return_value = blob_client_mock
get_sdk_mock.return_value = blob_client_class_mock

cmd_mock = mock.MagicMock()
get_boot_log(cmd_mock, 'rg1', 'vm1')

blob_client_class_mock.from_blob_url.assert_called_once_with(
blob_url=blob_url, credential='the-account-key')
blob_client_mock.download_blob.assert_called_once_with(max_concurrency=1)
blob_client_mock.download_blob.return_value.readinto.assert_called_once()


class FakedVM: # pylint: disable=too-few-public-methods
def __init__(self, nics=None, disks=None, os_disk=None):
Expand Down