renamings

Author: nasc17

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

@@ -370,7 +370,7 @@ def cf_postgres_flexible_operations(cli_ctx, _):
     return get_postgresql_flexible_management_client(cli_ctx).flexible_server
 
 
-def cf_postgres_flexible_adadmin(cli_ctx, _):
+def cf_postgres_flexible_admin(cli_ctx, _):
     return get_postgresql_flexible_management_client(cli_ctx).administrators
 
 

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

@@ -16,7 +16,7 @@
     cf_postgres_flexible_ltr_backups,
     cf_postgres_flexible_operations,
     cf_postgres_flexible_replica,
-    cf_postgres_flexible_adadmin,
+    cf_postgres_flexible_admin,
     cf_postgres_flexible_migrations,
     cf_postgres_flexible_private_endpoint_connection,
     cf_postgres_flexible_private_endpoint_connections,
@@ -85,9 +85,9 @@ def load_flexibleserver_command_table(self, _):
         client_factory=cf_postgres_flexible_replica
     )
 
-    postgres_flexible_adadmin_sdk = CliCommandType(
+    postgres_flexible_admin_sdk = CliCommandType(
         operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#AdministratorsOperations.{}',
-        client_factory=cf_postgres_flexible_adadmin
+        client_factory=cf_postgres_flexible_admin
     )
 
     postgres_flexible_migrations_sdk = CliCommandType(
@@ -250,14 +250,14 @@ def load_flexibleserver_command_table(self, _):
         g.custom_show_command('show', 'flexible_server_identity_show')
         g.custom_command('list', 'flexible_server_identity_list')
 
-    with self.command_group('postgres flexible-server microsoft-entra-admin', postgres_flexible_adadmin_sdk,
+    with self.command_group('postgres flexible-server microsoft-entra-admin', postgres_flexible_admin_sdk,
                             custom_command_type=flexible_servers_custom_postgres,
-                            client_factory=cf_postgres_flexible_adadmin) as g:
-        g.custom_command('create', 'flexible_server_ad_admin_set', supports_no_wait=True)
-        g.custom_command('delete', 'flexible_server_ad_admin_delete', supports_no_wait=True, confirmation=True)
-        g.custom_command('list', 'flexible_server_ad_admin_list')
-        g.custom_show_command('show', 'flexible_server_ad_admin_show')
-        g.custom_wait_command('wait', 'flexible_server_ad_admin_show')
+                            client_factory=cf_postgres_flexible_admin) as g:
+        g.custom_command('create', 'flexible_server_microsoft_entra_admin_set', supports_no_wait=True)
+        g.custom_command('delete', 'flexible_server_microsoft_entra_admin_delete', supports_no_wait=True, confirmation=True)
+        g.custom_command('list', 'flexible_server_microsoft_entra_admin_list')
+        g.custom_show_command('show', 'flexible_server_microsoft_entra_admin_show')
+        g.custom_wait_command('wait', 'flexible_server_microsoft_entra_admin_show')
 
     with self.command_group('postgres flexible-server advanced-threat-protection-setting', postgres_flexible_server_threat_protection_settings_sdk,
                             custom_command_type=flexible_servers_custom_postgres,

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

@@ -1108,7 +1108,7 @@ def flexible_server_identity_show(cmd, client, resource_group_name, server_name,
 
 
 # Custom functions for ad-admin
-def flexible_server_ad_admin_set(cmd, client, resource_group_name, server_name, login, sid, principal_type=None, no_wait=False):
+def flexible_server_microsoft_entra_admin_set(cmd, client, resource_group_name, server_name, login, sid, principal_type=None, no_wait=False):
     validate_resource_group(resource_group_name)
 
     server_operations_client = cf_postgres_flexible_servers(cmd.cli_ctx, '_')
@@ -1132,7 +1132,7 @@ def _create_admin(client, resource_group_name, server_name, principal_name, sid,
     return sdk_no_wait(no_wait, client.begin_create, resource_group_name, server_name, sid, parameters)
 
 
-def flexible_server_ad_admin_delete(cmd, client, resource_group_name, server_name, sid, no_wait=False):
+def flexible_server_microsoft_entra_admin_delete(cmd, client, resource_group_name, server_name, sid, no_wait=False):
     validate_resource_group(resource_group_name)
 
     server_operations_client = cf_postgres_flexible_servers(cmd.cli_ctx, '_')
@@ -1145,15 +1145,15 @@ def flexible_server_ad_admin_delete(cmd, client, resource_group_name, server_nam
     return sdk_no_wait(no_wait, client.begin_delete, resource_group_name, server_name, sid)
 
 
-def flexible_server_ad_admin_list(client, resource_group_name, server_name):
+def flexible_server_microsoft_entra_admin_list(client, resource_group_name, server_name):
     validate_resource_group(resource_group_name)
 
     return client.list_by_server(
         resource_group_name=resource_group_name,
         server_name=server_name)
 
 
-def flexible_server_ad_admin_show(client, resource_group_name, server_name, sid):
+def flexible_server_microsoft_entra_admin_show(client, resource_group_name, server_name, sid):
     validate_resource_group(resource_group_name)
 
     return client.get(