Nasc/delete instance code removal (#12307)

* Formatted page * Removed ResourceHealthPage from the dashboard * Deleted files that no longer applies to the public preview backend * shouldn't be able to open the postgres dashboard
microsoft · Sep 15, 2020 · 14b534e · 14b534e
1 parent f79ff99
commit 14b534e
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 100 deletions.
diff --git a/extensions/arc/src/ui/dashboards/postgres/postgresBackupPage.ts b/extensions/arc/src/ui/dashboards/postgres/postgresBackupPage.ts
diff --git a/extensions/arc/src/ui/dashboards/postgres/postgresComputeStoragePage.ts b/extensions/arc/src/ui/dashboards/postgres/postgresComputeStoragePage.ts
diff --git a/extensions/arc/src/ui/dashboards/postgres/postgresNetworkingPage.ts b/extensions/arc/src/ui/dashboards/postgres/postgresNetworkingPage.ts
diff --git a/extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts b/extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
@@ -5,12 +5,13 @@
 
 import * as vscode from 'vscode';
 import * as azdata from 'azdata';
+import * as azdataExt from 'azdata-ext';
 import * as loc from '../../../localizedConstants';
 import { IconPathHelper, cssStyles, Endpoints } from '../../../constants';
 import { DashboardPage } from '../../components/dashboardPage';
 import { ControllerModel } from '../../../models/controllerModel';
 import { PostgresModel } from '../../../models/postgresModel';
-import { promptAndConfirmPassword } from '../../../common/utils';
+import { promptAndConfirmPassword, promptForResourceDeletion } from '../../../common/utils';
 
 export class PostgresOverviewPage extends DashboardPage {
 
@@ -22,8 +23,11 @@ export class PostgresOverviewPage extends DashboardPage {
 	private kibanaLink?: azdata.HyperlinkComponent;
 	private grafanaLink?: azdata.HyperlinkComponent;
 
+	private readonly _azdataApi: azdataExt.IExtension;
+
 	constructor(protected modelView: azdata.ModelView, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
 		super(modelView);
+		this._azdataApi = vscode.extensions.getExtension(azdataExt.extension.name)?.exports;
 
 		this.disposables.push(
 			this._controllerModel.onEndpointsUpdated(() => this.eventuallyRunOnInitialized(() => this.handleEndpointsUpdated())),
@@ -170,13 +174,11 @@ export class PostgresOverviewPage extends DashboardPage {
 			deleteButton.onDidClick(async () => {
 				deleteButton.enabled = false;
 				try {
-					/*
-					if (await promptForResourceDeletion(this._postgresModel.namespace, this._postgresModel.name)) {
-						await this._postgresModel.delete();
-						await this._controllerModel.deleteRegistration(ResourceType.postgresInstances, this._postgresModel.namespace, this._postgresModel.name);
-						vscode.window.showInformationMessage(loc.resourceDeleted(this._postgresModel.fullName));
+					if (await promptForResourceDeletion(this._postgresModel.info.name)) {
+						await this._azdataApi.azdata.arc.postgres.server.delete(this._postgresModel.info.name);
+						await this._controllerModel.refreshTreeNode();
+						vscode.window.showInformationMessage(loc.resourceDeleted(this._postgresModel.info.name));
 					}
-					*/
 				} catch (error) {
 					vscode.window.showErrorMessage(loc.resourceDeletionFailed(this._postgresModel.info.name, error));
 				} finally {

diff --git a/extensions/azdata/src/azdata.ts b/extensions/azdata/src/azdata.ts
@@ -78,6 +78,9 @@ export class AzdataTool implements IAzdataTool {
 		},
 		postgres: {
 			server: {
+				delete: async (name: string) => {
+					return this.executeCommand<void>(['arc', 'postgres', 'server', 'delete', '-n', name]);
+				},
 				list: async () => {
 					return this.executeCommand<azdataExt.PostgresServerListResult[]>(['arc', 'postgres', 'server', 'list']);
 				},

diff --git a/extensions/azdata/src/extension.ts b/extensions/azdata/src/extension.ts
@@ -85,6 +85,10 @@ export async function activate(context: vscode.ExtensionContext): Promise<azdata
 				},
 				postgres: {
 					server: {
+						delete: async (name: string) => {
+							await throwIfNoAzdataOrEulaNotAccepted();
+							return localAzdata!.arc.postgres.server.delete(name);
+						},
 						list: async () => {
 							await throwIfNoAzdataOrEulaNotAccepted();
 							return localAzdata!.arc.postgres.server.list();

diff --git a/extensions/azdata/src/typings/azdata-ext.d.ts b/extensions/azdata/src/typings/azdata-ext.d.ts
@@ -228,6 +228,7 @@ declare module 'azdata-ext' {
 			},
 			postgres: {
 				server: {
+					delete(name: string): Promise<AzdataOutput<void>>,
 					list(): Promise<AzdataOutput<PostgresServerListResult[]>>,
 					show(name: string): Promise<AzdataOutput<PostgresServerShowResult>>,
 					edit(args: {