Merge pull request #14 from pamelafox/updates-apr13

README.md

@@ -90,21 +90,19 @@ This repository is set up for deployment on Azure App Service (w/PostgreSQL flex
 
 1. Sign up for a [free Azure account](https://azure.microsoft.com/free/)
 2. Install the [Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd). (If you open this repository in Codespaces or with the VS Code Dev Containers extension, that part will be done for you.)
-3. Initialize a new `azd` environment:
+3. Login to Azure:
 
     ```shell
-    azd init
+    azd auth login
     ```
 
-    It will prompt you to provide a name (like "django-app") that will later be used in the name of the deployed resources.
-
 4. Provision and deploy all the resources:
 
     ```shell
     azd up
     ```
 
-    It will prompt you to login, pick a subscription, and provide a location (like "eastus"). Then it will provision the resources in your account and deploy the latest code. If you get an error with deployment, changing the location (like to "centralus") can help, as there may be availability constraints for some of the resources.
+    It will prompt you to provide an `azd` environment name (like "django-app"), select a subscription from your Azure account, and select a location (like "eastus"). Then it will provision the resources in your account and deploy the latest code. If you get an error with deployment, changing the location can help, as there may be availability constraints for some of the resources.
 
 5. To be able to access `/admin`, you'll need a Django superuser. Navigate to the Azure Portal for the App Service, select SSH, and run this command:
 

infra/main.bicep

@@ -9,10 +9,6 @@ param name string
 @description('Primary location for all resources')
 param location string
 
-@secure()
-@description('PostGreSQL Server administrator username')
-param postgresAdminUser string
-
 @secure()
 @description('PostGreSQL Server administrator password')
 param postgresAdminPassword string
@@ -24,6 +20,7 @@ param principalId string = ''
 @description('Django SECRET_KEY for cryptographic signing')
 param djangoSecretKey string
 
+
 var resourceToken = toLower(uniqueString(subscription().id, name, location))
 var tags = { 'azd-env-name': name }
 
@@ -36,7 +33,7 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = {
 var prefix = '${name}-${resourceToken}'
 
 var postgresServerName = '${prefix}-postgresql'
-
+var postgresAdminUser = 'admin${uniqueString(resourceGroup.id)}'
 var postgresDatabaseName = 'django'
 
 module postgresServer 'core/database/postgresql/flexibleserver.bicep' = {

infra/main.parameters.json

@@ -11,9 +11,6 @@
       "principalId": {
         "value": "${AZURE_PRINCIPAL_ID}"
       },
-      "postgresAdminUser": {
-        "value": "$(secretOrRandomPassword ${AZURE_KEY_VAULT_NAME} postgresAdminUser)"
-      },
       "postgresAdminPassword": {
         "value": "$(secretOrRandomPassword ${AZURE_KEY_VAULT_NAME} postgresAdminPassword)"
       },