Skip to content

[SQL] Upgrade azure-mgmt-sql to 0.26.0 #16618

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 27 commits into from
Jan 27, 2021
Merged

[SQL] Upgrade azure-mgmt-sql to 0.26.0 #16618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5d752a9
Add PublicNetworkAccess to Create and Update Server
emgu-ms Feb 28, 2020
9c0c2c7
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
emgu-ms Feb 28, 2020
99f273f
Merge branch 'dev' of https://github.com/Azure/azure-cli into dev
emgu-ms Mar 5, 2020
75a7998
Merge pull request #1 from Azure/dev
OlegSternbergIBM Oct 1, 2020
f530b90
Merge pull request #2 from Azure/dev
OlegSternbergIBM Oct 9, 2020
e2e5cff
Merge pull request #4 from Azure/dev
OlegSternbergIBM Dec 16, 2020
2c39056
Merge pull request #5 from Azure/dev
OlegSternbergIBM Jan 14, 2021
71a2d1b
Merge from upstream
emgu-ms Jan 21, 2021
a3235c1
rerun test
Juliehzl Jan 21, 2021
dc08175
Fix test_sql_server_public_network_access_update_mgmt test
emgu-ms Jan 22, 2021
68682b7
Remove left in testing
emgu-ms Jan 22, 2021
2988242
revert failed test recordings
Juliehzl Jan 22, 2021
6c3565f
Merge branch 'emgu/FixPublicNetworkAccessTest' into sql
Juliehzl Jan 22, 2021
6c2d033
fix recorded tests
Jan 22, 2021
bfe06b8
Merge branch 'fix_recorded_tests_sql_0_26_0' into sql
Juliehzl Jan 22, 2021
e2bd0bf
fix additional tests
Jan 22, 2021
9b48372
fix additional tests
Jan 22, 2021
7640716
use highAvailabilityReplicaCount
Jan 22, 2021
e9b1155
fixed additional recorded tests
Jan 23, 2021
2df75f9
Merge branch 'fix_recorded_tests_sql_0_26_0' into sql
Juliehzl Jan 25, 2021
b405f53
fixed test_sql_db_import_export_mgmt
Jan 25, 2021
2d8a050
* move 'db_import' under correct group
Jan 25, 2021
96b2f4e
Merge branch 'fix_recorded_tests_sql_0_26_0' into sql
Juliehzl Jan 26, 2021
07f1b23
Fix read_replica_count
bradrich-msft Jan 25, 2021
e1eccf8
apply Oleg's change
Juliehzl Jan 26, 2021
128fa3e
fixed test_sql_db_restore.yaml
Jan 26, 2021
0b8e264
test_sql_db_mgmt fix
bradrich-msft Jan 26, 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
4 changes: 2 additions & 2 deletions src/azure-cli/azure/cli/command_modules/sql/_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def _configure_db_dw_params(arg_ctx):
arg_ctx.argument('read_scale',
arg_type=read_scale_param_type)

arg_ctx.argument('read_replica_count',
arg_ctx.argument('high_availability_replica_count',
arg_type=read_replicas_param_type)
Comment on lines +350 to 351
Copy link
Member

@evelyn-ys evelyn-ys Jan 27, 2021

Choose a reason for hiding this comment

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

Should Line537 be renamed too?

azure-cli/src/azure-cli/azure/cli/command_modules/sql/_params.py

Lines 537 to 539 in 6ab0ebf

arg_ctx.argument('read_replica_count',
options_list=['--read-replica-count'],
deprecate_info=arg_ctx.deprecate(hide=True))


creation_arg_group = 'Creation'
Expand Down Expand Up @@ -460,7 +460,7 @@ def _configure_db_dw_create_params(
'min_capacity',
'compute_model',
'read_scale',
'read_replica_count',
'high_availability_replica_count',
'storage_account_type'
])

Expand Down
4 changes: 0 additions & 4 deletions src/azure-cli/azure/cli/command_modules/sql/_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ def get_sql_databases_operations(cli_ctx, _):
return get_sql_management_client(cli_ctx).databases


def get_sql_import_export_operations(cli_ctx, _):
return get_sql_management_client(cli_ctx).import_export


def get_sql_database_operations_operations(cli_ctx, _):
return get_sql_management_client(cli_ctx).database_operations

Expand Down
12 changes: 1 addition & 11 deletions src/azure-cli/azure/cli/command_modules/sql/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@
get_sql_subscription_usages_operations,
get_sql_virtual_clusters_operations,
get_sql_virtual_network_rules_operations,
get_sql_instance_failover_groups_operations,
get_sql_import_export_operations
get_sql_instance_failover_groups_operations
)

from ._validators import (
Expand Down Expand Up @@ -107,10 +106,6 @@ def load_command_table(self, _):
operations_tmpl='azure.mgmt.sql.operations#DatabasesOperations.{}',
client_factory=get_sql_databases_operations)

import_export_operations = CliCommandType(
operations_tmpl='azure.mgmt.sql.operations#ImportExportOperations.{}',
client_factory=get_sql_import_export_operations)

database_lro_transform = LongRunningOperationResultTransform(
self.cli_ctx, db_transform)

Expand Down Expand Up @@ -149,11 +144,6 @@ def load_command_table(self, _):
table_transformer=db_table_format)

g.custom_command('export', 'db_export')

with self.command_group('sql db',
import_export_operations,
client_factory=get_sql_import_export_operations) as g:

g.custom_command('import', 'db_import')

capabilities_operations = CliCommandType(
Expand Down
6 changes: 3 additions & 3 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 @@ -1345,7 +1345,7 @@ def db_update(
family=None,
capacity=None,
read_scale=None,
read_replica_count=None,
high_availability_replica_count=None,
min_capacity=None,
auto_pause_delay=None,
compute_model=None,
Expand Down Expand Up @@ -1426,8 +1426,8 @@ def db_update(
if read_scale is not None:
instance.read_scale = read_scale

if read_replica_count is not None:
instance.read_replica_count = read_replica_count
if high_availability_replica_count is not None:
instance.high_availability_replica_count = high_availability_replica_count

# Set storage_account_type even if storage_acount_type is None
# Otherwise, empty value defaults to current storage_account_type
Expand Down
192 changes: 96 additions & 96 deletions src/azure-cli/azure/cli/command_modules/sql/tests/latest/recordings/test_aad_admin.yaml
View file
Open in desktop

Large diffs are not rendered by default.

204 changes: 102 additions & 102 deletions src/azure-cli/azure/cli/command_modules/sql/tests/latest/recordings/test_aadonly.yaml
View file
Open in desktop

Large diffs are not rendered by default.

23,795 changes: 19,359 additions & 4,436 deletions ...zure-cli/azure/cli/command_modules/sql/tests/latest/recordings/test_sql_capabilities.yaml
View file
Open in desktop

Large diffs are not rendered by default.

Loading