diff --git a/.github/workflows/azure-deploy-review.yml b/.github/workflows/azure-deploy-review.yml index 8ef626561..60033a7c5 100644 --- a/.github/workflows/azure-deploy-review.yml +++ b/.github/workflows/azure-deploy-review.yml @@ -108,6 +108,11 @@ jobs: --slot ${{ env.PR_NUMBER }} \ --configuration-source ${{ vars.REVIEWAPP_NAME }} \ --deployment-container-image-name ${{ env.DOCKER_IMAGE }}:${{ env.PR_NUMBER }} + az webapp vnet-integration add --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} \ + --name ${{ vars.REVIEWAPP_NAME }} \ + --slot ${{ env.PR_NUMBER }} \ + --subnet ${{ secrets.AZURE_REVIEW_APP_SUBNET }} \ + --vnet ${{ secrets.AZURE_VNET }} az webapp config appsettings set --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} \ --name ${{ vars.REVIEWAPP_NAME }} \ --slot ${{ env.PR_NUMBER }} \ diff --git a/.github/workflows/tf-azure-deploy.yml b/.github/workflows/tf-azure-deploy.yml index 1177630f0..bd600eae5 100644 --- a/.github/workflows/tf-azure-deploy.yml +++ b/.github/workflows/tf-azure-deploy.yml @@ -165,7 +165,12 @@ jobs: # Initialise a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. - name: Terraform Init - run: terraform init + run: > + terraform init + -backend-config="resource_group_name=${{ secrets.TERRAFORM_STATE_RESOURCE_GROUP }}" + -backend-config="storage_account_name=${{ secrets.TERRAFORM_STATE_STORAGE_ACCOUNT_NAME }}" + -backend-config="container_name=${{ secrets.TERRAFORM_STATE_STORAGE_CONTAINER_NAME }}" + -backend-config="key=${{ secrets.TERRAFORM_STATE_KEY }}" # Download saved plan from artifacts - name: Download Terraform Plan diff --git a/terraform-azure/terraform-azure-database/main.tf b/terraform-azure/terraform-azure-database/main.tf index 2a1f83595..1fe3f62f8 100644 --- a/terraform-azure/terraform-azure-database/main.tf +++ b/terraform-azure/terraform-azure-database/main.tf @@ -44,6 +44,6 @@ resource "azurerm_postgresql_flexible_server_configuration" "psqlfs_config" { resource "azurerm_postgresql_flexible_server_database" "psqldb" { name = "${var.resource_name_prefix}-${random_pet.name.id}-psqldb" server_id = azurerm_postgresql_flexible_server.psqlfs.id - collation = "en_US.UTF8" - charset = "UTF8" + collation = "en_US.utf8" + charset = "utf8" } \ No newline at end of file