From be1e0b3c8dd1a583eb34665985ff604287f67dc4 Mon Sep 17 00:00:00 2001
From: Chris LaFreniere <40371649+chlafreniere@users.noreply.github.com>
Date: Wed, 16 Sep 2020 22:56:51 -0700
Subject: [PATCH] Remove MIAA Port Deploy Option (#12388)

---
 .../notebooks/arcDeployment/deploy.sql.existing.arc.ipynb  | 6 ++----
 extensions/arc/package.json                                | 7 -------
 extensions/arc/package.nls.json                            | 1 -
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb
index 47dab8a0c8..4ab742724f 100644
--- a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb
+++ b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb
@@ -147,7 +147,6 @@
         {
             "cell_type": "code",
             "source": [
-                "sql_instance_port = os.environ.get(\"AZDATA_NB_VAR_SQL_INSTANCE_PORT\")\n",
                 "sql_instance_cores_request = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_REQUEST\")\n",
                 "sql_instance_cores_limit = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_LIMIT\")\n",
                 "sql_instance_memory_request = os.environ.get(\"AZDATA_NB_VAR_SQL_MEMORY_REQUEST\")\n",
@@ -188,14 +187,13 @@
             "source": [
                 "print (f'Creating Managed SQL Server instance on Azure Arc')\n",
                 "\n",
-                "port_option = f' --port \"{sql_instance_port}\"' if sql_instance_port else \"\"\n",
                 "cores_request_option = f' -cr \"{sql_instance_cores_request}\"' if sql_instance_cores_request else \"\"\n",
                 "cores_limit_option = f' -cl \"{sql_instance_cores_limit}\"' if sql_instance_cores_limit else \"\"\n",
                 "memory_request_option = f' -mr \"{sql_instance_memory_request}Mi\"' if sql_instance_memory_request else \"\"\n",
                 "memory_limit_option = f' -ml \"{sql_instance_memory_limit}Mi\"' if sql_instance_memory_limit else \"\"\n",
                 "\n",
                 "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n",
-                "cmd = f'azdata arc sql mi create -n {mssql_instance_name} -scd {mssql_storage_class_data} -scl {mssql_storage_class_logs}{port_option}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}'\n",
+                "cmd = f'azdata arc sql mi create -n {mssql_instance_name} -scd {mssql_storage_class_data} -scl {mssql_storage_class_logs}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}'\n",
                 "out=run_command()"
             ],
             "metadata": {
@@ -205,4 +203,4 @@
             "execution_count": null
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/extensions/arc/package.json b/extensions/arc/package.json
index 55e488c50a..2281c77f4e 100644
--- a/extensions/arc/package.json
+++ b/extensions/arc/package.json
@@ -632,13 +632,6 @@
                           "required": true,
                           "labelWidth": "100%"
                         },
-                        {
-                          "label": "%arc.sql.instance.port%",
-                          "variableName": "AZDATA_NB_VAR_SQL_INSTANCE_PORT",
-                          "type": "number",
-                          "required": false,
-                          "labelWidth": "100%"
-                        },
                         {
                           "label": "%arc.sql.username%",
                           "variableName": "AZDATA_NB_VAR_SQL_USERNAME",
diff --git a/extensions/arc/package.nls.json b/extensions/arc/package.nls.json
index 8eee06b69e..f172c3f4cb 100644
--- a/extensions/arc/package.nls.json
+++ b/extensions/arc/package.nls.json
@@ -83,7 +83,6 @@
 	"arc.sql.settings.section.title": "SQL Connection information",
 	"arc.azure.section.title": "Azure information",
 	"arc.sql.instance.name": "Instance name (lower case letters and digits only)",
-	"arc.sql.instance.port": "Port",
 	"arc.sql.username": "Username",
 	"arc.storage-class.dc.label": "Storage Class",
 	"arc.sql.storage-class.dc.description": "The storage class to be used for all data and logs persistent volumes for all data controller pods that require them.",