From b53d1cee4a2acf17976c43be9348b6c42e85f57d Mon Sep 17 00:00:00 2001
From: Brian Bergeron <brian.e.bergeron@gmail.com>
Date: Wed, 22 Jul 2020 17:03:52 -0700
Subject: [PATCH] Arc - Remove Azure params from Postgres deployment (#11478)

Co-authored-by: Brian Bergeron <brberger@microsoft.com>
---
 .../arcDeployment/deploy.postgres.existing.arc.ipynb  |  6 ++----
 extensions/arc/package.json                           | 11 -----------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb
index 2ea9935589..bd4c8a3bc9 100644
--- a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb
+++ b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb
@@ -75,7 +75,7 @@
         {
             "cell_type": "markdown",
             "source": [
-                "#### **Ensure PostgreSQL server group name, subscription id and resource group name**"
+                "#### **Get required and optional parameters for the PostgreSQL server group**"
             ],
             "metadata": {
                 "azdata_cell_guid": "68ec0760-27d1-4ded-9a9f-89077c40b8bb"
@@ -85,8 +85,6 @@
             "cell_type": "code",
             "source": [
                 "# Required Values\n",
-                "subscription = os.environ[\"AZDATA_NB_VAR_ARC_SUBSCRIPTION\"]\n",
-                "resource_group_name = os.environ[\"AZDATA_NB_VAR_ARC_RESOURCE_GROUP_NAME\"]\n",
                 "server_group_name = os.environ[\"AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_NAME\"]\n",
                 "server_group_namespace = os.environ[\"AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_NAMESPACE\"]\n",
                 "server_group_workers = os.environ[\"AZDATA_NB_VAR_POSTGRES_SERVER_GROUP_WORKERS\"]\n",
@@ -142,7 +140,7 @@
                 "backup_delta_interval_option = f' --deltaBackupInterval \"{server_group_backup_delta_interval}\"' if server_group_backup_delta_interval else \"\"\n",
                 "backup_retention_min_option = f' --retentionMin \"{server_group_backup_retention_min}\"' if server_group_backup_retention_min else \"\"\n",
                 "backup_retention_max_option = f' --retentionMax \"{server_group_backup_retention_max}\"' if server_group_backup_retention_max else \"\"\n",
-                "cmd = f'azdata postgres server create --subscription {subscription} --rg {resource_group_name} --name {server_group_name} --namespace {server_group_namespace} --workers {server_group_workers} --serviceType {server_group_service_type} --dataSizeMb {server_group_data_size}{data_class_option}{port_option}{extensions_option}{cpu_min_option}{cpu_max_option}{memory_min_option}{memory_max_option}{backup_classes_option}{backup_sizes_option}{backup_full_interval_option}{backup_delta_interval_option}{backup_retention_min_option}{backup_retention_max_option}'\n",
+                "cmd = f'azdata postgres server create --name {server_group_name} --namespace {server_group_namespace} --workers {server_group_workers} --serviceType {server_group_service_type} --dataSizeMb {server_group_data_size}{data_class_option}{port_option}{extensions_option}{cpu_min_option}{cpu_max_option}{memory_min_option}{memory_max_option}{backup_classes_option}{backup_sizes_option}{backup_full_interval_option}{backup_delta_interval_option}{backup_retention_min_option}{backup_retention_max_option}'\n",
                 "out=run_command()"
             ],
             "metadata": {
diff --git a/extensions/arc/package.json b/extensions/arc/package.json
index 879dc7ac1a..06aa874c58 100644
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -712,17 +712,6 @@
                 {
                   "title": "",
                   "sections": [
-                    {
-                      "title": "%arc.azure.section.title%",
-                      "fields": [
-                        {
-                          "subscriptionVariableName": "AZDATA_NB_VAR_ARC_SUBSCRIPTION",
-                          "resourceGroupVariableName": "AZDATA_NB_VAR_ARC_RESOURCE_GROUP_NAME",
-                          "type": "azure_account",
-                          "required": true
-                        }
-                      ]
-                    },
                     {
                       "title": "%arc.postgres.settings.section.title%",
                       "fields": [