{RDBMS} Update Python SDK for PostgreSQL flexible servers to stable version API to 2024-08-01 (#30151)

* Update to azure-mgmt-postgresqlflexibleservers

* Update test

* mitigate subprocess security issue and update tests

* Update tests

* retry test after merge

Author: nasc17

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

@@ -111,7 +111,7 @@ def get_postgresql_management_client(cli_ctx, **_):
 
 def get_postgresql_flexible_management_client(cli_ctx, subscription_id=None, **_):
     from os import getenv
-    from azure.mgmt.rdbms.postgresql_flexibleservers import PostgreSQLManagementClient
+    from azure.mgmt.postgresqlflexibleservers import PostgreSQLManagementClient
     # Allow overriding resource manager URI using environment variable
     # for testing purposes. Subscription id is also determined by environment
     # variable.

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

@@ -16,7 +16,7 @@
 from knack.log import get_logger
 from knack.prompting import prompt_y_n, NoTTYException
 from azure.mgmt.core.tools import parse_resource_id
-from azure.cli.core.util import CLIError
+from azure.cli.core.util import CLIError, run_cmd
 from azure.cli.core.azclierror import AuthenticationError
 from azure.core.exceptions import HttpResponseError
 from azure.core.paging import ItemPaged
@@ -325,13 +325,6 @@ def run_subprocess(command, stdout_show=None):
         logger.warning(process.stderr.read().strip().decode('UTF-8'))
 
 
-def run_subprocess_get_output(command):
-    commands = command.split()
-    process = subprocess.Popen(commands, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    process.wait()
-    return process
-
-
 def register_credential_secrets(cmd, database_engine, server, repository):
     logger.warning('Adding secret "AZURE_CREDENTIALS" to github repository')
     resource_group = parse_resource_id(server.id)["resource_group"]
@@ -375,8 +368,8 @@ def fill_action_template(cmd, database_engine, server, database_name, administra
     if not os.path.exists(action_dir):
         os.makedirs(action_dir)
 
-    process = run_subprocess_get_output("gh secret list --repo {}".format(repository))
-    github_secrets = process.stdout.read().strip().decode('UTF-8')
+    process = run_cmd(["gh", "secret", "list", "--repo", repository], capture_output=True)
+    github_secrets = process.stdout.strip().decode('UTF-8')
     # connection_string = AZURE_POSTGRESQL_CONNECTION_STRING if database_engine == 'postgresql' else AZURE_MYSQL_CONNECTION_STRING
 
     if AZURE_CREDENTIALS not in github_secrets:
@@ -417,8 +410,8 @@ def fill_action_template(cmd, database_engine, server, database_name, administra
 
 
 def get_git_root_dir():
-    process = run_subprocess_get_output("git rev-parse --show-toplevel")
-    return process.stdout.read().strip().decode('UTF-8')
+    process = run_cmd(["git", "rev-parse", "--show-toplevel"], capture_output=True)
+    return process.stdout.strip().decode('UTF-8')
 
 
 def get_user_confirmation(message, yes=False):

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

@@ -39,22 +39,22 @@
 def load_flexibleserver_command_table(self, _):
     # Flexible server SDKs:
     postgres_flexible_servers_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#ServersOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#ServersOperations.{}',
         client_factory=cf_postgres_flexible_servers
     )
 
     postgres_flexible_firewall_rule_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#FirewallRulesOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#FirewallRulesOperations.{}',
         client_factory=cf_postgres_flexible_firewall_rules
     )
 
     postgres_flexible_config_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#ConfigurationsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#ConfigurationsOperations.{}',
         client_factory=cf_postgres_flexible_config
     )
 
     postgres_flexible_db_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#DatabasesOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#DatabasesOperations.{}',
         client_factory=cf_postgres_flexible_db
     )
 
@@ -64,52 +64,52 @@ def load_flexibleserver_command_table(self, _):
     )
 
     postgres_flexible_backups_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#BackupsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#BackupsOperations.{}',
         client_factory=cf_postgres_flexible_backups
     )
 
     postgres_flexible_replica_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#ReplicasOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#ReplicasOperations.{}',
         client_factory=cf_postgres_flexible_replica
     )
 
     postgres_flexible_adadmin_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#AdministratorsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#AdministratorsOperations.{}',
         client_factory=cf_postgres_flexible_adadmin
     )
 
     postgres_flexible_migrations_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#MigrationsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#MigrationsOperations.{}',
         client_factory=cf_postgres_flexible_migrations
     )
 
     postgres_flexible_virtual_endpoints_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#VirtualEndpointsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#VirtualEndpointsOperations.{}',
         client_factory=cf_postgres_flexible_virtual_endpoints
     )
 
     postgres_flexible_server_threat_protection_settings_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#ServerThreatProtectionSettingsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#ServerThreatProtectionSettingsOperations.{}',
         client_factory=cf_postgres_flexible_server_threat_protection_settings
     )
 
     postgres_flexible_server_log_files_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#LogFilesOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#LogFilesOperations.{}',
         client_factory=cf_postgres_flexible_server_log_files
     )
 
     postgres_flexible_server_private_endpoint_connection_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#PrivateEndpointConnectionOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#PrivateEndpointConnectionOperations.{}',
         client_factory=cf_postgres_flexible_private_endpoint_connection
     )
 
     postgres_flexible_server_private_endpoint_connections_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#PrivateEndpointConnectionsOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#PrivateEndpointConnectionsOperations.{}',
         client_factory=cf_postgres_flexible_private_endpoint_connections
     )
 
     postgres_flexible_server_private_link_resources_sdk = CliCommandType(
-        operations_tmpl='azure.mgmt.rdbms.postgresql_flexibleservers.operations#PrivateLinkResourcesOperations.{}',
+        operations_tmpl='azure.mgmt.postgresqlflexibleservers.operations#PrivateLinkResourcesOperations.{}',
         client_factory=cf_postgres_flexible_private_link_resources
     )
 

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

@@ -11,11 +11,10 @@
 from knack.log import get_logger
 from knack.util import CLIError
 from urllib.request import urlretrieve
-from azure.cli.core.util import sdk_no_wait
-from azure.cli.core.util import user_confirmation
+from azure.cli.core.util import sdk_no_wait, user_confirmation, run_cmd
 from azure.cli.core.azclierror import ClientRequestError, RequiredArgumentMissingError
 from ._client_factory import cf_postgres_flexible_replica
-from ._flexible_server_util import run_subprocess, run_subprocess_get_output, \
+from ._flexible_server_util import run_subprocess, \
     fill_action_template, get_git_root_dir, resolve_poller, GITHUB_ACTION_PATH
 from .validators import validate_public_access_server, validate_resource_group, check_resource_group
 
@@ -228,11 +227,11 @@ def github_actions_run(action_name, branch):
 
 
 def gitcli_check_and_login():
-    output = run_subprocess_get_output("gh")
+    output = run_cmd(["gh"], capture_output=True)
     if output.returncode:
         raise ClientRequestError('Please install "Github CLI" to run this command.')
 
-    output = run_subprocess_get_output("gh auth status")
+    output = run_cmd(["gh", "auth", "status"], capture_output=True)
     if output.returncode:
         run_subprocess("gh auth login", stdout_show=True)
 

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/migrationOnPremise.json

@@ -6,14 +6,14 @@
                 "sourceServerPassword": "XXXXXXXXX",
                 "targetServerPassword": "XXXXXXXXX"
             },
-            "targetServerUsername": "target_user"
+            "targetServerUsername": "portaltestuser"
         },
         "dbsToMigrate": [
-            "dvdrental"
+            "postgres"
         ],
         "overwriteDbsinTarget": "true",
 		"sourceType": "OnPremises",
 		"sslMode": "Prefer"
     },
-    "location": "eastus"
+    "location": "eastus2euap"
 }

src/azure-cli/azure/cli/command_modules/rdbms/tests/latest/migrationPublic.json

@@ -1,19 +1,19 @@
 {
     "properties": {
-        "sourceDbServerResourceId": "/subscriptions/5c5037e5-d3f1-4e7b-b3a9-f6bf94902b30/resourceGroups/Sterling2MeruRG/providers/Microsoft.DBforPostgreSQL/servers/source-server-longhaul",
+        "sourceDbServerResourceId": "/subscriptions/ac0271d6-426b-4b0d-b88d-0d0e4bd693ae/resourceGroups/autobot-singleserver-resourcegroup/providers/Microsoft.DBforPostgreSQL/servers/autobot-orcas-postgresql-ss",
         "secretParameters": {
             "adminCredentials": {
                 "sourceServerPassword": "XXXXXXXXX",
                 "targetServerPassword": "XXXXXXXXX"
             },
-            "sourceServerUsername": "migration_user@source-server-longhaul",
-            "targetServerUsername": "target_user"
+            "sourceServerUsername": "autobot@autobot-orcas-postgresql-ss",
+            "targetServerUsername": "portaltestuser"
         },
         "dbsToMigrate": [
-            "dvdrental"
+            "postgres"
         ],
         "setupLogicalReplicationOnSourceDbIfNeeded": "false",
         "overwriteDbsinTarget": "true"
     },
-    "location": "eastus"
+    "location": "eastus2euap"
 }