Skip to content

[Synapse] az synapse sql pool create/restore: Add parameters --storage-type to support specifying storage account type #20553

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
evelyn-ys merged 2 commits into from
Dec 7, 2021
Merged

[Synapse] az synapse sql pool create/restore: Add parameters --storage-type to support specifying storage account type #20553

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
f9c77dd
Update the parameters of "SQL pool create" and "SQL pool restore" com…
WenqiChen001415 Sep 3, 2021
14aacf9
delete "cancle a trigger" case
WenqiChen001415 Dec 2, 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
11 changes: 11 additions & 0 deletions src/azure-cli/azure/cli/command_modules/synapse/manual/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,11 @@ def load_arguments(self, _):
c.argument('source_database_id', help='The source database id.')
c.argument('recoverable_database_id', help='The recoverable database id.')
c.argument('tags', arg_type=tags_type)
c.argument('storage_account_type',
options_list=['--storage-type'],
arg_group=storage_arg_group,
help='The Storage Account Type.',
arg_type=get_enum_type(['GRS', 'LRS']))

with self.argument_context('synapse sql pool update') as c:
c.argument('sku_name', options_list=['--performance-level'], help='The performance level.')
Expand All @@ -224,6 +229,12 @@ def load_arguments(self, _):
c.argument('performance_level', help='The performance level.')
c.argument('destination_name', options_list=['--dest-name', '--destination-name'],
help='Name of the sql pool that will be created as the restore destination.')
c.argument('storage_account_type',
options_list=['--storage-type'],
arg_group=storage_arg_group,
help='The Storage Account Type.',
arg_type=get_enum_type(['GRS', 'LRS']))
c.argument('tags', arg_type=tags_type)

restore_point_arg_group = 'Restore Point'
c.argument('restore_point_in_time',
Expand Down
10 changes: 6 additions & 4 deletions src/azure-cli/azure/cli/command_modules/synapse/manual/operations/sqlpool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,15 @@

# Synapse sqlpool
def create_sql_pool(cmd, client, resource_group_name, workspace_name, sql_pool_name, performance_level, tags=None,
no_wait=False):
storage_account_type=None, no_wait=False):
workspace_client = cf_synapse_client_workspace_factory(cmd.cli_ctx)
workspace_object = workspace_client.get(resource_group_name, workspace_name)
location = workspace_object.location

sku = Sku(name=performance_level)

sql_pool_info = SqlPool(sku=sku, location=location, create_mode=SynapseSqlCreateMode.Default, tags=tags)
sql_pool_info = SqlPool(sku=sku, location=location, create_mode=SynapseSqlCreateMode.Default,
storage_account_type=storage_account_type, tags=tags)

return sdk_no_wait(no_wait, client.begin_create, resource_group_name, workspace_name, sql_pool_name, sql_pool_info)

Expand All @@ -32,7 +33,7 @@ def update_sql_pool(cmd, client, resource_group_name, workspace_name, sql_pool_n

def restore_sql_pool(cmd, client, resource_group_name, workspace_name, sql_pool_name, destination_name,
performance_level=None, restore_point_in_time=None, source_database_deletion_date=None,
no_wait=False, **kwargs):
storage_account_type=None, tags=None, no_wait=False, **kwargs):
"""
Restores an existing or deleted SQL pool (i.e. create with 'Restore'
or 'PointInTimeRestore' create mode.)
Expand All @@ -58,7 +59,8 @@ def restore_sql_pool(cmd, client, resource_group_name, workspace_name, sql_pool_

sku = Sku(name=performance_level)
dest_sql_pool_info = SqlPool(sku=sku, location=source_sql_pool_info.location, create_mode=create_mode,
restore_point_in_time=restore_point_in_time, source_database_id=source_database_id)
restore_point_in_time=restore_point_in_time, storage_account_type=storage_account_type,
source_database_id=source_database_id, tags=tags)

return sdk_no_wait(no_wait, client.begin_create, resource_group_name, workspace_name, destination_name,
dest_sql_pool_info)
Expand Down
30 changes: 19 additions & 11 deletions src/azure-cli/azure/cli/command_modules/synapse/tests/latest/test_synapse_scenario.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,8 @@ def test_sql_pool(self):
'location': 'eastus',
'workspace': 'testsynapseworkspace',
'sql-pool': self.create_random_name(prefix='testsqlpool', length=15),
'performance-level': 'DW400c'
'performance-level': 'DW400c',
'storage-type': 'GRS'
})

# create a workspace
Expand All @@ -1336,11 +1337,12 @@ def test_sql_pool(self):
# create sql pool
sql_pool = self.cmd(
'az synapse sql pool create --name {sql-pool} --performance-level {performance-level} '
'--workspace {workspace} --resource-group {rg}', checks=[
'--workspace {workspace} --resource-group {rg} --storage-type {storage-type}', checks=[
self.check('name', self.kwargs['sql-pool']),
self.check('type', 'Microsoft.Synapse/workspaces/sqlPools'),
self.check('provisioningState', 'Succeeded'),
self.check('status', 'Online')
self.check('status', 'Online'),
self.check('storageAccountType', 'GRS')
]).get_output_in_json()

self.kwargs['pool-id'] = sql_pool['id']
Expand Down Expand Up @@ -1514,7 +1516,8 @@ def test_sql_pool_tde(self):
self.kwargs.update({
'location': 'eastus',
'sql-pool': self.create_random_name(prefix='testsqlpool', length=15),
'performance-level': 'DW400c'
'performance-level': 'DW400c',
'storage-type': 'GRS'
})

# create a workspace
Expand All @@ -1523,11 +1526,12 @@ def test_sql_pool_tde(self):
# create sql pool
self.cmd(
'az synapse sql pool create --name {sql-pool} --performance-level {performance-level} '
'--workspace {workspace} --resource-group {rg}', checks=[
'--workspace {workspace} --resource-group {rg} --storage-type {storage-type}', checks=[
self.check('name', self.kwargs['sql-pool']),
self.check('type', 'Microsoft.Synapse/workspaces/sqlPools'),
self.check('provisioningState', 'Succeeded'),
self.check('status', 'Online')
self.check('status', 'Online'),
self.check('storageAccountType', 'GRS')
]).get_output_in_json()

self.cmd(
Expand All @@ -1549,7 +1553,8 @@ def test_sql_pool_threat_policy(self):
'location': 'eastus',
'sql-pool': self.create_random_name(prefix='testsqlpool', length=15),
'performance-level': 'DW400c',
'threat-policy': 'threatpolicy'
'threat-policy': 'threatpolicy',
'storage-type': 'GRS'
})

# create a workspace
Expand All @@ -1558,11 +1563,12 @@ def test_sql_pool_threat_policy(self):
# create sql pool
self.cmd(
'az synapse sql pool create --name {sql-pool} --performance-level {performance-level} '
'--workspace {workspace} --resource-group {rg}', checks=[
'--workspace {workspace} --resource-group {rg} --storage-type {storage-type}', checks=[
self.check('name', self.kwargs['sql-pool']),
self.check('type', 'Microsoft.Synapse/workspaces/sqlPools'),
self.check('provisioningState', 'Succeeded'),
self.check('status', 'Online')
self.check('status', 'Online'),
self.check('storageAccountType', 'GRS')
]).get_output_in_json()

self.cmd('az synapse sql pool threat-policy update --state Enabled --storage-account {storage-account} '
Expand Down Expand Up @@ -1754,6 +1760,7 @@ def test_sql_pool_audit_policy_logentry_eventhub(self):
'eventhub_name': self.create_random_name("ehsrv", 20),
'eventhub_namespace': self.create_random_name("ehnamespace", 20),
'eventhub_auth_rule': self.create_random_name("ehauthruledb", 20),
'storage-type': 'GRS'
})

# create a workspace
Expand All @@ -1762,11 +1769,12 @@ def test_sql_pool_audit_policy_logentry_eventhub(self):
# create sql pool
sql_pool = self.cmd(
'az synapse sql pool create --name {sql-pool} --performance-level {performance-level} '
'--workspace {workspace} --resource-group {rg}', checks=[
'--workspace {workspace} --resource-group {rg} --storage-type {storage-type}', checks=[
self.check('name', self.kwargs['sql-pool']),
self.check('type', 'Microsoft.Synapse/workspaces/sqlPools'),
self.check('provisioningState', 'Succeeded'),
self.check('status', 'Online')
self.check('status', 'Online'),
self.check('storageAccountType', 'GRS')
]).get_output_in_json()

self.kwargs['storage-endpoint'] = self._get_storage_endpoint(self.kwargs['storage-account'], self.kwargs['rg'])
Expand Down