Move SQL database deletion to ARM (#126)

src/Common/DataAccessUtilityBase.ts

@@ -377,15 +377,6 @@ export function deleteConflict(
   );
 }
 
-export function deleteDatabase(database: ViewModels.Database, options: any): Q.Promise<any> {
-  return Q(
-    CosmosClient.client()
-      .database(database.id())
-      .delete()
-      .then(() => refreshCachedResources())
-  );
-}
-
 export function deleteStoredProcedure(
   collection: ViewModels.Collection,
   storedProcedure: DataModels.StoredProcedure,

src/Common/DocumentClientUtilityBase.ts

@@ -7,14 +7,13 @@ import { ConflictDefinition, ItemDefinition, QueryIterator, Resource } from "@az
 import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
 import * as DataAccessUtilityBase from "./DataAccessUtilityBase";
 import * as Logger from "./Logger";
-import { sendMessage } from "./MessageHandler";
-import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
 import ConflictId from "../Explorer/Tree/ConflictId";
 import DocumentId from "../Explorer/Tree/DocumentId";
+import { sendNotificationForError } from "./dataAccess/sendNotificationForError";
 
 // TODO: Log all promise resolutions and errors with verbosity levels
 export function queryDocuments(
@@ -730,39 +729,6 @@ export function deleteConflict(
   return deferred.promise;
 }
 
-export function deleteDatabase(database: ViewModels.Database, options: any = {}): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting database ${database.id()}`
-  );
-  DataAccessUtilityBase.deleteDatabase(database, options)
-    .then(
-      (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted database ${database.id()}`
-        );
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting database ${database.id()}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "DeleteDatabase", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
 export function deleteStoredProcedure(
   collection: ViewModels.Collection,
   storedProcedure: DataModels.StoredProcedure,
@@ -1109,15 +1075,3 @@ export function createDatabase(
 
   return deferred.promise;
 }
-
-export function sendNotificationForError(error: any) {
-  if (error && error.code === Constants.HttpStatusCodes.Forbidden) {
-    if (error.message && error.message.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) {
-      return;
-    }
-    sendMessage({
-      type: MessageTypes.ForbiddenError,
-      reason: error && error.message ? error.message : error
-    });
-  }
-}

src/Common/dataAccess/deleteDatabase.test.ts

@@ -0,0 +1,13 @@
+jest.mock("../../Utils/arm/request");
+import { deleteDatabase } from "./deleteDatabase";
+import { armRequest } from "../../Utils/arm/request";
+import { AuthType } from "../../AuthType";
+
+describe("deleteDatabase", () => {
+  it("should call ARM if logged in with AAD", async () => {
+    window.authType = AuthType.AAD;
+    await deleteDatabase("database");
+    expect(armRequest).toHaveBeenCalled();
+  });
+  // TODO: Test non-AAD case
+});

src/Common/dataAccess/deleteDatabase.ts

@@ -0,0 +1,34 @@
+import { CosmosClient } from "../CosmosClient";
+import { refreshCachedResources } from "../DataAccessUtilityBase";
+import { logConsoleProgress, logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+import { deleteSqlDatabase } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
+import { AuthType } from "../../AuthType";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function deleteDatabase(databaseId: string): Promise<void> {
+  const clearMessage = logConsoleProgress(`Deleting database ${databaseId}`);
+
+  try {
+    if (window.authType === AuthType.AAD) {
+      await deleteSqlDatabase(
+        CosmosClient.subscriptionId(),
+        CosmosClient.resourceGroup(),
+        CosmosClient.databaseAccount().name,
+        databaseId
+      );
+    } else {
+      await CosmosClient.client()
+        .database(databaseId)
+        .delete();
+    }
+  } catch (error) {
+    logConsoleError(`Error while deleting database ${databaseId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteDatabase", error.code);
+    sendNotificationForError(error);
+    throw error;
+  }
+  logConsoleInfo(`Successfully deleted database ${databaseId}`);
+  clearMessage();
+  await refreshCachedResources();
+}

src/Common/dataAccess/sendNotificationForError.ts

@@ -0,0 +1,20 @@
+import * as Constants from "../Constants";
+import { sendMessage } from "../MessageHandler";
+import { MessageTypes } from "../../Contracts/ExplorerContracts";
+
+interface CosmosError {
+  code: number;
+  message?: string;
+}
+
+export function sendNotificationForError(error: CosmosError): void {
+  if (error && error.code === Constants.HttpStatusCodes.Forbidden) {
+    if (error.message && error.message.toLowerCase().indexOf("sharedoffer is disabled for your account") > 0) {
+      return;
+    }
+    sendMessage({
+      type: MessageTypes.ForbiddenError,
+      reason: error && error.message ? error.message : error
+    });
+  }
+}

src/Explorer/Panes/DeleteDatabaseConfirmationPane.test.ts

@@ -1,4 +1,4 @@
-jest.mock("../../Common/DocumentClientUtilityBase");
+jest.mock("../../Common/dataAccess/deleteDatabase");
 jest.mock("../../Shared/Telemetry/TelemetryProcessor");
 import * as ko from "knockout";
 import Q from "q";
@@ -11,7 +11,7 @@ import Explorer from "../Explorer";
 import TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { TreeNode } from "../../Contracts/ViewModels";
 import { TabsManager } from "../Tabs/TabsManager";
-import { deleteDatabase } from "../../Common/DocumentClientUtilityBase";
+import { deleteDatabase } from "../../Common/dataAccess/deleteDatabase";
 
 describe("Delete Database Confirmation Pane", () => {
   describe("Explorer.isLastDatabase() and Explorer.isLastNonEmptyDatabase()", () => {

src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts

@@ -12,7 +12,7 @@ import DeleteFeedback from "../../Common/DeleteFeedback";
 
 import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
 import TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import { deleteDatabase } from "../../Common/DocumentClientUtilityBase";
+import { deleteDatabase } from "../../Common/dataAccess/deleteDatabase";
 
 export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase {
   public databaseIdConfirmationText: ko.Observable<string>;
@@ -51,6 +51,7 @@ export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase {
       dataExplorerArea: Constants.Areas.ContextualPane,
       paneTitle: this.title()
     });
+    // TODO: Should not be a Q promise anymore, but the Cassandra code requires it
     let promise: Q.Promise<any>;
     if (this.container.isPreferredApiCassandra()) {
       promise = (<CassandraAPIDataClient>this.container.tableDataClient).deleteTableOrKeyspace(
@@ -60,7 +61,7 @@ export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase {
         this.container
       );
     } else {
-      promise = deleteDatabase(selectedDatabase);
+      promise = Q(deleteDatabase(selectedDatabase.id()));
     }
     return promise.then(
       () => {

tsconfig.strict.json

@@ -21,6 +21,7 @@
 		"./src/Common/ObjectCache.ts",
 		"./src/Common/ThemeUtility.ts",
 		"./src/Common/UrlUtility.ts",
+		"./src/Common/dataAccess/sendNotificationForError.ts",
 		"./src/Config.ts",
 		"./src/Contracts/ActionContracts.ts",
 		"./src/Contracts/DataModels.ts",