bug fix auth, LRO polling commands, object create by dict

scripts/sdk_process/patch_models.py

@@ -232,7 +232,7 @@ def find_autorest_generated_folder(module_prefix="azure.mgmt"):
         'azure.mgmt.network',
         'azure.mgmt.monitor',
         'azure-mgmt-loganalytics'
-        'azure-mgmt.rdbms'
+        'azure.mgmt.rdbms'
     ]
     prefix = sys.argv[1] if len(sys.argv) >= 2 else "azure.mgmt"
     for autorest_package in find_autorest_generated_folder(prefix):

src/azure-cli/azure/cli/command_modules/rdbms/_client_factory.py

@@ -26,11 +26,11 @@ def get_mariadb_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
@@ -54,11 +54,11 @@ def get_mysql_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
@@ -82,11 +82,11 @@ def get_mysql_flexible_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
@@ -110,11 +110,11 @@ def get_postgresql_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()
@@ -137,11 +137,11 @@ def get_postgresql_flexible_management_client(cli_ctx, **_):
     if rm_uri_override:
         client_id = getenv(CLIENT_ID)
         if client_id:
-            from azure.common.credentials import ServicePrincipalCredentials
-            credentials = ServicePrincipalCredentials(
+            from azure.identity import ClientSecretCredential
+            credentials = ClientSecretCredential(
                 client_id=client_id,
-                secret=getenv(CLIENT_SECRET),
-                tenant=getenv(TENANT_ID))
+                client_secret=getenv(CLIENT_SECRET),
+                tenant_id=getenv(TENANT_ID))
         else:
             from msrest.authentication import Authentication  # pylint: disable=import-error
             credentials = Authentication()

src/azure-cli/azure/cli/command_modules/rdbms/_flexible_server_util.py

@@ -109,7 +109,7 @@ def create_firewall_rule(db_context, cmd, resource_group_name, server_name, star
     firewall = firewall_rule_create_func(firewall_client, resource_group_name, server_name, firewall_rule_name=firewall_name,
                                          start_ip_address=start_ip, end_ip_address=end_ip)
 
-    return firewall.result()
+    return firewall.result().name
 
 
 # pylint: disable=inconsistent-return-statements

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

@@ -115,7 +115,7 @@ def _complex_params(command_group):
 
         with self.argument_context('{} server configuration set'.format(command_group)) as c:
             c.argument('value', help='Value of the configuration. If not provided, configuration value will be set to default.', validator=configuration_value_validator)
-            c.argument('configuration_name', options_list=['--name', '-n'], help='The name of the configuration')
+            c.argument('configuration_name', options_list=['--name', '-n'], id_part='child_name_1', help='The name of the configuration')
             c.ignore('source')
 
         with self.argument_context('{} server wait'.format(command_group)) as c:
@@ -134,7 +134,7 @@ def _complex_params(command_group):
             c.argument('server_name', id_part=None, help='Name of the Server.')
 
         with self.argument_context('{} db'.format(command_group)) as c:
-            c.argument('database_name', options_list=['--name', '-n'], help='The name of the database')
+            c.argument('database_name', options_list=['--name', '-n'], id_part='child_name_1', help='The name of the database')
             c.argument('charset', options_list=['--charset'], help='The charset of the database')
             c.argument('collation', options_list=['--collation'], help='The collation of the database')
 
@@ -162,7 +162,7 @@ def _complex_params(command_group):
 
         with self.argument_context('{} server configuration'.format(command_group)) as c:
             c.argument('server_name', options_list=['--server-name', '-s'])
-            c.argument('configuration_name', id_part='child_name_1', options_list=['--name', '-n'])
+            c.argument('configuration_name', options_list=['--name', '-n'], id_part='child_name_1')
 
         with self.argument_context('{} server replica list'.format(command_group)) as c:
             c.argument('server_name', options_list=['--server-name', '-s'], help='Name of the master server.')

src/azure-cli/azure/cli/command_modules/rdbms/_util.py

@@ -6,7 +6,6 @@
 from knack.log import get_logger
 from azure.cli.core.commands import AzArgumentContext
 from azure.cli.core.util import CLIError
-from azure.mgmt.rdbms import postgresql, mysql, mariadb
 from ._client_factory import cf_mariadb_firewall_rules, cf_postgres_firewall_rules, cf_mysql_firewall_rules
 
 logger = get_logger(__name__)
@@ -78,24 +77,10 @@ def create_firewall_rule(cmd, resource_group_name, server_name, start_ip, end_ip
     firewall_client = cf_postgres_firewall_rules(cmd.cli_ctx, None)
     if db_engine == 'mysql':
         firewall_client = cf_mysql_firewall_rules(cmd.cli_ctx, None)
-        parameters = mysql.models.FirewallRule(
-            name=firewall_name,
-            start_ip_address=start_ip,
-            end_ip_address=end_ip
-        )
     elif db_engine == 'mariadb':
         firewall_client = cf_mariadb_firewall_rules(cmd.cli_ctx, None)
-        parameters = mariadb.models.FirewallRule(
-            name=firewall_name,
-            start_ip_address=start_ip,
-            end_ip_address=end_ip
-        )
-    else:
-        parameters = postgresql.models.FirewallRule(
-            name=firewall_name,
-            start_ip_address=start_ip,
-            end_ip_address=end_ip
-        )
+
+    parameters = {'name': firewall_name, 'start_ip_address': start_ip, 'end_ip_address': end_ip}
 
     firewall = firewall_client.begin_create_or_update(resource_group_name, server_name, firewall_name, parameters)
 

src/azure-cli/azure/cli/command_modules/rdbms/commands.py

@@ -389,7 +389,7 @@ def load_command_table(self, _):
         g.show_command('show', 'get')
         g.command('list', 'list_by_server')
 
-    with self.command_group('mariadb server-logs', mariadb_log_sdk, client_factory=cf_mariadb_log,) as g:
+    with self.command_group('mariadb server-logs', mariadb_log_sdk, client_factory=cf_mariadb_log) as g:
         g.custom_command('list', '_list_log_files_with_filter')
         g.custom_command('download', '_download_log_files')
 
@@ -490,7 +490,6 @@ def load_command_table(self, _):
         g.command('list', 'list')
         g.command('delete', 'begin_delete', confirmation=True)
         g.show_command('show', 'get')
-        g.custom_wait_command('wait', 'server_ad_admin_get')
         g.wait_command('wait')
 
     with self.command_group('postgres server ad-admin',

src/azure-cli/azure/cli/command_modules/rdbms/custom.py

@@ -14,19 +14,6 @@
 from azure.cli.core.local_context import ALL
 from azure.mgmt.rdbms import postgresql, mysql, mariadb
 from azure.mgmt.rdbms.mysql.operations._servers_operations import ServersOperations as MySqlServersOperations
-from azure.mgmt.rdbms.mysql.operations._virtual_network_rules_operations import VirtualNetworkRulesOperations as MySqlVirtualNetworkRulesOperations
-from azure.mgmt.rdbms.mysql.operations._configurations_operations import ConfigurationsOperations as MySqlConfigurationsOperations
-from azure.mgmt.rdbms.mysql.operations._firewall_rules_operations import FirewallRulesOperations as MySqlFirewallRulesOperations
-
-from azure.mgmt.rdbms.mysql.operations._databases_operations import DatabasesOperations as MySqlDatabasesOperations
-from azure.mgmt.rdbms.mysql.operations._server_keys_operations import ServerKeysOperations as MySqlServerKeysOperations
-from azure.mgmt.rdbms.mysql.operations._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations as MySqlPrivateEndpointConnectionsOperations
-from azure.mgmt.rdbms.postgresql.operations._firewall_rules_operations import FirewallRulesOperations as PostgreSqlFirewallRulesOperations
-from azure.mgmt.rdbms.postgresql.operations._virtual_network_rules_operations import VirtualNetworkRulesOperations as PostgreSqlVirtualNetworkRulesOperations
-from azure.mgmt.rdbms.postgresql.operations._configurations_operations import ConfigurationsOperations as PostgreSqlConfigurationsOperations
-from azure.mgmt.rdbms.postgresql.operations._databases_operations import DatabasesOperations as PostgreSqlDatabasesOperations
-from azure.mgmt.rdbms.postgresql.operations._server_keys_operations import ServerKeysOperations as PostgreSqlServerKeysOperations
-from azure.mgmt.rdbms.postgresql.operations._private_endpoint_connections_operations import PrivateEndpointConnectionsOperations as PostgreSqlPrivateEndpointConnectionsOperations
 from azure.mgmt.rdbms.postgresql.operations._location_based_performance_tier_operations import LocationBasedPerformanceTierOperations as PostgreSQLLocationOperations
 from azure.mgmt.rdbms.mariadb.operations._servers_operations import ServersOperations as MariaDBServersOperations
 from azure.mgmt.rdbms.mariadb.operations._location_based_performance_tier_operations import LocationBasedPerformanceTierOperations as MariaDBLocationOperations
@@ -483,24 +470,9 @@ def _get_sku_name(tier, family, capacity):
 
 
 def _firewall_rule_create(client, resource_group_name, server_name, firewall_rule_name, start_ip_address, end_ip_address):
-    if isinstance(client, MySqlFirewallRulesOperations):
-        parameters = mysql.models.FirewallRule(
-            name=firewall_rule_name,
-            start_ip_address=start_ip_address,
-            end_ip_address=end_ip_address
-        )
-    elif isinstance(client, PostgreSqlFirewallRulesOperations):
-        parameters = postgresql.models.FirewallRule(
-            name=firewall_rule_name,
-            start_ip_address=start_ip_address,
-            end_ip_address=end_ip_address
-        )
-    else:
-        parameters = mariadb.models.FirewallRule(
-            name=firewall_rule_name,
-            start_ip_address=start_ip_address,
-            end_ip_address=end_ip_address
-        )
+
+    parameters = {'name': firewall_rule_name, 'start_ip_address': start_ip_address, 'end_ip_address': end_ip_address}
+
     return client.begin_create_or_update(resource_group_name, server_name, firewall_rule_name, parameters)
 
 
@@ -525,24 +497,12 @@ def _firewall_rule_update_custom_func(instance, start_ip_address=None, end_ip_ad
 
 
 def _vnet_rule_create(client, resource_group_name, server_name, virtual_network_rule_name, virtual_network_subnet_id, ignore_missing_vnet_service_endpoint=None):
-    if isinstance(client, MySqlVirtualNetworkRulesOperations):
-        parameters = mysql.models.VirtualNetworkRule(
-            name=virtual_network_rule_name,
-            virtual_network_subnet_id=virtual_network_subnet_id,
-            ignore_missing_vnet_service_endpoint=ignore_missing_vnet_service_endpoint
-        )
-    elif isinstance(client, PostgreSqlVirtualNetworkRulesOperations):
-        parameters = postgresql.models.VirtualNetworkRule(
-            name=virtual_network_rule_name,
-            virtual_network_subnet_id=virtual_network_subnet_id,
-            ignore_missing_vnet_service_endpoint=ignore_missing_vnet_service_endpoint
-        )
-    else:
-        parameters = mariadb.models.VirtualNetworkRule(
-            name=virtual_network_rule_name,
-            virtual_network_subnet_id=virtual_network_subnet_id,
-            ignore_missing_vnet_service_endpoint=ignore_missing_vnet_service_endpoint
-        )
+
+    parameters = {
+        'name': virtual_network_rule_name,
+        'virtual_network_subnet_id': virtual_network_subnet_id,
+        'ignore_missing_vnet_service_endpoint': ignore_missing_vnet_service_endpoint
+    }
 
     return client.begin_create_or_update(resource_group_name, server_name, virtual_network_rule_name, parameters)
 
@@ -569,48 +529,22 @@ def _vnet_rule_update_custom_func(instance, virtual_network_subnet_id, ignore_mi
 
 def _configuration_update(client, resource_group_name, server_name, configuration_name, value=None, source=None):
 
-    if isinstance(client, MySqlConfigurationsOperations):
-        parameters = mysql.models.Configuration(
-            name=configuration_name,
-            value=value,
-            source=source,
-        )
-    elif isinstance(client, PostgreSqlConfigurationsOperations):
-        parameters = postgresql.models.Configuration(
-            name=configuration_name,
-            value=value,
-            source=source,
-        )
-    else:
-        parameters = mariadb.models.Configuration(
-            name=configuration_name,
-            value=value,
-            source=source,
-        )
+    parameters = {
+        'name': configuration_name,
+        'value': value,
+        'source': source
+    }
 
     return client.begin_create_or_update(resource_group_name, server_name, configuration_name, parameters)
 
 
 def _db_create(client, resource_group_name, server_name, database_name, charset=None, collation=None):
 
-    if isinstance(client, MySqlDatabasesOperations):
-        parameters = mysql.models.Database(
-            name=database_name,
-            charset=charset,
-            collation=collation
-        )
-    elif isinstance(client, PostgreSqlDatabasesOperations):
-        parameters = postgresql.models.Database(
-            name=database_name,
-            charset=charset,
-            collation=collation
-        )
-    else:
-        parameters = mariadb.models.Database(
-            name=database_name,
-            charset=charset,
-            collation=collation
-        )
+    parameters = {
+        'name': database_name,
+        'charset': charset,
+        'collation': collation
+    }
 
     return client.begin_create_or_update(resource_group_name, server_name, database_name, parameters)
 
@@ -673,21 +607,10 @@ def _update_private_endpoint_connection_status(cmd, client, resource_group_name,
                                              private_endpoint_connection_name=private_endpoint_connection_name)
     new_status = 'Approved' if is_approved else 'Rejected'
 
-    if isinstance(client, MySqlPrivateEndpointConnectionsOperations):
-        private_link_service_connection_state = mysql.models.ServerPrivateLinkServiceConnectionStateProperty(
-            status=new_status,
-            description=description
-        )
-    elif isinstance(client, PostgreSqlPrivateEndpointConnectionsOperations):
-        private_link_service_connection_state = postgresql.models.ServerPrivateLinkServiceConnectionStateProperty(
-            status=new_status,
-            description=description
-        )
-    else:
-        private_link_service_connection_state = mariadb.models.ServerPrivateLinkServiceConnectionStateProperty(
-            status=new_status,
-            description=description
-        )
+    private_link_service_connection_state = {
+        'status': new_status,
+        'description': description
+    }
 
     private_endpoint_connection.private_link_service_connection_state = private_link_service_connection_state
 
@@ -721,16 +644,10 @@ def server_key_create(client, resource_group_name, server_name, kid):
 
     key_name = _get_server_key_name_from_uri(kid)
 
-    if isinstance(client, MySqlServerKeysOperations):
-        parameters = mysql.models.ServerKey(
-            uri=kid,
-            server_key_type="AzureKeyVault"
-        )
-    elif isinstance(client, PostgreSqlServerKeysOperations):
-        parameters = postgresql.models.ServerKey(
-            uri=kid,
-            server_key_type="AzureKeyVault"
-        )
+    parameters = {
+        'uri': kid,
+        'server_key_type': "AzureKeyVault"
+    }
 
     return client.begin_create_or_update(server_name, key_name, resource_group_name, parameters)
 
@@ -784,16 +701,11 @@ def server_ad_admin_set(client, resource_group_name, server_name, login=None, si
     Sets a server's AD admin.
     '''
 
-    if isinstance(client, MySqlServersOperations):
-        parameters = mysql.models.ServerAdministratorResource(
-            login=login,
-            sid=sid,
-            tenant_id=_get_tenant_id())
-    else:
-        parameters = postgresql.models.ServerAdministratorResource(
-            login=login,
-            sid=sid,
-            tenant_id=_get_tenant_id())
+    parameters = {
+        'login': login,
+        'sid': sid,
+        'tenant_id': _get_tenant_id()
+    }
 
     return client.begin_create_or_update(
         server_name=server_name,
@@ -829,10 +741,12 @@ def create_database(cmd, resource_group_name, server_name, database_name, engine
     if engine_name == 'mysql':
         # check for existing database, create if not present
         database_client = cf_mysql_db(cmd.cli_ctx, None)
-        parameters = mysql.models.Database(name=database_name, charset='utf8')
     elif engine_name == 'mariadb':
         database_client = cf_mariadb_db(cmd.cli_ctx, None)
-        parameters = mariadb.models.Database(name=database_name, charset='utf8')
+    parameters = {
+        'name': database_name,
+        'charset': 'utf8'
+    }
     try:
         database_client.get(resource_group_name, server_name, database_name)
     except ResourceNotFoundError: