Skip to content

{Keyvault} Bump sdk version to 10.2.2 with sdk fix #26499

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
calvinhzy merged 3 commits into from
May 25, 2023
Merged

{Keyvault} Bump sdk version to 10.2.2 with sdk fix #26499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4acc3f6
bump version with sdk fix
calvinhzy May 22, 2023
4945d43
revert back cli changes for sdk version 2016-10-01 breaking changes
calvinhzy May 22, 2023
614a3e7
try fix with 10.2.2
calvinhzy May 25, 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
6 changes: 1 addition & 5 deletions src/azure-cli/azure/cli/command_modules/keyvault/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,7 @@ def _get_resource_group_from_resource_name(cli_ctx, vault_name, hsm_name=None):

if vault_name:
client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_KEYVAULT).vaults
if cli_ctx.cloud.profile == 'latest':
vaults = client.list()
else:
vaults = client.list(filter="resourceType eq 'Microsoft.KeyVault/vaults'", api_version='2015-11-01')
for vault in vaults:
for vault in client.list():
id_comps = parse_resource_id(vault.id)
if id_comps.get('name', None) and id_comps['name'].lower() == vault_name.lower():
return id_comps['resource_group']
Expand Down
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/keyvault/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,7 @@ def create_vault(cmd, client, # pylint: disable=too-many-locals, too-many-state
KeyPermissions.delete,
KeyPermissions.list,
KeyPermissions.update,
KeyPermissions.IMPORT,
KeyPermissions.import_enum,
KeyPermissions.backup,
KeyPermissions.restore,
KeyPermissions.recover],
Expand All @@ -717,7 +717,7 @@ def create_vault(cmd, client, # pylint: disable=too-many-locals, too-many-state
CertificatePermissions.list,
CertificatePermissions.delete,
CertificatePermissions.create,
CertificatePermissions.IMPORT,
CertificatePermissions.import_enum,
CertificatePermissions.update,
CertificatePermissions.managecontacts,
CertificatePermissions.getissuers,
Expand Down
6 changes: 3 additions & 3 deletions src/azure-cli/azure/cli/command_modules/servicefabric/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,7 +1652,7 @@ def _create_keyvault(cmd,
KeyPermissions.delete,
KeyPermissions.list,
KeyPermissions.update,
KeyPermissions.IMPORT,
KeyPermissions.import_enum,
KeyPermissions.backup,
KeyPermissions.restore],
secrets=[SecretPermissions.get,
Expand All @@ -1666,7 +1666,7 @@ def _create_keyvault(cmd,
CertificatePermissions.list,
CertificatePermissions.delete,
CertificatePermissions.create,
CertificatePermissions.IMPORT,
CertificatePermissions.import_enum,
CertificatePermissions.update,
CertificatePermissions.managecontacts,
CertificatePermissions.getissuers,
Expand All @@ -1690,7 +1690,7 @@ def _create_keyvault(cmd,
permissions=permissions)]

properties = VaultProperties(tenant_id=tenant_id,
sku=KeyVaultSku(name=sku, family='A'),
sku=KeyVaultSku(name=sku),
access_policies=access_policies,
vault_uri=None,
enabled_for_deployment=enabled_for_deployment,
Expand Down
6 changes: 1 addition & 5 deletions src/azure-cli/azure/cli/command_modules/vm/_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,7 @@ def _get_resource_group_from_vault_name(cli_ctx, vault_name):
from azure.cli.core.commands.client_factory import get_mgmt_service_client
from msrestazure.tools import parse_resource_id
client = get_mgmt_service_client(cli_ctx, ResourceType.MGMT_KEYVAULT).vaults
if cli_ctx.cloud.profile == 'latest':
vaults = client.list()
else:
vaults = client.list(filter="resourceType eq 'Microsoft.KeyVault/vaults'", api_version='2015-11-01')
for vault in vaults:
for vault in client.list():
id_comps = parse_resource_id(vault.id)
if id_comps['name'] == vault_name:
return id_comps['resource_group']
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Darwin.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ azure-mgmt-imagebuilder==1.2.0
azure-mgmt-iotcentral==10.0.0b1
azure-mgmt-iothub==2.3.0
azure-mgmt-iothubprovisioningservices==1.1.0
azure-mgmt-keyvault==10.2.0
azure-mgmt-keyvault==10.2.2
azure-mgmt-kusto==0.3.0
azure-mgmt-loganalytics==13.0.0b4
azure-mgmt-managementgroups==1.0.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.Linux.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ azure-mgmt-imagebuilder==1.2.0
azure-mgmt-iotcentral==10.0.0b1
azure-mgmt-iothub==2.3.0
azure-mgmt-iothubprovisioningservices==1.1.0
azure-mgmt-keyvault==10.2.0
azure-mgmt-keyvault==10.2.2
azure-mgmt-kusto==0.3.0
azure-mgmt-loganalytics==13.0.0b4
azure-mgmt-managementgroups==1.0.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/requirements.py3.windows.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ azure-mgmt-imagebuilder==1.2.0
azure-mgmt-iotcentral==10.0.0b1
azure-mgmt-iothub==2.3.0
azure-mgmt-iothubprovisioningservices==1.1.0
azure-mgmt-keyvault==10.2.0
azure-mgmt-keyvault==10.2.2
azure-mgmt-kusto==0.3.0
azure-mgmt-loganalytics==13.0.0b4
azure-mgmt-managementgroups==1.0.0
Expand Down
2 changes: 1 addition & 1 deletion src/azure-cli/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
'azure-mgmt-iotcentral~=10.0.0b1',
'azure-mgmt-iothub==2.3.0',
'azure-mgmt-iothubprovisioningservices==1.1.0',
'azure-mgmt-keyvault==10.2.0',
'azure-mgmt-keyvault==10.2.2',
'azure-mgmt-kusto~=0.3.0',
'azure-mgmt-loganalytics==13.0.0b4',
'azure-mgmt-managedservices~=1.0',
Expand Down