Skip to content

{KeyVault} Fix CloudSuffixNotSetException while using az keyvault in Azure Stack and Air-Gaped Cloud #15298

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
bim-msft merged 1 commit into from
Sep 25, 2020
Merged

{KeyVault} Fix CloudSuffixNotSetException while using az keyvault in Azure Stack and Air-Gaped Cloud #15298

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
1 change: 1 addition & 0 deletions src/azure-cli-core/azure/cli/core/cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ def _arm_to_cli_mapper(arm_dict):
storage_endpoint=get_suffix('storage'),
storage_sync_endpoint=get_suffix('storageSyncEndpointSuffix', fallback_value=_get_storage_sync_endpoint(arm_dict['name'])),
keyvault_dns=get_suffix('keyVaultDns', add_dot=True),
mhsm_dns=get_suffix('mhsmDns', add_dot=True),
sql_server_hostname=sql_server_hostname,
mysql_server_endpoint=get_suffix('mysqlServerEndpoint', add_dot=True, fallback_value=get_db_server_endpoint('.mysql')),
postgresql_server_endpoint=get_suffix('postgresqlServerEndpoint', add_dot=True, fallback_value=get_db_server_endpoint('.postgres')),
Expand Down
6 changes: 5 additions & 1 deletion 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 @@ -387,7 +387,11 @@ def _get_base_url_type(cli_ctx, service):
if service == 'vault':
suffix = cli_ctx.cloud.suffixes.keyvault_dns
elif service == 'hsm':
suffix = cli_ctx.cloud.suffixes.mhsm_dns
from azure.cli.core.cloud import CloudSuffixNotSetException
try:
suffix = cli_ctx.cloud.suffixes.mhsm_dns
except CloudSuffixNotSetException: # For Azure Stack and Air-Gaped Cloud
suffix = ''

def base_url_type(name):
return 'https://{}{}'.format(name, suffix)
Expand Down