Aasim/fix/sqldbtypos (#13130)

* fixed some easy typos on sql db wizard.

* Fixed some instructions in the notebook

* - Added option to enable or disable firewall rules

* converted toggle firewall dropdown to checkbox
This commit is contained in:
Aasim Khan
2020-10-29 11:53:56 -07:00
committed by GitHub
parent 66da2a46c5
commit e15ad17967
10 changed files with 142 additions and 75 deletions

View File

@@ -2,7 +2,8 @@
"metadata": {
"kernelspec": {
"name": "python3",
"display_name": "Python 3"
"display_name": "Python 3",
"language": "python"
},
"language_info": {
"name": "python",
@@ -29,7 +30,7 @@
"Steps of this procedure include:\n",
"1. Set variables and set up Notebook\n",
"1. Connect to Azure account and subscription\n",
"1. Provision firewall rules to allow local access\n",
"1. Provision firewall rules\n",
"1. Create SQL database resource"
],
"metadata": {
@@ -41,12 +42,12 @@
"source": [
"## Set variables\r\n",
"These variables are set based on your inputs in the deployment wizard. You can make changes to these variables but be aware of possible validation errors caused by your changes.\r\n",
"\r\n",
"\r\n",
"\r\n",
"\r\n",
""
],
"\r\n",
"\r\n",
"\r\n",
"\r\n",
""
],
"metadata": {
"azdata_cell_guid": "b57c46c8-4a34-49af-9b62-aa5688a02002"
}
@@ -78,7 +79,7 @@
" try:\n",
" return json.loads(output)\n",
" except:\n",
" return output\r\n",
" return output\r\n"
],
"metadata": {
"azdata_cell_guid": "c320ffe2-c488-4bd8-9886-c7deeae02996",
@@ -91,7 +92,7 @@
"cell_type": "markdown",
"source": [
"## Connecting to your Azure account\r\n",
""
""
],
"metadata": {
"azdata_cell_guid": "e34334a7-0d55-4c18-8c0a-1c4a673629cd"
@@ -114,7 +115,7 @@
"cell_type": "markdown",
"source": [
"## Setting your Azure subscription\r\n",
""
""
],
"metadata": {
"azdata_cell_guid": "ed6b781d-ce7e-4b51-a7ec-1eeeb2032c73"
@@ -149,19 +150,20 @@
{
"cell_type": "code",
"source": [
"create_firewall_rule_result = run_command(\r\n",
" 'az sql server firewall-rule create '\r\n",
" '--start-ip-address {0} '\r\n",
" '--end-ip-address {1} '\r\n",
" '--server {2} '\r\n",
" '--name {3} '\r\n",
" '--resource-group {4} '\r\n",
" .format(\r\n",
" azure_sqldb_ip_start, \r\n",
" azure_sqldb_ip_end, \r\n",
" azure_sqldb_server_name, \r\n",
" azure_sqldb_firewall_name, \r\n",
" azure_sqldb_resource_group_name));"
"if azure_sqldb_enable_firewall_rule == True:\r\n",
" create_firewall_rule_result = run_command(\r\n",
" 'az sql server firewall-rule create '\r\n",
" '--start-ip-address {0} '\r\n",
" '--end-ip-address {1} '\r\n",
" '--server {2} '\r\n",
" '--name {3} '\r\n",
" '--resource-group {4} '\r\n",
" .format(\r\n",
" azure_sqldb_ip_start, \r\n",
" azure_sqldb_ip_end, \r\n",
" azure_sqldb_server_name, \r\n",
" azure_sqldb_firewall_name, \r\n",
" azure_sqldb_resource_group_name));"
],
"metadata": {
"azdata_cell_guid": "ceae5670-292f-4c45-9c10-4ac85baf2d07"
@@ -172,9 +174,9 @@
{
"cell_type": "markdown",
"source": [
"## Create Azure SQL Database\r\n",
"\r\n",
"The database will be created based on all the settings previously specified. [Learn more](https://docs.microsoft.com/en-us/cli/azure/sql/db?view=azure-cli-latest#az_sql_db_create) about additonal options for creating the database."
"## Create Azure SQL Database\n",
"\n",
"Learn more about the different [cost and performance options](https://go.microsoft.com/fwlink/?linkid=842067) and [other additional customizations](https://go.microsoft.com/fwlink/?linkid=2147212) for creating the database"
],
"metadata": {
"azdata_cell_guid": "b460ca8f-65a7-4d6c-94b7-6d7dd9655fad"
@@ -191,14 +193,14 @@
" '--compute-model Serverless '\r\n",
" '--family Gen5 '\r\n",
" '--resource-group {2} '\r\n",
" '--min-capacity 0.5 '\r\n",
" '--max-size 32GB '\r\n",
" '--capacity 1 '\r\n",
" '--collation {3} '\r\n",
" '--min-capacity 0.5 '\r\n",
" '--max-size 32GB '\r\n",
" '--capacity 1 '\r\n",
" '--collation {3} '\r\n",
" .format(\r\n",
" azure_sqldb_server_name, \r\n",
" azure_sqldb_database_name, \r\n",
" azure_sqldb_resource_group_name, \r\n",
" azure_sqldb_resource_group_name, \r\n",
" azure_sqldb_collation));"
],
"metadata": {
@@ -208,4 +210,4 @@
"execution_count": null
}
]
}
}