Skip to content

Commit 27f4437

Browse files
authored
[RDBMS] BREAKING CHANGE: az postgres server/db/server-logs: Removal of single server commands (#32388)
1 parent bb18a2b commit 27f4437

15 files changed

+20
-32575
lines changed

src/azure-cli/azure/cli/command_modules/network/tests/latest/recordings/test_postgres_private_link_scenario.yaml

Lines changed: 0 additions & 2975 deletions
This file was deleted.

src/azure-cli/azure/cli/command_modules/network/tests/latest/test_private_endpoint_commands.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -660,12 +660,6 @@ def test_mysql_private_link_scenario(self, resource_group, server, database_engi
660660
self._test_private_link_resource(resource_group, server, 'Microsoft.DBforMySQL/servers', 'mysqlServer')
661661
self._test_private_endpoint_connection(resource_group, server, database_engine, 'Microsoft.DBforMySQL/servers')
662662

663-
@ResourceGroupPreparer()
664-
@ServerPreparer(engine_type='postgres')
665-
def test_postgres_private_link_scenario(self, resource_group, server, database_engine):
666-
self._test_private_link_resource(resource_group, server, 'Microsoft.DBforPostgreSQL/servers', 'postgresqlServer')
667-
self._test_private_endpoint_connection(resource_group, server, database_engine, 'Microsoft.DBforPostgreSQL/servers')
668-
669663
def _test_private_link_resource(self, resource_group, server, database_engine, group_id):
670664
result = self.cmd('network private-link-resource list -g {} --name {} --type {}'
671665
.format(resource_group, server, database_engine)).get_output_in_json()

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

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -85,30 +85,6 @@ def get_mysql_flexible_management_client(cli_ctx, **_):
8585
return get_mgmt_service_client(cli_ctx, MySQLManagementClient)
8686

8787

88-
def get_postgresql_management_client(cli_ctx, **_):
89-
from os import getenv
90-
from azure.mgmt.rdbms.postgresql import PostgreSQLManagementClient
91-
92-
# Allow overriding resource manager URI using environment variable
93-
# for testing purposes. Subscription id is also determined by environment
94-
# variable.
95-
rm_uri_override = getenv(RM_URI_OVERRIDE)
96-
if rm_uri_override:
97-
client_id = getenv(AZURE_CLIENT_ID)
98-
if client_id:
99-
credentials = get_environment_credential()
100-
else:
101-
from msrest.authentication import Authentication # pylint: disable=import-error
102-
credentials = Authentication()
103-
104-
return PostgreSQLManagementClient(
105-
subscription_id=getenv(SUB_ID_OVERRIDE),
106-
base_url=rm_uri_override,
107-
credential=credentials)
108-
# Normal production scenario.
109-
return get_mgmt_service_client(cli_ctx, PostgreSQLManagementClient)
110-
111-
11288
def get_postgresql_flexible_management_client(cli_ctx, subscription_id=None, **_):
11389
from os import getenv
11490
from azure.mgmt.postgresqlflexibleservers import PostgreSQLManagementClient
@@ -141,10 +117,6 @@ def cf_mysql_servers(cli_ctx, _):
141117
return get_mysql_management_client(cli_ctx).servers
142118

143119

144-
def cf_postgres_servers(cli_ctx, _):
145-
return get_postgresql_management_client(cli_ctx).servers
146-
147-
148120
def cf_mariadb_firewall_rules(cli_ctx, _):
149121
return get_mariadb_management_client(cli_ctx).firewall_rules
150122

@@ -153,10 +125,6 @@ def cf_mysql_firewall_rules(cli_ctx, _):
153125
return get_mysql_management_client(cli_ctx).firewall_rules
154126

155127

156-
def cf_postgres_firewall_rules(cli_ctx, _):
157-
return get_postgresql_management_client(cli_ctx).firewall_rules
158-
159-
160128
def cf_mariadb_config(cli_ctx, _):
161129
return get_mariadb_management_client(cli_ctx).configurations
162130

@@ -165,10 +133,6 @@ def cf_mysql_config(cli_ctx, _):
165133
return get_mysql_management_client(cli_ctx).configurations
166134

167135

168-
def cf_postgres_config(cli_ctx, _):
169-
return get_postgresql_management_client(cli_ctx).configurations
170-
171-
172136
def cf_mariadb_log(cli_ctx, _):
173137
return get_mariadb_management_client(cli_ctx).log_files
174138

@@ -177,10 +141,6 @@ def cf_mysql_log(cli_ctx, _):
177141
return get_mysql_management_client(cli_ctx).log_files
178142

179143

180-
def cf_postgres_log(cli_ctx, _):
181-
return get_postgresql_management_client(cli_ctx).log_files
182-
183-
184144
def cf_mariadb_db(cli_ctx, _):
185145
return get_mariadb_management_client(cli_ctx).databases
186146

@@ -189,10 +149,6 @@ def cf_mysql_db(cli_ctx, _):
189149
return get_mysql_management_client(cli_ctx).databases
190150

191151

192-
def cf_postgres_db(cli_ctx, _):
193-
return get_postgresql_management_client(cli_ctx).databases
194-
195-
196152
def cf_mariadb_virtual_network_rules_operations(cli_ctx, _):
197153
return get_mariadb_management_client(cli_ctx).virtual_network_rules
198154

@@ -201,10 +157,6 @@ def cf_mysql_virtual_network_rules_operations(cli_ctx, _):
201157
return get_mysql_management_client(cli_ctx).virtual_network_rules
202158

203159

204-
def cf_postgres_virtual_network_rules_operations(cli_ctx, _):
205-
return get_postgresql_management_client(cli_ctx).virtual_network_rules
206-
207-
208160
def cf_mariadb_replica(cli_ctx, _):
209161
return get_mariadb_management_client(cli_ctx).replicas
210162

@@ -213,10 +165,6 @@ def cf_mysql_replica(cli_ctx, _):
213165
return get_mysql_management_client(cli_ctx).replicas
214166

215167

216-
def cf_postgres_replica(cli_ctx, _):
217-
return get_postgresql_management_client(cli_ctx).replicas
218-
219-
220168
def cf_mariadb_private_endpoint_connections_operations(cli_ctx, _):
221169
return get_mariadb_management_client(cli_ctx).private_endpoint_connections
222170

@@ -233,30 +181,14 @@ def cf_mysql_private_link_resources_operations(cli_ctx, _):
233181
return get_mysql_management_client(cli_ctx).private_link_resources
234182

235183

236-
def cf_postgres_private_endpoint_connections_operations(cli_ctx, _):
237-
return get_postgresql_management_client(cli_ctx).private_endpoint_connections
238-
239-
240-
def cf_postgres_private_link_resources_operations(cli_ctx, _):
241-
return get_postgresql_management_client(cli_ctx).private_link_resources
242-
243-
244184
def cf_mysql_server_keys_operations(cli_ctx, _):
245185
return get_mysql_management_client(cli_ctx).server_keys
246186

247187

248-
def cf_postgres_server_keys_operations(cli_ctx, _):
249-
return get_postgresql_management_client(cli_ctx).server_keys
250-
251-
252188
def cf_mysql_server_ad_administrators_operations(cli_ctx, _):
253189
return get_mysql_management_client(cli_ctx).server_administrators
254190

255191

256-
def cf_postgres_server_ad_administrators_operations(cli_ctx, _):
257-
return get_postgresql_management_client(cli_ctx).server_administrators
258-
259-
260192
def cf_mariadb_check_resource_availability_sterling(cli_ctx, _):
261193
return get_mariadb_management_client(cli_ctx).check_name_availability
262194

@@ -265,18 +197,10 @@ def cf_mysql_check_resource_availability_sterling(cli_ctx, _):
265197
return get_mysql_management_client(cli_ctx).check_name_availability
266198

267199

268-
def cf_postgres_check_resource_availability_sterling(cli_ctx, _):
269-
return get_postgresql_management_client(cli_ctx).check_name_availability
270-
271-
272200
def cf_mysql_location_based_performance_tier_operations(cli_ctx, _):
273201
return get_mysql_management_client(cli_ctx).location_based_performance_tier
274202

275203

276-
def cf_postgres_location_based_performance_tier_operations(cli_ctx, _):
277-
return get_postgresql_management_client(cli_ctx).location_based_performance_tier
278-
279-
280204
def cf_mariadb_location_based_performance_tier_operations(cli_ctx, _):
281205
return get_mariadb_management_client(cli_ctx).location_based_performance_tier
282206

0 commit comments

Comments
 (0)