From 684fb2566bd5033a7d622b0cf393d31943c6f61c Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Thu, 24 Oct 2019 13:46:40 -0700 Subject: [PATCH] revert the notebook background execution (#7984) --- .../bdc/2019/azdata/deploy-bdc-aks.ipynb | 273 ------------------ .../2019/azdata/deploy-bdc-existing-aks.ipynb | 170 ----------- .../azdata/deploy-bdc-existing-kubeadm.ipynb | 182 ------------ extensions/resource-deployment/package.json | 9 +- .../resource-deployment/package.nls.json | 3 - .../resource-deployment/src/interfaces.ts | 1 - .../deployClusterWizard.ts | 86 +----- .../deployClusterWizard/pages/summaryPage.ts | 6 +- 8 files changed, 12 insertions(+), 718 deletions(-) delete mode 100644 extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-aks.ipynb delete mode 100644 extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-aks.ipynb delete mode 100644 extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-kubeadm.ipynb diff --git a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-aks.ipynb deleted file mode 100644 index ed069217b4..0000000000 --- a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-aks.ipynb +++ /dev/null @@ -1,273 +0,0 @@ -{ - "metadata": { - "kernelspec": { - "name": "python3", - "display_name": "Python 3" - }, - "language_info": { - "name": "python", - "version": "3.6.6", - "mimetype": "text/x-python", - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "pygments_lexer": "ipython3", - "nbconvert_exporter": "python", - "file_extension": ".py" - } - }, - "nbformat_minor": 2, - "nbformat": 4, - "cells": [ - { - "cell_type": "markdown", - "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", - " \n", - "## Create Azure Kubernetes Service cluster and deploy SQL Server 2019 Big Data Cluster\n", - " \n", - "This notebook walks through the process of creating a new Azure Kubernetes Service cluster first, and then deploys a SQL Server 2019 Big Data Cluster on the newly created AKS cluster." - ], - "metadata": { - "azdata_cell_guid": "4f6bc3bc-3592-420a-b534-384011189005" - } - }, - { - "cell_type": "code", - "source": [ - "import json,sys,os\n", - "def run_command(command):\n", - " print(\"Executing: \" + command)\n", - " !{command}\n", - " if _exit_code != 0:\n", - " sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n", - " print(f'Successfully executed: {command}')" - ], - "metadata": { - "azdata_cell_guid": "326645cf-022a-47f2-8aff-37de71da8955", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 1 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set variables**\n", - "Generated by Azure Data Studio using the values collected in the Deploy Big Data Cluster wizard" - ], - "metadata": { - "azdata_cell_guid": "8716915b-1439-431b-ab0a-0221ef94cb7f" - } - }, - { - "cell_type": "markdown", - "source": [ - "### **Set password**" - ], - "metadata": { - "azdata_cell_guid": "b083aa8d-990c-4170-ba1d-247ba5c6ae76" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_password = os.environ[\"AZDATA_NB_VAR_BDC_ADMIN_PASSWORD\"]" - ], - "metadata": { - "azdata_cell_guid": "de256ddd-b835-4eb6-8cfc-c1a6239b0726" - }, - "outputs": [], - "execution_count": 0 - }, - { - "cell_type": "markdown", - "source": [ - "### **Login to Azure**\n", - "\n", - "This will open a web browser window to enable credentials to be entered. If this cells is hanging forever, it might be because your Web browser windows is waiting for you to enter your Azure credentials!\n", - "" - ], - "metadata": { - "azdata_cell_guid": "baddf2d9-93ee-4c42-aaf1-b42116bb1912" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'az login')" - ], - "metadata": { - "azdata_cell_guid": "8f1404a6-216d-49fb-b6ad-81beeea50083", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 5 - }, - { - "cell_type": "markdown", - "source": [ - "\n", - "### **Set active Azure subscription**" - ], - "metadata": { - "azdata_cell_guid": "230dc0f1-bf6e-474a-bfaa-aae6f8aad12e" - } - }, - { - "cell_type": "code", - "source": [ - "if azure_subscription_id != \"\":\n", - " run_command(f'az account set --subscription {azure_subscription_id}')\n", - "else:\n", - " print('Using the default Azure subscription', {azure_subscription_id})\n", - "run_command(f'az account show')" - ], - "metadata": { - "azdata_cell_guid": "ab230931-2e99-483b-a229-3847684a8c1c", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 6 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create Azure resource group**" - ], - "metadata": { - "azdata_cell_guid": "d51db914-f484-489f-990d-72edb3065068" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'az group create --name {azure_resource_group} --location {azure_region}')" - ], - "metadata": { - "azdata_cell_guid": "7c53eb23-c327-41bf-8936-bd34a02ebdd5", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 7 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create AKS cluster**" - ], - "metadata": { - "azdata_cell_guid": "818eb705-71e2-4013-8420-44886a5468b2" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'az aks create --name {aks_cluster_name} --resource-group {azure_resource_group} --generate-ssh-keys --node-vm-size {azure_vm_size} --node-count {azure_vm_count}')" - ], - "metadata": { - "azdata_cell_guid": "3cea1da0-0c18-4030-a5aa-79bc98a5a14d", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 8 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set the new AKS cluster as current context**" - ], - "metadata": { - "azdata_cell_guid": "5ade8453-5e71-478f-b6b6-83c55626243d" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'az aks get-credentials --resource-group {azure_resource_group} --name {aks_cluster_name} --admin --overwrite-existing')" - ], - "metadata": { - "azdata_cell_guid": "9ccb9adf-1cf6-4dcb-8bd9-7ae9a85c2437", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 9 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create deployment configuration files**" - ], - "metadata": { - "azdata_cell_guid": "57eb69fb-c68f-4ba8-818d-ffbaa0bc7aec" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_target_profile = 'ads-bdc-custom-profile'\n", - "if not os.path.exists(mssql_target_profile):\n", - " os.mkdir(mssql_target_profile)\n", - "bdcJsonObj = json.loads(bdc_json)\n", - "controlJsonObj = json.loads(control_json)\n", - "bdcJsonFile = open(f'{mssql_target_profile}/bdc.json', 'w')\n", - "bdcJsonFile.write(json.dumps(bdcJsonObj, indent = 4))\n", - "bdcJsonFile.close()\n", - "controlJsonFile = open(f'{mssql_target_profile}/control.json', 'w')\n", - "controlJsonFile.write(json.dumps(controlJsonObj, indent = 4))\n", - "controlJsonFile.close()\n", - "print(f'Created deployment configuration folder: {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "3fd73c04-8a79-4d08-9049-1dad30265558", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 10 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create SQL Server 2019 Big Data Cluster**" - ], - "metadata": { - "azdata_cell_guid": "6e82fad8-0fd0-4952-87ce-3fea1edd98cb" - } - }, - { - "cell_type": "code", - "source": [ - "print (f'Creating SQL Server 2019 Big Data Cluster: {mssql_cluster_name} using configuration {mssql_target_profile}')\n", - "os.environ[\"ACCEPT_EULA\"] = 'yes'\n", - "os.environ[\"AZDATA_USERNAME\"] = mssql_username\n", - "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n", - "if os.name == 'nt':\n", - " print(f'If you don\\'t see output produced by azdata, you can run the following command in a terminal window to check the deployment status:\\n\\tkubectl get pods -n {mssql_cluster_name} ')\n", - "run_command(f'azdata bdc create -c {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "c43ea026-ca5e-4e2a-8602-fcc786354168", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 11 - } - ] -} \ No newline at end of file diff --git a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-aks.ipynb deleted file mode 100644 index 8222b00aac..0000000000 --- a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-aks.ipynb +++ /dev/null @@ -1,170 +0,0 @@ -{ - "metadata": { - "kernelspec": { - "name": "python3", - "display_name": "Python 3" - }, - "language_info": { - "name": "python", - "version": "3.6.6", - "mimetype": "text/x-python", - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "pygments_lexer": "ipython3", - "nbconvert_exporter": "python", - "file_extension": ".py" - } - }, - "nbformat_minor": 2, - "nbformat": 4, - "cells": [ - { - "cell_type": "markdown", - "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", - " \n", - "## Deploy SQL Server 2019 Big Data Cluster on an existing Azure Kubernetes Service (AKS) cluster\n", - " \n", - "This notebook walks through the process of deploying a SQL Server 2019 Big Data Cluster on an existing AKS cluster." - ], - "metadata": { - "azdata_cell_guid": "82e60c1a-7acf-47ee-877f-9e85e92e11da" - } - }, - { - "cell_type": "code", - "source": [ - "import json,sys,os\n", - "def run_command(command):\n", - " print(\"Executing: \" + command)\n", - " !{command}\n", - " if _exit_code != 0:\n", - " sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n", - " print(f'Successfully executed: {command}')" - ], - "metadata": { - "azdata_cell_guid": "d973d5b4-7f0a-4a9d-b204-a16480f3940d", - "tags": [] - }, - "outputs": [], - "execution_count": 1 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set variables**\n", - "Generated by Azure Data Studio using the values collected in the Deploy Big Data Cluster wizard" - ], - "metadata": { - "azdata_cell_guid": "4b266b2d-bd1b-4565-92c9-3fc146cdce6d" - } - }, - { - "cell_type": "markdown", - "source": [ - "### **Set password**" - ], - "metadata": { - "azdata_cell_guid": "7c37d248-b9ac-4ad6-be56-158cd70443b1" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_password = os.environ[\"AZDATA_NB_VAR_BDC_ADMIN_PASSWORD\"]" - ], - "metadata": { - "azdata_cell_guid": "83d455f3-db10-48bb-bb81-78a6b4e5f2fd" - }, - "outputs": [], - "execution_count": 0 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set and show current context**" - ], - "metadata": { - "azdata_cell_guid": "127c8042-181f-4862-a390-96e59c181d09" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'kubectl config use-context {mssql_cluster_context}')\n", - "run_command('kubectl config current-context')" - ], - "metadata": { - "azdata_cell_guid": "7d1a03d4-1df8-48eb-bff0-0042603b95b1", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 0 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create deployment configuration files**" - ], - "metadata": { - "azdata_cell_guid": "138536c3-1db6-428f-9e5c-8269a02fb52e" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_target_profile = 'ads-bdc-custom-profile'\n", - "if not os.path.exists(mssql_target_profile):\n", - " os.mkdir(mssql_target_profile)\n", - "bdcJsonObj = json.loads(bdc_json)\n", - "controlJsonObj = json.loads(control_json)\n", - "bdcJsonFile = open(f'{mssql_target_profile}/bdc.json', 'w')\n", - "bdcJsonFile.write(json.dumps(bdcJsonObj, indent = 4))\n", - "bdcJsonFile.close()\n", - "controlJsonFile = open(f'{mssql_target_profile}/control.json', 'w')\n", - "controlJsonFile.write(json.dumps(controlJsonObj, indent = 4))\n", - "controlJsonFile.close()\n", - "print(f'Created deployment configuration folder: {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "2ff82c8a-4bce-449c-9d91-3ac7dd272021", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 6 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create SQL Server 2019 Big Data Cluster**" - ], - "metadata": { - "azdata_cell_guid": "efe78cd3-ed73-4c9b-b586-fdd6c07dd37f" - } - }, - { - "cell_type": "code", - "source": [ - "print (f'Creating SQL Server 2019 Big Data Cluster: {mssql_cluster_name} using configuration {mssql_target_profile}')\n", - "os.environ[\"ACCEPT_EULA\"] = 'yes'\n", - "os.environ[\"AZDATA_USERNAME\"] = mssql_username\n", - "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n", - "run_command(f'azdata bdc create -c {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "373947a1-90b9-49ee-86f4-17a4c7d4ca76", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 7 - } - ] -} \ No newline at end of file diff --git a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-kubeadm.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-kubeadm.ipynb deleted file mode 100644 index 94cff896ca..0000000000 --- a/extensions/resource-deployment/notebooks/bdc/2019/azdata/deploy-bdc-existing-kubeadm.ipynb +++ /dev/null @@ -1,182 +0,0 @@ -{ - "metadata": { - "kernelspec": { - "name": "python3", - "display_name": "Python 3" - }, - "language_info": { - "name": "python", - "version": "3.6.6", - "mimetype": "text/x-python", - "codemirror_mode": { - "name": "ipython", - "version": 3 - }, - "pygments_lexer": "ipython3", - "nbconvert_exporter": "python", - "file_extension": ".py" - } - }, - "nbformat_minor": 2, - "nbformat": 4, - "cells": [ - { - "cell_type": "markdown", - "source": [ - "![Microsoft](https://raw.githubusercontent.com/microsoft/azuredatastudio/master/src/sql/media/microsoft-small-logo.png)\n", - " \n", - "## Deploy SQL Server 2019 Big Data Cluster on an existing cluster deployed using kubeadm\n", - " \n", - "This notebook walks through the process of deploying a SQL Server 2019 Big Data Cluster on an existing kubeadm cluster." - ], - "metadata": { - "azdata_cell_guid": "23954d96-3932-4a8e-ab73-da605f99b1a4" - } - }, - { - "cell_type": "code", - "source": [ - "import json,sys,os\n", - "def run_command(command):\n", - " print(\"Executing: \" + command)\n", - " !{command}\n", - " if _exit_code != 0:\n", - " sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n", - " print(f'Successfully executed: {command}')" - ], - "metadata": { - "azdata_cell_guid": "26fa8bc4-4b8e-4c31-ae11-50484821cea8", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 1 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set variables**\n", - "Generated by Azure Data Studio using the values collected in the Deploy Big Data Cluster wizard" - ], - "metadata": { - "azdata_cell_guid": "e70640d0-6059-4cab-939e-e985a978c0da" - } - }, - { - "cell_type": "markdown", - "source": [ - "### **Set password**" - ], - "metadata": { - "azdata_cell_guid": "7b383b0d-5687-45b3-a16f-ba3b170c796e" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_password = os.environ[\"AZDATA_NB_VAR_BDC_ADMIN_PASSWORD\"]\n", - "if mssql_auth_mode == \"ad\":\n", - " mssql_domain_service_account_password = os.environ[\"AZDATA_NB_VAR_BDC_AD_DOMAIN_SVC_PASSWORD\"]" - ], - "metadata": { - "azdata_cell_guid": "b5970f2b-cf13-41af-b0a2-5133d840325e", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 3 - }, - { - "cell_type": "markdown", - "source": [ - "### **Set and show current context**" - ], - "metadata": { - "azdata_cell_guid": "6456bd0c-5b64-4d76-be59-e3a5b32697f5" - } - }, - { - "cell_type": "code", - "source": [ - "run_command(f'kubectl config use-context {mssql_cluster_context}')\n", - "run_command('kubectl config current-context')" - ], - "metadata": { - "azdata_cell_guid": "a38f8b3a-f93a-484c-b9e2-4eba3ed99cc2", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 0 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create deployment configuration files**" - ], - "metadata": { - "azdata_cell_guid": "6d78da36-6af5-4309-baad-bc81bb2cdb7f" - } - }, - { - "cell_type": "code", - "source": [ - "mssql_target_profile = 'ads-bdc-custom-profile'\n", - "if not os.path.exists(mssql_target_profile):\n", - " os.mkdir(mssql_target_profile)\n", - "bdcJsonObj = json.loads(bdc_json)\n", - "controlJsonObj = json.loads(control_json)\n", - "bdcJsonFile = open(f'{mssql_target_profile}/bdc.json', 'w')\n", - "bdcJsonFile.write(json.dumps(bdcJsonObj, indent = 4))\n", - "bdcJsonFile.close()\n", - "controlJsonFile = open(f'{mssql_target_profile}/control.json', 'w')\n", - "controlJsonFile.write(json.dumps(controlJsonObj, indent = 4))\n", - "controlJsonFile.close()\n", - "print(f'Created deployment configuration folder: {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "3110ab23-ecfc-4e36-a1c5-28536b7edebf", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 6 - }, - { - "cell_type": "markdown", - "source": [ - "### **Create SQL Server 2019 Big Data Cluster**" - ], - "metadata": { - "azdata_cell_guid": "7d56d262-8cd5-49e4-b745-332c6e7a3cb2" - } - }, - { - "cell_type": "code", - "source": [ - "print (f'Creating SQL Server 2019 Big Data Cluster: {mssql_cluster_name} using configuration {mssql_target_profile}')\n", - "os.environ[\"ACCEPT_EULA\"] = 'yes'\n", - "os.environ[\"AZDATA_USERNAME\"] = mssql_username\n", - "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n", - "if mssql_auth_mode == \"ad\":\n", - " os.environ[\"DOMAIN_SERVICE_ACCOUNT_USERNAME\"] = mssql_domain_service_account_username\n", - " os.environ[\"DOMAIN_SERVICE_ACCOUNT_PASSWORD\"] = mssql_domain_service_account_password\n", - "if os.name == 'nt':\n", - " print(f'If you don\\'t see output produced by azdata, you can run the following command in a terminal window to check the deployment status:\\n\\tkubectl get pods -n {mssql_cluster_name} ')\n", - "run_command(f'azdata bdc create -c {mssql_target_profile}')" - ], - "metadata": { - "azdata_cell_guid": "0a743e88-e7d0-4b41-b8a3-e43985d15f2b", - "tags": [ - "hide_input" - ] - }, - "outputs": [], - "execution_count": 7 - } - ] -} \ No newline at end of file diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 5d7179e25b..a832c6e06b 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -227,8 +227,7 @@ { "wizard": { "type": "new-aks", - "notebook": "%bdc-2019-aks-notebook%", - "azdata_notebook": "%azdata-bdc-2019-aks-notebook%" + "notebook": "%bdc-2019-aks-notebook%" }, "requiredTools": [ { @@ -246,8 +245,7 @@ { "wizard": { "type": "existing-aks", - "notebook": "%bdc-2019-existing-aks-notebook%", - "azdata_notebook": "%azdata-bdc-2019-existing-aks-notebook" + "notebook": "%bdc-2019-existing-aks-notebook%" }, "requiredTools": [ { @@ -262,8 +260,7 @@ { "wizard": { "type": "existing-kubeadm", - "notebook": "%bdc-2019-existing-kubeadm-notebook%", - "azdata_notebook": "%azdata-bdc-2019-existing-kubeadm-notebook%" + "notebook": "%bdc-2019-existing-kubeadm-notebook%" }, "requiredTools": [ { diff --git a/extensions/resource-deployment/package.nls.json b/extensions/resource-deployment/package.nls.json index 4bad59b46b..7f3557dbd7 100644 --- a/extensions/resource-deployment/package.nls.json +++ b/extensions/resource-deployment/package.nls.json @@ -20,9 +20,6 @@ "bdc-2019-aks-notebook": "./notebooks/bdc/2019/deploy-bdc-aks.ipynb", "bdc-2019-existing-aks-notebook": "./notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb", "bdc-2019-existing-kubeadm-notebook": "./notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb", - "azdata-bdc-2019-aks-notebook": "./notebooks/bdc/2019/azdata/deploy-bdc-aks.ipynb", - "azdata-bdc-2019-existing-aks-notebook": "./notebooks/bdc/2019/azdata/deploy-bdc-existing-aks.ipynb", - "azdata-bdc-2019-existing-kubeadm-notebook": "./notebooks/bdc/2019/azdata/deploy-bdc-existing-kubeadm.ipynb", "docker-sql-2017-title": "Deploy SQL Server 2017 container images with docker", "docker-sql-2019-title": "Deploy SQL Server 2019 container images with docker", "docker-container-name-field": "Container name", diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index d2e48cb189..4b6ffb127e 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -93,7 +93,6 @@ export type DeploymentProvider = DialogDeploymentProvider | WizardDeploymentProv export interface WizardInfo { notebook: string | NotebookInfo; - azdata_notebook: string | NotebookInfo; type: BdcDeploymentType; } diff --git a/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizard.ts b/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizard.ts index 2439616c54..e970d68f3e 100644 --- a/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizard.ts +++ b/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizard.ts @@ -15,10 +15,9 @@ import { ClusterSettingsPage } from './pages/clusterSettingsPage'; import { ServiceSettingsPage } from './pages/serviceSettingsPage'; import { TargetClusterContextPage } from './pages/targetClusterPage'; import { IKubeService } from '../../services/kubeService'; -import { IAzdataService, BdcEndpoint } from '../../services/azdataService'; +import { IAzdataService } from '../../services/azdataService'; import { DeploymentProfilePage } from './pages/deploymentProfilePage'; import { INotebookService } from '../../services/notebookService'; -import { getErrorMessage, getDateTimeString } from '../../utils'; import { DeployClusterWizardModel, AuthenticationMode } from './deployClusterWizardModel'; import * as VariableNames from './constants'; import * as os from 'os'; @@ -28,7 +27,6 @@ const localize = nls.loadMessageBundle(); export class DeployClusterWizard extends WizardBase { private _saveConfigButton: azdata.window.Button; - private _scriptToNotebookButton: azdata.window.Button; public get kubeService(): IKubeService { return this._kubeService; @@ -42,24 +40,20 @@ export class DeployClusterWizard extends WizardBase this.saveConfigFiles())); - this.registerDisposable(this._scriptToNotebookButton.onClick(() => this.scriptToNotebook())); } public get deploymentType(): BdcDeploymentType { @@ -69,80 +63,14 @@ export class DeployClusterWizard extends WizardBase { - op.updateStatus(azdata.TaskStatus.InProgress); - const env: NodeJS.ProcessEnv = {}; - this.setEnvironmentVariables(env); - const notebook = await this.notebookService.getNotebook(this.wizardInfo.azdata_notebook); - notebook.cells.splice(3, 0, { - cell_type: 'code', - source: this.model.getCodeCellContentForNotebook(), - metadata: {}, - execution_count: 0, - outputs: [] - }); - const result = await this.notebookService.executeNotebook(notebook, env); - if (result.succeeded) { - op.updateStatus(azdata.TaskStatus.Succeeded); - const connectToMasterSql = localize('resourceDeployment.ConnectToMasterSQLServer', "Connect to Master SQL Server"); - const selectedOption = await vscode.window.showInformationMessage(localize('resourceDeployment.DeploymentSucceeded', "Successfully deployed SQL Server Big Data Cluster: {0}", - this.model.getStringValue(VariableNames.ClusterName_VariableName)), - connectToMasterSql); - if (selectedOption === connectToMasterSql) { - let endpoints: BdcEndpoint[]; - try { - endpoints = await this.azdataService.getEndpoints(this.model.getStringValue(VariableNames.ClusterName_VariableName)!, - this.model.getStringValue(VariableNames.AdminUserName_VariableName)!, - this.model.getStringValue(VariableNames.AdminPassword_VariableName)!); - } catch (error) { - vscode.window.showErrorMessage(localize('resourceDeployment.ErroRetrievingEndpoints', "Failed to retrieve the endpoint list. {0}{1}", os.EOL, getErrorMessage(error))); - return; - } - const sqlEndpoint = endpoints.find(endpoint => endpoint.name === 'sql-server-master'); - if (sqlEndpoint) { - vscode.commands.executeCommand('azdata.connect', { - serverName: sqlEndpoint.endpoint, - providerName: 'MSSQL', - authenticationType: 'SqlLogin', - userName: this.model.getStringValue(VariableNames.AdminUserName_VariableName)!, - password: this.model.getStringValue(VariableNames.AdminPassword_VariableName)! - }); - } else { - vscode.window.showErrorMessage(localize('resourceDeployment.NoSQLEndpointFound', "Master SQL Server endpoint is not found.")); - } - } - } else { - op.updateStatus(azdata.TaskStatus.Failed, result.errorMessage); - if (result.outputNotebook) { - const viewErrorDetail = localize('resourceDeployment.ViewErrorDetail', "View error detail"); - const selectedOption = await vscode.window.showErrorMessage(localize('resourceDeployment.DeployFailed', "Failed to deploy SQL Server Big Data Cluster \"{0}\".", - this.model.getStringValue(VariableNames.ClusterName_VariableName)), - viewErrorDetail); - if (selectedOption === viewErrorDetail) { - try { - this.notebookService.launchNotebookWithContent(`deploy-${getDateTimeString()}`, result.outputNotebook); - } catch (error) { - vscode.window.showErrorMessage(localize('resourceDeployment.FailedToOpenNotebook', "An error occured launching the output notebook. {1}{2}.", os.EOL, getErrorMessage(error))); - } - } - } else { - vscode.window.showErrorMessage(localize('resourceDeployment.DeployFailedNoOutputNotebook', "Failed to deploy SQL Server Big Data Cluster and no output notebook was generated.")); - } - } - } - }); + this.scriptToNotebook(); } private getPages(): WizardPageBase[] { diff --git a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/summaryPage.ts b/extensions/resource-deployment/src/ui/deployClusterWizard/pages/summaryPage.ts index 1b5c380f28..1d59b5d5cb 100644 --- a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/summaryPage.ts +++ b/extensions/resource-deployment/src/ui/deployClusterWizard/pages/summaryPage.ts @@ -36,8 +36,7 @@ export class SummaryPage extends WizardPageBase { text: localize('resourceDeployment.NewAKSBrowserWindowPrompt', "A browser window for signing into Azure will be opened during the SQL Server Big Data Cluster deployment.") }; } - this.wizard.saveConfigButton.hidden = false; - this.wizard.scriptToNotebookButton.hidden = false; + this.wizard.showCustomButtons(); this.formItems.forEach(item => { this.form!.removeFormItem(item); }); @@ -311,8 +310,7 @@ export class SummaryPage extends WizardPageBase { } public onLeave() { - this.wizard.saveConfigButton.hidden = true; - this.wizard.scriptToNotebookButton.hidden = true; + this.wizard.hideCustomButtons(); this.wizard.wizardObject.message = { text: '' }; }