Skip to content

[SQL] Add managed hsm regex match to SQL #15109

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
Juliehzl merged 7 commits into from
Jan 15, 2021
Merged

[SQL] Add managed hsm regex match to SQL #15109

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39cf0f8
add managed hsm regex
yuerenwa Sep 9, 2020
fbe751c
Update custom.py
Yueren-Wang Jan 12, 2021
10cc707
Update custom.py
Yueren-Wang Jan 12, 2021
afde317
Update custom.py
Yueren-Wang Jan 14, 2021
fe0d930
Update custom.py
Yueren-Wang Jan 14, 2021
3b49015
fix style
Juliehzl Jan 14, 2021
145c073
fix rdbms style
Juliehzl Jan 14, 2021
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
8 changes: 4 additions & 4 deletions src/azure-cli/azure/cli/command_modules/rdbms/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,11 +536,11 @@ def _get_server_key_name_from_uri(uri):
'''
import re

match = re.match(r'^https(.)+\.vault(.)+\/keys\/[^\/]+\/[0-9a-zA-Z]+$', uri)

match = re.match(r'https://(.)+\.(managedhsm.azure.net|managedhsm-preview.azure.net|vault.azure.net|vault-int.azure-int.net|vault.azure.cn|managedhsm.azure.cn|vault.usgovcloudapi.net|managedhsm.usgovcloudapi.net|vault.microsoftazure.de|managedhsm.microsoftazure.de|vault.cloudapi.eaglex.ic.gov|vault.cloudapi.microsoft.scloud)(:443)?\/keys/[^\/]+\/[0-9a-zA-Z]+$', uri)
Copy link
Contributor

@Juliehzl Juliehzl Jan 14, 2021

Choose a reason for hiding this comment

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

please add comment to clarify what you do for regex.

Copy link
Contributor

@Juliehzl Juliehzl Jan 14, 2021

Choose a reason for hiding this comment

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

Do you support Azure Stack cloud? It seems with your current regex, only some known could are supported. If there are new cloud supported, you will need to change the regex here, right?

Copy link
Contributor Author

@Yueren-Wang Yueren-Wang Jan 14, 2021

Choose a reason for hiding this comment

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

currently we do not support Azure stack.

if match is None:
raise CLIError('The provided uri is invalid. Please provide a valid Azure Key Vault key id. For example: '
'"https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901"')
raise CLIError('The provided uri is invalid. Please provide a valid Azure Key Vault key id. For example: '
'"https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901" or "https://YourManagedHsmRegion.YourManagedHsmName.managedhsm.azure.net/keys/YourKeyName/01234567890123456789012345678901"')

vault = uri.split('.')[0].split('/')[-1]
key = uri.split('/')[-2]
Expand Down
6 changes: 4 additions & 2 deletions src/azure-cli/azure/cli/command_modules/sql/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,6 +2526,7 @@ def server_key_delete(
key_name=key_name)


# pylint: disable=line-too-long
def _get_server_key_name_from_uri(uri):
'''
Gets the key's name to use as a SQL server key.
Expand All @@ -2535,11 +2536,12 @@ def _get_server_key_name_from_uri(uri):
'''
import re

match = re.match(r'^https(.)+\.vault(.)+\/keys\/[^\/]+\/[0-9a-zA-Z]+$', uri)
match = re.match(r'https://(.)+\.(managedhsm.azure.net|managedhsm-preview.azure.net|vault.azure.net|vault-int.azure-int.net|vault.azure.cn|managedhsm.azure.cn|vault.usgovcloudapi.net|managedhsm.usgovcloudapi.net|vault.microsoftazure.de|managedhsm.microsoftazure.de|vault.cloudapi.eaglex.ic.gov|vault.cloudapi.microsoft.scloud)(:443)?\/keys/[^\/]+\/[0-9a-zA-Z]+$', uri)

if match is None:
raise CLIError('The provided uri is invalid. Please provide a valid Azure Key Vault key id. For example: '
'"https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901"')
'"https://YourVaultName.vault.azure.net/keys/YourKeyName/01234567890123456789012345678901" '
'or "https://YourManagedHsmRegion.YourManagedHsmName.managedhsm.azure.net/keys/YourKeyName/01234567890123456789012345678901"')

vault = uri.split('.')[0].split('/')[-1]
key = uri.split('/')[-2]
Expand Down