Skip to content
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

[Compute] Fix #27446: az vm encryption enable: Fix using incorrect client when --key-encryption-key is specified #27493

Merged
merged 2 commits into from
Oct 9, 2023
Merged

[Compute] Fix #27446: az vm encryption enable: Fix using incorrect client when --key-encryption-key is specified #27493

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
c1a45c0
Use `KeyvaultKeyClient` to handle `--key-encryption-key`
ReaNAiveD Sep 28, 2023
88f4d4f
Add record
ReaNAiveD Sep 28, 2023
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
7 changes: 6 additions & 1 deletion src/azure-cli/azure/cli/command_modules/vm/_vm_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,16 @@ def check_existence(cli_ctx, value, resource_group, provider_namespace, resource
return False


def create_keyvault_data_plane_client(cli_ctx, vault_base_url):
def create_data_plane_keyvault_certificate_client(cli_ctx, vault_base_url):
from azure.cli.command_modules.keyvault._client_factory import data_plane_azure_keyvault_certificate_client
return data_plane_azure_keyvault_certificate_client(cli_ctx, {"vault_base_url": vault_base_url})


def create_data_plane_keyvault_key_client(cli_ctx, vault_base_url):
from azure.cli.command_modules.keyvault._client_factory import data_plane_azure_keyvault_key_client
return data_plane_azure_keyvault_key_client(cli_ctx, {"vault_base_url": vault_base_url})


def get_key_vault_base_url(cli_ctx, vault_name):
suffix = cli_ctx.cloud.suffixes.keyvault_dns
return 'https://{}{}'.format(vault_name, suffix)
Expand Down
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 @@ -2894,13 +2894,13 @@ def get_vm_format_secret(cmd, secrets, certificate_store=None, keyvault=None, re

def add_vm_secret(cmd, resource_group_name, vm_name, keyvault, certificate, certificate_store=None):
from msrestazure.tools import parse_resource_id
from ._vm_utils import create_keyvault_data_plane_client, get_key_vault_base_url
from ._vm_utils import create_data_plane_keyvault_certificate_client, get_key_vault_base_url
VaultSecretGroup, SubResource, VaultCertificate = cmd.get_models(
'VaultSecretGroup', 'SubResource', 'VaultCertificate')
vm = get_vm_to_update(cmd, resource_group_name, vm_name)

if '://' not in certificate: # has a cert name rather a full url?
keyvault_client = create_keyvault_data_plane_client(
keyvault_client = create_data_plane_keyvault_certificate_client(
cmd.cli_ctx, get_key_vault_base_url(cmd.cli_ctx, parse_resource_id(keyvault)['name']))
cert_info = keyvault_client.get_certificate(certificate)
certificate = cert_info.secret_id
Expand Down
8 changes: 4 additions & 4 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 @@ -10,7 +10,7 @@
from azure.cli.core.commands import LongRunningOperation

from azure.cli.command_modules.vm.custom import set_vm, _compute_client_factory, _is_linux_os
from azure.cli.command_modules.vm._vm_utils import get_key_vault_base_url, create_keyvault_data_plane_client
from azure.cli.command_modules.vm._vm_utils import get_key_vault_base_url, create_data_plane_keyvault_key_client

_DATA_VOLUME_TYPE = 'DATA'
_ALL_VOLUME_TYPE = 'ALL'
Expand Down Expand Up @@ -363,9 +363,9 @@ def show_vm_encryption_status(cmd, resource_group_name, vm_name):

def _get_keyvault_key_url(cli_ctx, keyvault_name, key_name):
vault_base_url = get_key_vault_base_url(cli_ctx, keyvault_name)
client = create_keyvault_data_plane_client(cli_ctx, vault_base_url)
result = client.get_key(key_name)
return result.key.kid # pylint: disable=no-member
client = create_data_plane_keyvault_key_client(cli_ctx, vault_base_url)
key = client.get_key(key_name)
return key.id


def _handles_default_volume_type_for_vmss_encryption(is_linux, volume_type, force):
Expand Down
Loading