terraform updates

Author: kolosovpetro

build/azure-pipelines-terraform-destroy.yml

@@ -49,7 +49,7 @@ stages:
 
           - bash: |
               terraform plan -destroy \
-                -var "prefix=$(prefix)" \
+                -var "prefix=$(kv-prefix)" \
                 -var "sql_admin_password=$(kv-sql-password)" \
                 -out $PLAN_FILE
             displayName: Terraform Plan -Destroy

terraform/README.md

@@ -37,14 +37,15 @@
     - ![tf_init](../img/terraform_init.PNG)
 - Plan examples
     - `terraform plan -var "prefix=${prefix}" -out "main.tfplan"`
+    - `terraform plan -var "prefix=${prefix}" -var "sql_admin_password=$env:MANGO_TF_SQL_PASS" -out "main.tfplan"`
     - `terraform plan -out main.tfplan`
     - `terraform plan -var-file='terraform.dev.tfvars' -var sql_admin_username='razumovsky_r' -var sql_admin_password='Zd2yqLgyV4uHVC0eTPiH' -out 'main.tfplan'`
     - `terraform plan -var-file='terraform.dev.tfvars' -out 'dev.tfplan'`
 - Apply examples:
     - `terraform apply main.tfplan`
     - `terraform fmt --check`
 - Destroy examples:
-    - `terraform plan -destroy -out "main.destroy.tfplan"`
+    - `terraform plan -var "sql_admin_password=$env:MANGO_TF_SQL_PASS" -var "prefix=${prefix}" -destroy -out "main.destroy.tfplan"`
     - `terraform apply -destroy -auto-approve "main.destroy.tfplan"`
 - Workspace examples:
     - `terraform workspace new d01`

terraform/modules/sql/main.tf

@@ -22,14 +22,13 @@ resource "azurerm_mssql_database" "public" {
   depends_on = [azurerm_mssql_server.public]
 }
 
-#resource "azurerm_mssql_firewall_rule" "public" {
-#  for_each         = toset(azurerm_windows_web_app.public.outbound_ip_address_list)
-#  name             = "FirewallRule_${replace(each.key, ".", "_")}"
-#  server_id        = azurerm_mssql_server.public.id
-#  start_ip_address = each.key
-#  end_ip_address   = each.key
-#
-#  depends_on = [azurerm_mssql_server.public, azurerm_mssql_database.public, azurerm_windows_web_app.public]
-#}
+resource "azurerm_mssql_firewall_rule" "public" {
+  name             = "AllowAzureResources"
+  server_id        = azurerm_mssql_server.public.id
+  start_ip_address = "0.0.0.0"
+  end_ip_address   = "0.0.0.0"
+
+  depends_on = [azurerm_mssql_server.public]
+}
 
 

terraform/modules/webapp/variables.tf

@@ -24,7 +24,7 @@ variable "app_service_name" {
 
 variable "app_service_plan_sku" {
   type        = string
-  default     = "F1"
+  default     = "B1"
   description = "Messenger app service plan sku"
 }
 

terraform/versions.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.42.0"
+      version = "=3.47.0"
     }
   }