Merge pull request #190947 from vmagelo/vmagelo/new-python-tutorial

New version of python with postgresql tutorial

Author: jborsecnik

.openpublishing.publish.config.json

@@ -830,6 +830,18 @@
       "url": "https://github.com/Azure-Samples/msdocs-nodejs-mongodb-azure-sample-app",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-django-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-django-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-flask-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-flask-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

articles/app-service/configure-language-python.md

@@ -100,19 +100,19 @@ Existing web applications can be redeployed to Azure as follows:
 1. **Source repository**: Maintain your source code in a suitable repository like GitHub, which enables you to set up continuous deployment later in this process.
     1. Your *requirements.txt* file must be at the root of your repository for App Service to automatically install the necessary packages.
 
-1. **Database**: If your app depends on a database, provision the necessary resources on Azure as well. See [Tutorial: Deploy a Django web app with PostgreSQL - create a database](tutorial-python-postgresql-app.md#3-create-postgres-database-in-azure) for an example.
+1. **Database**: If your app depends on a database, provision the necessary resources on Azure as well. See [Tutorial: Deploy a Django web app with PostgreSQL - create a database](tutorial-python-postgresql-app.md#3---create-the-postgresql-database-in-azure) for an example.
 
-1. **App service resources**: Create a resource group, App Service Plan, and App Service web app to host your application. You can most easily do this by doing an initial deployment of your code through the Azure CLI command `az webapp up`, as shown on [Tutorial: Deploy a Django web app with PostgreSQL - deploy the code](tutorial-python-postgresql-app.md#4-deploy-the-code-to-azure-app-service). Replace the names of the resource group, App Service Plan, and the web app to be more suitable for your application.
+1. **App service resources**: Create a resource group, App Service Plan, and App Service web app to host your application. You can most easily do this by doing an initial deployment of your code through the Azure CLI command [`az webapp up`](/cli/azure/webapp?az-webapp-up). Or, you can create and deploy resources as shown in [Tutorial: Deploy a Django web app with PostgreSQL](tutorial-python-postgresql-app.md). Replace the names of the resource group, App Service Plan, and the web app to be more suitable for your application.
 
 1. **Environment variables**: If your application requires any environment variables, create equivalent [App Service application settings](configure-common.md#configure-app-settings). These App Service settings appear to your code as environment variables, as described on [Access environment variables](#access-app-settings-as-environment-variables).
-    - Database connections, for example, are often managed through such settings, as shown in [Tutorial: Deploy a Django web app with PostgreSQL - configure variables to connect the database](tutorial-python-postgresql-app.md#42-configure-environment-variables-to-connect-the-database).
+    - Database connections, for example, are often managed through such settings, as shown in [Tutorial: Deploy a Django web app with PostgreSQL - configure variables to connect the database](tutorial-python-postgresql-app.md#5---connect-the-web-app-to-the-database).
     - See [Production settings for Django apps](#production-settings-for-django-apps) for specific settings for typical Django apps.
 
 1. **App startup**: Review the section, [Container startup process](#container-startup-process) later in this article to understand how App Service attempts to run your app. App Service uses the Gunicorn web server by default, which must be able to find your app object or *wsgi.py* folder. If needed, you can [Customize the startup command](#customize-startup-command).
 
 1. **Continuous deployment**: Set up continuous deployment, as described on [Continuous deployment to Azure App Service](deploy-continuous-deployment.md) if using Azure Pipelines or Kudu deployment, or [Deploy to App Service using GitHub Actions](./deploy-continuous-deployment.md) if using GitHub actions.
 
-1. **Custom actions**: To perform actions within the App Service container that hosts your app, such as Django database migrations, you can [connect to the container through SSH](configure-linux-open-ssh-session.md). For an example of running Django database migrations, see [Tutorial: Deploy a Django web app with PostgreSQL - run database migrations](tutorial-python-postgresql-app.md#43-run-django-database-migrations).
+1. **Custom actions**: To perform actions within the App Service container that hosts your app, such as Django database migrations, you can [connect to the container through SSH](configure-linux-open-ssh-session.md). For an example of running Django database migrations, see [Tutorial: Deploy a Django web app with PostgreSQL - run database migrations](tutorial-python-postgresql-app.md#7---migrate-app-database).
     - When using continuous deployment, you can perform those actions using post-build commands as described earlier under [Customize build automation](#customize-build-automation).
 
 With these steps completed, you should be able to commit changes to your source repository and have those updates automatically deployed to App Service.
@@ -415,7 +415,7 @@ When attempting to run database migrations with a Django app, you may see "sqlit
 
 Check the `DATABASES` variable in the app's *settings.py* file to ensure that your app is using a cloud database instead of SQLite.
 
-If you're encountering this error with the sample in [Tutorial: Deploy a Django web app with PostgreSQL](tutorial-python-postgresql-app.md), check that you completed the steps in [Configure environment variables to connect the database](tutorial-python-postgresql-app.md#42-configure-environment-variables-to-connect-the-database).
+If you're encountering this error with the sample in [Tutorial: Deploy a Django web app with PostgreSQL](tutorial-python-postgresql-app.md), check that you completed the steps in [Configure environment variables to connect the database](tutorial-python-postgresql-app.md#5---connect-the-web-app-to-the-database).
 
 #### Other issues
 

articles/app-service/includes/tutorial-python-postgresql-app/add-access-to-postgres-from-web-app-cli.md

@@ -0,0 +1,40 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['azure-portal']
+ms.custom: devx-track-python
+---
+
+Create a rule that allows other Azure services to connect to the PostgreSQL server by using the [az postgres server firewall-rule create](/cli/azure/postgres/server/firewall-rule) command.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+az postgres server firewall-rule create --resource-group $RESOURCE_GROUP_NAME \
+                                        --server $DB_SERVER_NAME \
+                                        --name AllowAllWindowsAzureIps \
+                                        --start-ip-address 0.0.0.0 \
+                                        --end-ip-address 0.0.0.0
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+az postgres server firewall-rule create --resource-group $RESOURCE_GROUP_NAME `
+                                        --server $DB_SERVER_NAME `
+                                        --name AllowAllWindowsAzureIps `
+                                        --start-ip-address 0.0.0.0 `
+                                        --end-ip-address 0.0.0.0
+```
+
+---
+
+* *resource-group* → Name of resource group from earlier in this tutorial. (`msdocs-python-postgres-webapp-rg`)
+* *server* → Name of the server from **Step 1**. (`msdocs-python-postgres-webapp-db`)
+* *name* → Name for firewall rule. (use `AllowAllWindowsAzureIps`)
+* *start-ip-address, end-ip-address* → `0.0.0.0` signals that access will be from other Azure services. This is sufficient for a demonstration app, but for a production app you should use an [Azure Virtual Network](/azure/virtual-network/virtual-networks-overview).

articles/app-service/includes/tutorial-python-postgresql-app/add-access-to-postgres-from-web-app-portal-1.md

@@ -0,0 +1,22 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['azure-portal']
+ms.custom: devx-track-python
+---
+
+Add a rule to allow your web app to access the PostgreSQL Flexible server.
+
+1. In the left resource page for the server, select **Networking**.
+
+1. Select the checkbox next to **Allow public access from any Azure service within Azure to this server**.
+
+1. Select **Save** to save the change.
+
+To further secure communication between production web apps and database servers, you should use an
+[Azure Virtual Network](/azure/virtual-network/virtual-networks-overview).

articles/app-service/includes/tutorial-python-postgresql-app/clean-up-resources-cli.md

@@ -0,0 +1,31 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/28/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['vscode-azure-tools']
+ms.custom: devx-track-python
+---
+
+Delete the resource group by using the [az group delete](/cli/azure/group#az_group_delete) command.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+az group delete \
+    --name $RESOURCE_GROUP_NAME 
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+az group delete `
+    --name $RESOURCE_GROUP_NAME 
+```
+
+---
+
+You can optionally add the `--no-wait` argument to allow the command to return before the operation is complete.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-azure-portal-1.md

@@ -0,0 +1,17 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['azure-portal']
+ms.custom: devx-track-python
+---
+
+In the portal, go to the App Service page for the web app.
+
+1. Select **Configuration** under **Settings** on the left side.
+
+1. Select **Application settings** at the top of the page.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-azure-portal-2.md

@@ -0,0 +1,25 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['azure-portal']
+ms.custom: devx-track-python
+---
+
+Create application settings:
+
+1. Select **+ New application setting** to create settings for each of the following values (which are expected by the django sample app):
+
+    * *DBHOST* &rarr; Use the server name you used earlier when created the database, for example, *msdocs-python-postgres-webapp-db-\<unique id>*.
+    The code in azuresite/production.py automatically appends .postgres.database.azure.com to create the full PostgreSQL server URL.
+    * *DBNAME* &rarr;  Enter `restaurant`, the name of the application database.
+    * *DBUSER* &rarr; The administrator user name used when you provisioned the database.
+    * *DBPASS* &rarr; The administrator **secure password** you created earlier.
+
+1. Confirm you have four settings and view their hidden values.
+
+1. Select **Save** and to apply the settings.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-cli.md

@@ -0,0 +1,37 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['vscode-azure-tools']
+ms.custom: devx-track-python
+---
+
+To set environment variables in App Service, you create *app settings* with the following [az webapp config appsettings set](/cli/azure/webapp/config/appsettings#az_webapp_config_appsettings_set) command.
+
+#### [bash](#tab/terminal-bash)
+
+```azurecli
+az webapp config appsettings set \
+   --resource-group $RESOURCE_GROUP_NAME \
+   --name $APP_SERVICE_NAME \
+   --settings DBHOST=$DB_SERVER_NAME DBNAME=$DB_NAME  DBUSER=$ADMIN_USERNAME DBPASS=$ADMIN_PWD
+```
+
+#### [PowerShell terminal](#tab/terminal-powershell)
+
+```azurecli
+az webapp config appsettings set `
+   --resource-group $RESOURCE_GROUP_NAME `
+   --name $APP_SERVICE_NAME `
+   --settings DBHOST=$DB_SERVER_NAME DBNAME=$DB_NAME  DBUSER=$ADMIN_USERNAME DBPASS=$ADMIN_PWD
+```
+
+---
+
+* *DBHOST* → Use the name of the name you used earlier with the `az postgres flexible-server create` command. The code in *azuresite/production.py* automatically appends `.postgres.database.azure.com` to create the full PostgreSQL server URL.
+* *DBNAME* → Use `restaurant`.
+* *DBUSER, DBPASS* → Use the administrator credentials that you used with the earlier `az postgres flexible-server create` command. The code in *azuresite/production.py* automatically constructs the full Postgres username from `DBUSER` and `DBHOST`, so don't include the `@server` portion.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-1.md

@@ -0,0 +1,13 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['vscode-azure-tools']
+ms.custom: devx-track-python
+---
+
+Locate the Azure icon in the left-hand toolbar and select it to bring up the Azure Tools for VS Code extension.

articles/app-service/includes/tutorial-python-postgresql-app/connect-postgres-to-app-visual-studio-code-2.md

@@ -0,0 +1,17 @@
+---
+author: jess-johnson-msft
+ms.author: jejohn
+ms.topic: include
+ms.date: 01/25/2022
+ms.service: app-service
+ms.role: developer
+ms.devlang: python
+ms.azure.devx-azure-tooling: ['vscode-azure-tools']
+ms.custom: devx-track-python
+---
+
+In the **App Service** section of the Azure Tools extension:
+
+1. Locate your web app, expand the node, and under **Application Settings** right-click to bring up the context menu.
+
+1. Select **Add new setting...** from the menu.