From 647eabdd412d03d97cc4b72aa8de69d3246b5e8a Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 05:48:30 -0400
Subject: [PATCH 01/10] UPDATE with new rules

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 50e5802..30ccb71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,12 @@ override.tf.json
 
 # Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
 # example: *tfplan*
+*tfplan*
+
+*.terraform.lock.hcl
 
 # Mac Files
 .DS_Store
+
+# IntelliJ IDEA files
+*.idea/

From ee2c4f1f42283fa955bae7fba47c67ef0d664f6c Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 05:50:13 -0400
Subject: [PATCH 02/10] UPDATE terraform fmt

---
 .../top-level-blocks-samples.tf               |   4 +-
 .../terraform-manifests/c1-versions.tf        |   2 +-
 .../terraform-manifests/c1-versions.tf        |   8 +-
 .../c2-generic-input-variables.tf             |  16 +--
 .../terraform-manifests/c3-locals.tf          |   6 +-
 .../c4-random-resources.tf                    |   6 +-
 .../terraform-manifests/c5-resource-group.tf  |   4 +-
 .../c6-01-vnet-input-variables.tf             |  40 +++---
 .../c6-02-virtual-network.tf                  |   2 +-
 .../c6-03-web-subnet-and-nsg.tf               |  10 +-
 .../c6-04-app-subnet-and-nsg.tf               |  10 +-
 .../c6-05-db-subnet-and-nsg.tf                |  10 +-
 .../c6-06-bastion-subnet-and-nsg.tf           |  10 +-
 .../terraform-manifests/c6-07-vnet-outputs.tf |  12 +-
 .../terraform-manifests/terraform.tfvars      |  18 +--
 .../terraform-manifests/c1-versions.tf        |  12 +-
 .../c2-generic-input-variables.tf             |  16 +--
 .../terraform-manifests/c3-locals.tf          |   6 +-
 .../c4-random-resources.tf                    |   6 +-
 .../terraform-manifests/c5-resource-group.tf  |   4 +-
 .../c6-01-vnet-input-variables.tf             |  40 +++---
 .../c6-02-virtual-network.tf                  |   2 +-
 .../c6-03-web-subnet-and-nsg.tf               |  10 +-
 .../c6-04-app-subnet-and-nsg.tf               |  10 +-
 .../c6-05-db-subnet-and-nsg.tf                |  10 +-
 .../c6-06-bastion-subnet-and-nsg.tf           |  10 +-
 .../terraform-manifests/c6-07-vnet-outputs.tf |  12 +-
 .../c7-05-web-linuxvm-resource.tf             |  24 ++--
 .../c7-06-web-linuxvm-outputs.tf              |  10 +-
 .../c8-01-bastion-host-input-variables.tf     |   4 +-
 .../c8-02-bastion-host-linuxvm.tf             |  24 ++--
 .../c8-03-move-ssh-key-to-bastion-host.tf     |  12 +-
 .../c8-05-bastion-outputs.tf                  |   2 +-
 .../c9-02-web-loadbalancer-resource.tf        |  30 ++---
 .../c9-03-web-loadbalancer-outputs.tf         |   6 +-
 ...9-04-web-loadbalancer-inbound-nat-rules.tf |  20 +--
 .../terraform-manifests/terraform.tfvars      |  20 +--
 .../terraform-manifests/c1-versions.tf        |  12 +-
 .../c2-generic-input-variables.tf             |  16 +--
 .../terraform-manifests/c3-locals.tf          |   6 +-
 .../c4-random-resources.tf                    |   6 +-
 .../terraform-manifests/c5-resource-group.tf  |   4 +-
 .../c6-01-vnet-input-variables.tf             |  48 ++++----
 .../c6-02-virtual-network.tf                  |   2 +-
 .../c6-03-web-subnet-and-nsg.tf               |  10 +-
 .../c6-04-app-subnet-and-nsg.tf               |  10 +-
 .../c6-05-db-subnet-and-nsg.tf                |  10 +-
 .../c6-06-bastion-subnet-and-nsg.tf           |  10 +-
 .../c6-07-ag-subnet-and-nsg.tf                |  10 +-
 .../terraform-manifests/c6-08-vnet-outputs.tf |  12 +-
 .../c7-01-web-linux-vmss-input-variables.tf   |   8 +-
 ...02-web-linux-vmss-app1-nsg-inline-basic.tf |   2 +-
 .../c7-03-web-linux-vmss-app1-resource.tf     |  24 ++--
 ...x-vmss-app1-autoscaling-default-profile.tf |  58 ++++-----
 ...05-web-linux-vmss-app2-nsg-inline-basic.tf |   2 +-
 .../c7-06-web-linux-vmss-app2-resource.tf     |  24 ++--
 ...x-vmss-app2-autoscaling-default-profile.tf |  58 ++++-----
 .../c7-08-web-linux-vmss-outputs.tf           |   4 +-
 .../c9-02-application-gateway-resource.tf     |  92 +++++++-------
 .../c9-03-application-gateway-outputs.tf      |   8 +-
 .../terraform-manifests/terraform.tfvars      |  20 +--
 .../terraform-manifests/c1-versions.tf        |  12 +-
 .../c10-02-storage-account.tf                 |   4 +-
 .../c10-03-storage-account-outputs.tf         |   4 +-
 .../c11-02-azure-key-vault-resource.tf        |  28 ++---
 .../c2-generic-input-variables.tf             |  16 +--
 .../terraform-manifests/c3-locals.tf          |   6 +-
 .../c4-random-resources.tf                    |   6 +-
 .../terraform-manifests/c5-resource-group.tf  |   4 +-
 .../c6-01-vnet-input-variables.tf             |  48 ++++----
 .../c6-02-virtual-network.tf                  |   2 +-
 .../c6-03-web-subnet-and-nsg.tf               |  10 +-
 .../c6-04-app-subnet-and-nsg.tf               |  10 +-
 .../c6-05-db-subnet-and-nsg.tf                |  10 +-
 .../c6-06-bastion-subnet-and-nsg.tf           |  10 +-
 .../c6-07-ag-subnet-and-nsg.tf                |  10 +-
 .../terraform-manifests/c6-08-vnet-outputs.tf |  12 +-
 .../c7-01-web-linux-vmss-input-variables.tf   |   4 +-
 .../c7-02-web-linux-vmss-nsg-inline-basic.tf  |   2 +-
 .../c7-03-web-linux-vmss-resource.tf          |  24 ++--
 .../c7-04-web-linux-vmss-outputs.tf           |   2 +-
 ...-linux-vmss-autoscaling-default-profile.tf |  60 ++++-----
 .../c9-02-application-gateway-resource.tf     | 114 +++++++++---------
 .../c9-03-application-gateway-outputs.tf      |   8 +-
 ...04-application-gateway-managed-identity.tf |   2 +-
 .../terraform-manifests/terraform.tfvars      |  20 +--
 86 files changed, 666 insertions(+), 666 deletions(-)

diff --git a/04-Terraform-Language-Syntax/terraform-manifests/top-level-blocks-samples.tf b/04-Terraform-Language-Syntax/terraform-manifests/top-level-blocks-samples.tf
index aa61e2f..85d9860 100644
--- a/04-Terraform-Language-Syntax/terraform-manifests/top-level-blocks-samples.tf
+++ b/04-Terraform-Language-Syntax/terraform-manifests/top-level-blocks-samples.tf
@@ -9,12 +9,12 @@ terraform {
     }
   }
 # Terraform State Storage to Azure Storage Container
-  backend "azurerm" {
+/*  backend "azurerm" {
     resource_group_name   = "terraform-storage-rg"
     storage_account_name  = "terraformstate201"
     container_name        = "tfstatefiles"
     key                   = "terraform.tfstate"
-  }   
+  }*/
 }
 
 #####################################################################
diff --git a/05-Terraform-Provider-Resource-Block-Basics/terraform-manifests/c1-versions.tf b/05-Terraform-Provider-Resource-Block-Basics/terraform-manifests/c1-versions.tf
index 18e92aa..866672b 100644
--- a/05-Terraform-Provider-Resource-Block-Basics/terraform-manifests/c1-versions.tf
+++ b/05-Terraform-Provider-Resource-Block-Basics/terraform-manifests/c1-versions.tf
@@ -1,6 +1,6 @@
 # Terraform Block
 terraform {
-  required_version = ">= 1.0.0"
+  required_version = "~> 1.0"
   required_providers {
     azurerm = {
       source = "hashicorp/azurerm"
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c1-versions.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c1-versions.tf
index c7519af..5e10510 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c1-versions.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c1-versions.tf
@@ -3,11 +3,11 @@ terraform {
   required_version = ">= 1.0.0"
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
-      version = ">= 2.0" 
+      source  = "hashicorp/azurerm"
+      version = ">= 2.0"
     }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = ">= 3.0"
     }
   }
@@ -15,7 +15,7 @@ terraform {
 
 # Provider Block
 provider "azurerm" {
- features {}          
+  features {}
 }
 
 
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c2-generic-input-variables.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c2-generic-input-variables.tf
index dd40ef9..3b48802 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c2-generic-input-variables.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c2-generic-input-variables.tf
@@ -2,27 +2,27 @@
 # Business Division
 variable "business_divsion" {
   description = "Business Division in the large organization this Infrastructure belongs"
-  type = string
-  default = "sap"
+  type        = string
+  default     = "sap"
 }
 # Environment Variable
 variable "environment" {
   description = "Environment Variable used as a prefix"
-  type = string
-  default = "dev"
+  type        = string
+  default     = "dev"
 }
 
 # Azure Resource Group Name 
 variable "resource_group_name" {
   description = "Resource Group Name"
-  type = string
-  default = "rg-default"  
+  type        = string
+  default     = "rg-default"
 }
 
 # Azure Resources Location
 variable "resource_group_location" {
   description = "Region in which Azure Resources to be created"
-  type = string
-  default = "eastus2"  
+  type        = string
+  default     = "eastus2"
 }
 
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c3-locals.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c3-locals.tf
index b3da559..150badb 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c3-locals.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c3-locals.tf
@@ -1,11 +1,11 @@
 # Define Local Values in Terraform
 locals {
-  owners = var.business_divsion
-  environment = var.environment
+  owners               = var.business_divsion
+  environment          = var.environment
   resource_name_prefix = "${var.business_divsion}-${var.environment}"
   #name = "${local.owners}-${local.environment}"
   common_tags = {
-    owners = local.owners
+    owners      = local.owners
     environment = local.environment
   }
 } 
\ No newline at end of file
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c4-random-resources.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c4-random-resources.tf
index b599262..686c5b7 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c4-random-resources.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c4-random-resources.tf
@@ -1,7 +1,7 @@
 # Random String Resource
 resource "random_string" "myrandom" {
-  length = 6
-  upper = false 
+  length  = 6
+  upper   = false
   special = false
-  number = false   
+  number  = false
 }
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c5-resource-group.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c5-resource-group.tf
index c3a7d70..261c58b 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c5-resource-group.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c5-resource-group.tf
@@ -1,7 +1,7 @@
 # Resource-1: Azure Resource Group
 resource "azurerm_resource_group" "rg" {
   # name = "${local.resource_name_prefix}-${var.resource_group_name}"
-  name = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
+  name     = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
   location = var.resource_group_location
-  tags = local.common_tags
+  tags     = local.common_tags
 }
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-01-vnet-input-variables.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-01-vnet-input-variables.tf
index 3430643..f1a4607 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-01-vnet-input-variables.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-01-vnet-input-variables.tf
@@ -3,69 +3,69 @@
 ## Virtual Network
 variable "vnet_name" {
   description = "Virtual Network name"
-  type = string
-  default = "vnet-default"
+  type        = string
+  default     = "vnet-default"
 }
 variable "vnet_address_space" {
   description = "Virtual Network address_space"
-  type = list(string)
-  default = ["10.0.0.0/16"]
+  type        = list(string)
+  default     = ["10.0.0.0/16"]
 }
 
 
 # Web Subnet Name
 variable "web_subnet_name" {
   description = "Virtual Network Web Subnet Name"
-  type = string
-  default = "websubnet"
+  type        = string
+  default     = "websubnet"
 }
 # Web Subnet Address Space
 variable "web_subnet_address" {
   description = "Virtual Network Web Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.1.0/24"]
+  type        = list(string)
+  default     = ["10.0.1.0/24"]
 }
 
 
 # App Subnet Name
 variable "app_subnet_name" {
   description = "Virtual Network App Subnet Name"
-  type = string
-  default = "appsubnet"
+  type        = string
+  default     = "appsubnet"
 }
 # App Subnet Address Space
 variable "app_subnet_address" {
   description = "Virtual Network App Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.11.0/24"]
+  type        = list(string)
+  default     = ["10.0.11.0/24"]
 }
 
 
 # Database Subnet Name
 variable "db_subnet_name" {
   description = "Virtual Network Database Subnet Name"
-  type = string
-  default = "dbsubnet"
+  type        = string
+  default     = "dbsubnet"
 }
 # Database Subnet Address Space
 variable "db_subnet_address" {
   description = "Virtual Network Database Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.21.0/24"]
+  type        = list(string)
+  default     = ["10.0.21.0/24"]
 }
 
 
 # Bastion / Management Subnet Name
 variable "bastion_subnet_name" {
   description = "Virtual Network Bastion Subnet Name"
-  type = string
-  default = "bastionsubnet"
+  type        = string
+  default     = "bastionsubnet"
 }
 # Bastion / Management Subnet Address Space
 variable "bastion_subnet_address" {
   description = "Virtual Network Bastion Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.100.0/24"]
+  type        = list(string)
+  default     = ["10.0.100.0/24"]
 }
 
 
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-02-virtual-network.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-02-virtual-network.tf
index d1eed4e..969e2ab 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-02-virtual-network.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-02-virtual-network.tf
@@ -4,5 +4,5 @@ resource "azurerm_virtual_network" "vnet" {
   address_space       = var.vnet_address_space
   location            = azurerm_resource_group.rg.location
   resource_group_name = azurerm_resource_group.rg.name
-  tags = local.common_tags
+  tags                = local.common_tags
 }
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-03-web-subnet-and-nsg.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-03-web-subnet-and-nsg.tf
index 0a0b7f1..f95c9d0 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-03-web-subnet-and-nsg.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-03-web-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "websubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.web_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.web_subnet_address  
+  address_prefixes     = var.web_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "web_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "web_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.websubnet.id
   network_security_group_id = azurerm_network_security_group.web_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "120" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for WebTier Subnets
 resource "azurerm_network_security_rule" "web_nsg_rule_inbound" {
-  for_each = local.web_inbound_ports_map
+  for_each                    = local.web_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-04-app-subnet-and-nsg.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-04-app-subnet-and-nsg.tf
index cb560e1..f4bddb1 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-04-app-subnet-and-nsg.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-04-app-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "appsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.app_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.app_subnet_address  
+  address_prefixes     = var.app_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "app_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "app_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.app_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.app_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.appsubnet.id
   network_security_group_id = azurerm_network_security_group.app_subnet_nsg.id
 }
@@ -28,18 +28,18 @@ locals {
     "110" : "443",
     "120" : "8080",
     "130" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for AppTier Subnets
 resource "azurerm_network_security_rule" "app_nsg_rule_inbound" {
-  for_each = local.app_inbound_ports_map
+  for_each                    = local.app_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-05-db-subnet-and-nsg.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-05-db-subnet-and-nsg.tf
index 2e60aa8..2b0b05b 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-05-db-subnet-and-nsg.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-05-db-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "dbsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.db_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.db_subnet_address  
+  address_prefixes     = var.db_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "db_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "db_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.db_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.db_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.dbsubnet.id
   network_security_group_id = azurerm_network_security_group.db_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "3306", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "1433",
     "120" : "5432"
-  } 
+  }
 }
 ## NSG Inbound Rule for DBTier Subnets
 resource "azurerm_network_security_rule" "db_nsg_rule_inbound" {
-  for_each = local.db_inbound_ports_map
+  for_each                    = local.db_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
index 837e89e..04c59a9 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
@@ -1,6 +1,6 @@
 # Resource-1: Create Bastion / Management Subnet
 resource "azurerm_subnet" "bastionsubnet" {
-  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"  
+  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
   address_prefixes     = var.bastion_subnet_address
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "bastion_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "bastion_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.bastion_nsg_rule_inbound]    
+  depends_on                = [azurerm_network_security_rule.bastion_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.bastionsubnet.id
   network_security_group_id = azurerm_network_security_group.bastion_subnet_nsg.id
 }
@@ -26,18 +26,18 @@ locals {
   bastion_inbound_ports_map = {
     "100" : "22", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "3389"
-  } 
+  }
 }
 ## NSG Inbound Rule for Bastion / Management Subnets
 resource "azurerm_network_security_rule" "bastion_nsg_rule_inbound" {
-  for_each = local.bastion_inbound_ports_map
+  for_each                    = local.bastion_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-07-vnet-outputs.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-07-vnet-outputs.tf
index 8c84557..398909e 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-07-vnet-outputs.tf
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/c6-07-vnet-outputs.tf
@@ -2,36 +2,36 @@
 ## Virtual Network Name
 output "virtual_network_name" {
   description = "Virtual Network Name"
-  value = azurerm_virtual_network.vnet.name
+  value       = azurerm_virtual_network.vnet.name
 }
 ## Virtual Network ID
 output "virtual_network_id" {
   description = "Virtual Network ID"
-  value = azurerm_virtual_network.vnet.id
+  value       = azurerm_virtual_network.vnet.id
 }
 
 # Subnet Outputs (We will write for one web subnet and rest all we will ignore for now)
 ## Subnet Name 
 output "web_subnet_name" {
   description = "WebTier Subnet Name"
-  value = azurerm_subnet.websubnet.name
+  value       = azurerm_subnet.websubnet.name
 }
 
 ## Subnet ID 
 output "web_subnet_id" {
   description = "WebTier Subnet ID"
-  value = azurerm_subnet.websubnet.id
+  value       = azurerm_subnet.websubnet.id
 }
 
 # Network Security Outputs
 ## Web Subnet NSG Name 
 output "web_subnet_nsg_name" {
   description = "WebTier Subnet NSG Name"
-  value = azurerm_network_security_group.web_subnet_nsg.name
+  value       = azurerm_network_security_group.web_subnet_nsg.name
 }
 
 ## Web Subnet NSG ID 
 output "web_subnet_nsg_id" {
   description = "WebTier Subnet NSG ID"
-  value = azurerm_network_security_group.web_subnet_nsg.id
+  value       = azurerm_network_security_group.web_subnet_nsg.id
 }
diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/terraform.tfvars b/10-Azure-Virtual-Network-4Tier/terraform-manifests/terraform.tfvars
index 68d6191..bcf26d9 100644
--- a/10-Azure-Virtual-Network-4Tier/terraform-manifests/terraform.tfvars
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/terraform.tfvars
@@ -1,18 +1,18 @@
-business_divsion = "hr"
-environment = "dev"
-resource_group_name = "rg"
+business_divsion        = "hr"
+environment             = "dev"
+resource_group_name     = "rg"
 resource_group_location = "eastus"
-vnet_name = "vnet"
-vnet_address_space = ["10.1.0.0/16"]
+vnet_name               = "vnet"
+vnet_address_space      = ["10.1.0.0/16"]
 
-web_subnet_name = "websubnet"
+web_subnet_name    = "websubnet"
 web_subnet_address = ["10.1.1.0/24"]
 
-app_subnet_name = "appsubnet"
+app_subnet_name    = "appsubnet"
 app_subnet_address = ["10.1.11.0/24"]
 
-db_subnet_name = "dbsubnet"
+db_subnet_name    = "dbsubnet"
 db_subnet_address = ["10.1.21.0/24"]
 
-bastion_subnet_name = "bastionsubnet"
+bastion_subnet_name    = "bastionsubnet"
 bastion_subnet_address = ["10.1.100.0/24"]
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c1-versions.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c1-versions.tf
index 2fbbb75..62228ee 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c1-versions.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c1-versions.tf
@@ -3,23 +3,23 @@ terraform {
   required_version = ">= 1.0.0"
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
-      version = ">= 2.0" 
+      source  = "hashicorp/azurerm"
+      version = ">= 2.0"
     }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = ">= 3.0"
     }
     null = {
-      source = "hashicorp/null"
+      source  = "hashicorp/null"
       version = ">= 3.0"
-    }    
+    }
   }
 }
 
 # Provider Block
 provider "azurerm" {
- features {}          
+  features {}
 }
 
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c2-generic-input-variables.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c2-generic-input-variables.tf
index dd40ef9..3b48802 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c2-generic-input-variables.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c2-generic-input-variables.tf
@@ -2,27 +2,27 @@
 # Business Division
 variable "business_divsion" {
   description = "Business Division in the large organization this Infrastructure belongs"
-  type = string
-  default = "sap"
+  type        = string
+  default     = "sap"
 }
 # Environment Variable
 variable "environment" {
   description = "Environment Variable used as a prefix"
-  type = string
-  default = "dev"
+  type        = string
+  default     = "dev"
 }
 
 # Azure Resource Group Name 
 variable "resource_group_name" {
   description = "Resource Group Name"
-  type = string
-  default = "rg-default"  
+  type        = string
+  default     = "rg-default"
 }
 
 # Azure Resources Location
 variable "resource_group_location" {
   description = "Region in which Azure Resources to be created"
-  type = string
-  default = "eastus2"  
+  type        = string
+  default     = "eastus2"
 }
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c3-locals.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c3-locals.tf
index b3da559..150badb 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c3-locals.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c3-locals.tf
@@ -1,11 +1,11 @@
 # Define Local Values in Terraform
 locals {
-  owners = var.business_divsion
-  environment = var.environment
+  owners               = var.business_divsion
+  environment          = var.environment
   resource_name_prefix = "${var.business_divsion}-${var.environment}"
   #name = "${local.owners}-${local.environment}"
   common_tags = {
-    owners = local.owners
+    owners      = local.owners
     environment = local.environment
   }
 } 
\ No newline at end of file
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c4-random-resources.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c4-random-resources.tf
index b599262..686c5b7 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c4-random-resources.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c4-random-resources.tf
@@ -1,7 +1,7 @@
 # Random String Resource
 resource "random_string" "myrandom" {
-  length = 6
-  upper = false 
+  length  = 6
+  upper   = false
   special = false
-  number = false   
+  number  = false
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c5-resource-group.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c5-resource-group.tf
index c3a7d70..261c58b 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c5-resource-group.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c5-resource-group.tf
@@ -1,7 +1,7 @@
 # Resource-1: Azure Resource Group
 resource "azurerm_resource_group" "rg" {
   # name = "${local.resource_name_prefix}-${var.resource_group_name}"
-  name = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
+  name     = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
   location = var.resource_group_location
-  tags = local.common_tags
+  tags     = local.common_tags
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-01-vnet-input-variables.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-01-vnet-input-variables.tf
index 3430643..f1a4607 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-01-vnet-input-variables.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-01-vnet-input-variables.tf
@@ -3,69 +3,69 @@
 ## Virtual Network
 variable "vnet_name" {
   description = "Virtual Network name"
-  type = string
-  default = "vnet-default"
+  type        = string
+  default     = "vnet-default"
 }
 variable "vnet_address_space" {
   description = "Virtual Network address_space"
-  type = list(string)
-  default = ["10.0.0.0/16"]
+  type        = list(string)
+  default     = ["10.0.0.0/16"]
 }
 
 
 # Web Subnet Name
 variable "web_subnet_name" {
   description = "Virtual Network Web Subnet Name"
-  type = string
-  default = "websubnet"
+  type        = string
+  default     = "websubnet"
 }
 # Web Subnet Address Space
 variable "web_subnet_address" {
   description = "Virtual Network Web Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.1.0/24"]
+  type        = list(string)
+  default     = ["10.0.1.0/24"]
 }
 
 
 # App Subnet Name
 variable "app_subnet_name" {
   description = "Virtual Network App Subnet Name"
-  type = string
-  default = "appsubnet"
+  type        = string
+  default     = "appsubnet"
 }
 # App Subnet Address Space
 variable "app_subnet_address" {
   description = "Virtual Network App Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.11.0/24"]
+  type        = list(string)
+  default     = ["10.0.11.0/24"]
 }
 
 
 # Database Subnet Name
 variable "db_subnet_name" {
   description = "Virtual Network Database Subnet Name"
-  type = string
-  default = "dbsubnet"
+  type        = string
+  default     = "dbsubnet"
 }
 # Database Subnet Address Space
 variable "db_subnet_address" {
   description = "Virtual Network Database Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.21.0/24"]
+  type        = list(string)
+  default     = ["10.0.21.0/24"]
 }
 
 
 # Bastion / Management Subnet Name
 variable "bastion_subnet_name" {
   description = "Virtual Network Bastion Subnet Name"
-  type = string
-  default = "bastionsubnet"
+  type        = string
+  default     = "bastionsubnet"
 }
 # Bastion / Management Subnet Address Space
 variable "bastion_subnet_address" {
   description = "Virtual Network Bastion Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.100.0/24"]
+  type        = list(string)
+  default     = ["10.0.100.0/24"]
 }
 
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-02-virtual-network.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-02-virtual-network.tf
index a10dd3c..2168469 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-02-virtual-network.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-02-virtual-network.tf
@@ -4,7 +4,7 @@ resource "azurerm_virtual_network" "vnet" {
   address_space       = var.vnet_address_space
   location            = azurerm_resource_group.rg.location
   resource_group_name = azurerm_resource_group.rg.name
-  tags = local.common_tags
+  tags                = local.common_tags
 }
 
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-03-web-subnet-and-nsg.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-03-web-subnet-and-nsg.tf
index 0a0b7f1..f95c9d0 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-03-web-subnet-and-nsg.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-03-web-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "websubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.web_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.web_subnet_address  
+  address_prefixes     = var.web_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "web_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "web_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.websubnet.id
   network_security_group_id = azurerm_network_security_group.web_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "120" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for WebTier Subnets
 resource "azurerm_network_security_rule" "web_nsg_rule_inbound" {
-  for_each = local.web_inbound_ports_map
+  for_each                    = local.web_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-04-app-subnet-and-nsg.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-04-app-subnet-and-nsg.tf
index cb560e1..f4bddb1 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-04-app-subnet-and-nsg.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-04-app-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "appsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.app_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.app_subnet_address  
+  address_prefixes     = var.app_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "app_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "app_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.app_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.app_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.appsubnet.id
   network_security_group_id = azurerm_network_security_group.app_subnet_nsg.id
 }
@@ -28,18 +28,18 @@ locals {
     "110" : "443",
     "120" : "8080",
     "130" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for AppTier Subnets
 resource "azurerm_network_security_rule" "app_nsg_rule_inbound" {
-  for_each = local.app_inbound_ports_map
+  for_each                    = local.app_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-05-db-subnet-and-nsg.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-05-db-subnet-and-nsg.tf
index 2e60aa8..2b0b05b 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-05-db-subnet-and-nsg.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-05-db-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "dbsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.db_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.db_subnet_address  
+  address_prefixes     = var.db_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "db_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "db_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.db_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.db_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.dbsubnet.id
   network_security_group_id = azurerm_network_security_group.db_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "3306", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "1433",
     "120" : "5432"
-  } 
+  }
 }
 ## NSG Inbound Rule for DBTier Subnets
 resource "azurerm_network_security_rule" "db_nsg_rule_inbound" {
-  for_each = local.db_inbound_ports_map
+  for_each                    = local.db_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
index 837e89e..04c59a9 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
@@ -1,6 +1,6 @@
 # Resource-1: Create Bastion / Management Subnet
 resource "azurerm_subnet" "bastionsubnet" {
-  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"  
+  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
   address_prefixes     = var.bastion_subnet_address
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "bastion_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "bastion_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.bastion_nsg_rule_inbound]    
+  depends_on                = [azurerm_network_security_rule.bastion_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.bastionsubnet.id
   network_security_group_id = azurerm_network_security_group.bastion_subnet_nsg.id
 }
@@ -26,18 +26,18 @@ locals {
   bastion_inbound_ports_map = {
     "100" : "22", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "3389"
-  } 
+  }
 }
 ## NSG Inbound Rule for Bastion / Management Subnets
 resource "azurerm_network_security_rule" "bastion_nsg_rule_inbound" {
-  for_each = local.bastion_inbound_ports_map
+  for_each                    = local.bastion_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-07-vnet-outputs.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-07-vnet-outputs.tf
index 8c84557..398909e 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-07-vnet-outputs.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c6-07-vnet-outputs.tf
@@ -2,36 +2,36 @@
 ## Virtual Network Name
 output "virtual_network_name" {
   description = "Virtual Network Name"
-  value = azurerm_virtual_network.vnet.name
+  value       = azurerm_virtual_network.vnet.name
 }
 ## Virtual Network ID
 output "virtual_network_id" {
   description = "Virtual Network ID"
-  value = azurerm_virtual_network.vnet.id
+  value       = azurerm_virtual_network.vnet.id
 }
 
 # Subnet Outputs (We will write for one web subnet and rest all we will ignore for now)
 ## Subnet Name 
 output "web_subnet_name" {
   description = "WebTier Subnet Name"
-  value = azurerm_subnet.websubnet.name
+  value       = azurerm_subnet.websubnet.name
 }
 
 ## Subnet ID 
 output "web_subnet_id" {
   description = "WebTier Subnet ID"
-  value = azurerm_subnet.websubnet.id
+  value       = azurerm_subnet.websubnet.id
 }
 
 # Network Security Outputs
 ## Web Subnet NSG Name 
 output "web_subnet_nsg_name" {
   description = "WebTier Subnet NSG Name"
-  value = azurerm_network_security_group.web_subnet_nsg.name
+  value       = azurerm_network_security_group.web_subnet_nsg.name
 }
 
 ## Web Subnet NSG ID 
 output "web_subnet_nsg_id" {
   description = "WebTier Subnet NSG ID"
-  value = azurerm_network_security_group.web_subnet_nsg.id
+  value       = azurerm_network_security_group.web_subnet_nsg.id
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-05-web-linuxvm-resource.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-05-web-linuxvm-resource.tf
index 736e32b..50a0257 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-05-web-linuxvm-resource.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-05-web-linuxvm-resource.tf
@@ -1,6 +1,6 @@
 # Locals Block for custom data
 locals {
-webvm_custom_data = <<CUSTOM_DATA
+  webvm_custom_data = <<CUSTOM_DATA
 #!/bin/sh
 #sudo yum update -y
 sudo yum install -y httpd
@@ -23,26 +23,26 @@ CUSTOM_DATA
 resource "azurerm_linux_virtual_machine" "web_linuxvm" {
   name = "${local.resource_name_prefix}-web-linuxvm"
   #computer_name = "web-linux-vm"  # Hostname of the VM (Optional)
-  resource_group_name = azurerm_resource_group.rg.name
-  location = azurerm_resource_group.rg.location
-  size = "Standard_DS1_v2"
-  admin_username = "azureuser"
-  network_interface_ids = [ azurerm_network_interface.web_linuxvm_nic.id ]
+  resource_group_name   = azurerm_resource_group.rg.name
+  location              = azurerm_resource_group.rg.location
+  size                  = "Standard_DS1_v2"
+  admin_username        = "azureuser"
+  network_interface_ids = [azurerm_network_interface.web_linuxvm_nic.id]
   admin_ssh_key {
-    username = "azureuser"
+    username   = "azureuser"
     public_key = file("${path.module}/ssh-keys/terraform-azure.pub")
   }
   os_disk {
-    caching = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
   source_image_reference {
     publisher = "RedHat"
-    offer = "RHEL"
-    sku = "83-gen2"
-    version = "latest"
+    offer     = "RHEL"
+    sku       = "83-gen2"
+    version   = "latest"
   }
   #custom_data = filebase64("${path.module}/app-scripts/redhat-webvm-script.sh")    
-  custom_data = base64encode(local.webvm_custom_data)  
+  custom_data = base64encode(local.webvm_custom_data)
 
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-06-web-linuxvm-outputs.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-06-web-linuxvm-outputs.tf
index fc317f6..ff147d8 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-06-web-linuxvm-outputs.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c7-06-web-linuxvm-outputs.tf
@@ -11,12 +11,12 @@ output "web_linuxvm_public_ip" {
 ## Network Interface ID
 output "web_linuxvm_network_interface_id" {
   description = "Web Linux VM Network Interface ID"
-  value = azurerm_network_interface.web_linuxvm_nic.id
+  value       = azurerm_network_interface.web_linuxvm_nic.id
 }
 ## Network Interface Private IP Addresses
 output "web_linuxvm_network_interface_private_ip_addresses" {
   description = "Web Linux VM Private IP Addresses"
-  value = [azurerm_network_interface.web_linuxvm_nic.private_ip_addresses]
+  value       = [azurerm_network_interface.web_linuxvm_nic.private_ip_addresses]
 }
 
 # Linux VM Outputs
@@ -31,17 +31,17 @@ output "web_linuxvm_public_ip_address" {
 ## Virtual Machine Private IP
 output "web_linuxvm_private_ip_address" {
   description = "Web Linux Virtual Machine Private IP"
-  value = azurerm_linux_virtual_machine.web_linuxvm.private_ip_address
+  value       = azurerm_linux_virtual_machine.web_linuxvm.private_ip_address
 }
 ## Virtual Machine 128-bit ID
 output "web_linuxvm_virtual_machine_id_128bit" {
   description = "Web Linux Virtual Machine ID - 128-bit identifier"
-  value = azurerm_linux_virtual_machine.web_linuxvm.virtual_machine_id
+  value       = azurerm_linux_virtual_machine.web_linuxvm.virtual_machine_id
 }
 ## Virtual Machine ID
 output "web_linuxvm_virtual_machine_id" {
   description = "Web Linux Virtual Machine ID "
-  value = azurerm_linux_virtual_machine.web_linuxvm.id
+  value       = azurerm_linux_virtual_machine.web_linuxvm.id
 }
 
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-01-bastion-host-input-variables.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-01-bastion-host-input-variables.tf
index e261f73..4bd0da2 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-01-bastion-host-input-variables.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-01-bastion-host-input-variables.tf
@@ -2,10 +2,10 @@
 
 variable "bastion_service_subnet_name" {
   description = "Bastion Service Subnet Name"
-  default = "AzureBastionSubnet"
+  default     = "AzureBastionSubnet"
 }
 
 variable "bastion_service_address_prefixes" {
   description = "Bastion Service Address Prefixes"
-  default = ["10.0.101.0/27"]
+  default     = ["10.0.101.0/27"]
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-02-bastion-host-linuxvm.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-02-bastion-host-linuxvm.tf
index a062a21..a778aa0 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-02-bastion-host-linuxvm.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-02-bastion-host-linuxvm.tf
@@ -4,7 +4,7 @@ resource "azurerm_public_ip" "bastion_host_publicip" {
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
   allocation_method   = "Static"
-  sku = "Standard"
+  sku                 = "Standard"
 }
 
 # Resource-2: Create Network Interface
@@ -17,7 +17,7 @@ resource "azurerm_network_interface" "bastion_host_linuxvm_nic" {
     name                          = "bastion-host-ip-1"
     subnet_id                     = azurerm_subnet.bastionsubnet.id
     private_ip_address_allocation = "Dynamic"
-    public_ip_address_id = azurerm_public_ip.bastion_host_publicip.id 
+    public_ip_address_id          = azurerm_public_ip.bastion_host_publicip.id
   }
 }
 
@@ -25,24 +25,24 @@ resource "azurerm_network_interface" "bastion_host_linuxvm_nic" {
 resource "azurerm_linux_virtual_machine" "bastion_host_linuxvm" {
   name = "${local.resource_name_prefix}-bastion-linuxvm"
   #computer_name = "bastionlinux-vm"  # Hostname of the VM (Optional)
-  resource_group_name = azurerm_resource_group.rg.name
-  location = azurerm_resource_group.rg.location
-  size = "Standard_DS1_v2"
-  admin_username = "azureuser"
-  network_interface_ids = [ azurerm_network_interface.bastion_host_linuxvm_nic.id ]
+  resource_group_name   = azurerm_resource_group.rg.name
+  location              = azurerm_resource_group.rg.location
+  size                  = "Standard_DS1_v2"
+  admin_username        = "azureuser"
+  network_interface_ids = [azurerm_network_interface.bastion_host_linuxvm_nic.id]
   admin_ssh_key {
-    username = "azureuser"
+    username   = "azureuser"
     public_key = file("${path.module}/ssh-keys/terraform-azure.pub")
   }
   os_disk {
-    caching = "ReadWrite"
+    caching              = "ReadWrite"
     storage_account_type = "Standard_LRS"
   }
   source_image_reference {
     publisher = "RedHat"
-    offer = "RHEL"
-    sku = "83-gen2"
-    version = "latest"
+    offer     = "RHEL"
+    sku       = "83-gen2"
+    version   = "latest"
   }
   #custom_data = filebase64("${path.module}/app-scripts/redhat-app1-script.sh")    
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-03-move-ssh-key-to-bastion-host.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-03-move-ssh-key-to-bastion-host.tf
index c4b478a..68ba2dd 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-03-move-ssh-key-to-bastion-host.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-03-move-ssh-key-to-bastion-host.tf
@@ -1,20 +1,20 @@
 # Create a Null Resource and Provisioners
 resource "null_resource" "name" {
   depends_on = [azurerm_linux_virtual_machine.bastion_host_linuxvm]
-# Connection Block for Provisioners to connect to Azure VM Instance
+  # Connection Block for Provisioners to connect to Azure VM Instance
   connection {
-    type = "ssh"
-    host = azurerm_linux_virtual_machine.bastion_host_linuxvm.public_ip_address
-    user = azurerm_linux_virtual_machine.bastion_host_linuxvm.admin_username
+    type        = "ssh"
+    host        = azurerm_linux_virtual_machine.bastion_host_linuxvm.public_ip_address
+    user        = azurerm_linux_virtual_machine.bastion_host_linuxvm.admin_username
     private_key = file("${path.module}/ssh-keys/terraform-azure.pem")
   }
 
-## File Provisioner: Copies the terraform-key.pem file to /tmp/terraform-key.pem
+  ## File Provisioner: Copies the terraform-key.pem file to /tmp/terraform-key.pem
   provisioner "file" {
     source      = "ssh-keys/terraform-azure.pem"
     destination = "/tmp/terraform-azure.pem"
   }
-## Remote Exec Provisioner: Using remote-exec provisioner fix the private key permissions on Bastion Host
+  ## Remote Exec Provisioner: Using remote-exec provisioner fix the private key permissions on Bastion Host
   provisioner "remote-exec" {
     inline = [
       "sudo chmod 400 /tmp/terraform-azure.pem"
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-05-bastion-outputs.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-05-bastion-outputs.tf
index a373ba4..dd0524f 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-05-bastion-outputs.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c8-05-bastion-outputs.tf
@@ -1,6 +1,6 @@
 ## Bastion Host Public IP Output
 output "bastion_host_linuxvm_public_ip_address" {
   description = "Bastion Host Linux VM Public Address"
-  value = azurerm_public_ip.bastion_host_publicip.ip_address
+  value       = azurerm_public_ip.bastion_host_publicip.ip_address
 }
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-02-web-loadbalancer-resource.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-02-web-loadbalancer-resource.tf
index e8fbdc1..41c8321 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-02-web-loadbalancer-resource.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-02-web-loadbalancer-resource.tf
@@ -4,8 +4,8 @@ resource "azurerm_public_ip" "web_lbpublicip" {
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
   allocation_method   = "Static"
-  sku = "Standard"
-  tags = local.common_tags
+  sku                 = "Standard"
+  tags                = local.common_tags
 }
 
 # Resource-2: Create Azure Standard Load Balancer
@@ -13,26 +13,26 @@ resource "azurerm_lb" "web_lb" {
   name                = "${local.resource_name_prefix}-web-lb"
   location            = azurerm_resource_group.rg.location
   resource_group_name = azurerm_resource_group.rg.name
-  sku = "Standard"
+  sku                 = "Standard"
   frontend_ip_configuration {
     name                 = "web-lb-publicip-1"
     public_ip_address_id = azurerm_public_ip.web_lbpublicip.id
   }
 }
- 
+
 # Resource-3: Create LB Backend Pool
 resource "azurerm_lb_backend_address_pool" "web_lb_backend_address_pool" {
-  name                = "web-backend"
-  loadbalancer_id     = azurerm_lb.web_lb.id
+  name            = "web-backend"
+  loadbalancer_id = azurerm_lb.web_lb.id
 }
 
 # Resource-4: Create LB Probe
 resource "azurerm_lb_probe" "web_lb_probe" {
-  name                = "tcp-probe"
-  protocol            = "Tcp"
-  port                = 80
-  loadbalancer_id     = azurerm_lb.web_lb.id
-  resource_group_name = azurerm_resource_group.rg.name
+  name            = "tcp-probe"
+  protocol        = "Tcp"
+  port            = 80
+  loadbalancer_id = azurerm_lb.web_lb.id
+  #  resource_group_name = azurerm_resource_group.rg.name
 }
 
 # Resource-5: Create LB Rule
@@ -42,10 +42,10 @@ resource "azurerm_lb_rule" "web_lb_rule_app1" {
   frontend_port                  = 80
   backend_port                   = 80
   frontend_ip_configuration_name = azurerm_lb.web_lb.frontend_ip_configuration[0].name
-  backend_address_pool_id        = azurerm_lb_backend_address_pool.web_lb_backend_address_pool.id 
-  probe_id                       = azurerm_lb_probe.web_lb_probe.id
-  loadbalancer_id                = azurerm_lb.web_lb.id
-  resource_group_name            = azurerm_resource_group.rg.name
+  #  backend_address_pool_id        = azurerm_lb_backend_address_pool.web_lb_backend_address_pool.id
+  probe_id        = azurerm_lb_probe.web_lb_probe.id
+  loadbalancer_id = azurerm_lb.web_lb.id
+  #  resource_group_name            = azurerm_resource_group.rg.name
 }
 
 
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-03-web-loadbalancer-outputs.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-03-web-loadbalancer-outputs.tf
index b912221..7d9d947 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-03-web-loadbalancer-outputs.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-03-web-loadbalancer-outputs.tf
@@ -1,17 +1,17 @@
 # LB Public IP
 output "web_lb_public_ip_address" {
   description = "Web Load Balancer Public Address"
-  value = azurerm_public_ip.web_lbpublicip.ip_address
+  value       = azurerm_public_ip.web_lbpublicip.ip_address
 }
 
 # Load Balancer ID
 output "web_lb_id" {
   description = "Web Load Balancer ID."
-  value = azurerm_lb.web_lb.id 
+  value       = azurerm_lb.web_lb.id
 }
 
 # Load Balancer Frontend IP Configuration Block
 output "web_lb_frontend_ip_configuration" {
   description = "Web LB frontend_ip_configuration Block"
-  value = [azurerm_lb.web_lb.frontend_ip_configuration]
+  value       = [azurerm_lb.web_lb.frontend_ip_configuration]
 }
\ No newline at end of file
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-04-web-loadbalancer-inbound-nat-rules.tf b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-04-web-loadbalancer-inbound-nat-rules.tf
index 5cab90d..ca7b9f4 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-04-web-loadbalancer-inbound-nat-rules.tf
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/c9-04-web-loadbalancer-inbound-nat-rules.tf
@@ -1,18 +1,18 @@
 # Azure LB Inbound NAT Rule
 resource "azurerm_lb_nat_rule" "web_lb_inbound_nat_rule_22" {
-  depends_on = [azurerm_linux_virtual_machine.web_linuxvm  ] # To effectively handle azurerm provider related dependency bugs during the destroy resources time
-  name = "ssh-1022-vm-22"
-  protocol = "Tcp"
-  frontend_port = 1022
-  backend_port = 22
+  depends_on                     = [azurerm_linux_virtual_machine.web_linuxvm] # To effectively handle azurerm provider related dependency bugs during the destroy resources time
+  name                           = "ssh-1022-vm-22"
+  protocol                       = "Tcp"
+  frontend_port                  = 1022
+  backend_port                   = 22
   frontend_ip_configuration_name = azurerm_lb.web_lb.frontend_ip_configuration[0].name
-  resource_group_name = azurerm_resource_group.rg.name
-  loadbalancer_id = azurerm_lb.web_lb.id
+  resource_group_name            = azurerm_resource_group.rg.name
+  loadbalancer_id                = azurerm_lb.web_lb.id
 }
 
 # Associate LB NAT Rule and VM Network Interface
 resource "azurerm_network_interface_nat_rule_association" "web_nic_nat_rule_associate" {
-  network_interface_id =  azurerm_network_interface.web_linuxvm_nic.id 
-  ip_configuration_name = azurerm_network_interface.web_linuxvm_nic.ip_configuration[0].name 
-  nat_rule_id = azurerm_lb_nat_rule.web_lb_inbound_nat_rule_22.id
+  network_interface_id  = azurerm_network_interface.web_linuxvm_nic.id
+  ip_configuration_name = azurerm_network_interface.web_linuxvm_nic.ip_configuration[0].name
+  nat_rule_id           = azurerm_lb_nat_rule.web_lb_inbound_nat_rule_22.id
 }
diff --git a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/terraform.tfvars b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/terraform.tfvars
index b4f6723..ab126dc 100644
--- a/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/terraform.tfvars
+++ b/15-Azure-Standard-LoadBalancer-Inbound-NATRules/terraform-manifests/terraform.tfvars
@@ -1,21 +1,21 @@
-business_divsion = "hr"
-environment = "dev"
-resource_group_name = "rg"
+business_divsion        = "hr"
+environment             = "dev"
+resource_group_name     = "rg"
 resource_group_location = "eastus"
-vnet_name = "vnet"
-vnet_address_space = ["10.1.0.0/16"]
+vnet_name               = "vnet"
+vnet_address_space      = ["10.1.0.0/16"]
 
-web_subnet_name = "websubnet"
+web_subnet_name    = "websubnet"
 web_subnet_address = ["10.1.1.0/24"]
 
-app_subnet_name = "appsubnet"
+app_subnet_name    = "appsubnet"
 app_subnet_address = ["10.1.11.0/24"]
 
-db_subnet_name = "dbsubnet"
+db_subnet_name    = "dbsubnet"
 db_subnet_address = ["10.1.21.0/24"]
 
-bastion_subnet_name = "bastionsubnet"
+bastion_subnet_name    = "bastionsubnet"
 bastion_subnet_address = ["10.1.100.0/24"]
 
-bastion_service_subnet_name = "AzureBastionSubnet"
+bastion_service_subnet_name      = "AzureBastionSubnet"
 bastion_service_address_prefixes = ["10.1.101.0/27"]
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c1-versions.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c1-versions.tf
index 2fbbb75..62228ee 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c1-versions.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c1-versions.tf
@@ -3,23 +3,23 @@ terraform {
   required_version = ">= 1.0.0"
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
-      version = ">= 2.0" 
+      source  = "hashicorp/azurerm"
+      version = ">= 2.0"
     }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = ">= 3.0"
     }
     null = {
-      source = "hashicorp/null"
+      source  = "hashicorp/null"
       version = ">= 3.0"
-    }    
+    }
   }
 }
 
 # Provider Block
 provider "azurerm" {
- features {}          
+  features {}
 }
 
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c2-generic-input-variables.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c2-generic-input-variables.tf
index dd40ef9..3b48802 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c2-generic-input-variables.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c2-generic-input-variables.tf
@@ -2,27 +2,27 @@
 # Business Division
 variable "business_divsion" {
   description = "Business Division in the large organization this Infrastructure belongs"
-  type = string
-  default = "sap"
+  type        = string
+  default     = "sap"
 }
 # Environment Variable
 variable "environment" {
   description = "Environment Variable used as a prefix"
-  type = string
-  default = "dev"
+  type        = string
+  default     = "dev"
 }
 
 # Azure Resource Group Name 
 variable "resource_group_name" {
   description = "Resource Group Name"
-  type = string
-  default = "rg-default"  
+  type        = string
+  default     = "rg-default"
 }
 
 # Azure Resources Location
 variable "resource_group_location" {
   description = "Region in which Azure Resources to be created"
-  type = string
-  default = "eastus2"  
+  type        = string
+  default     = "eastus2"
 }
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c3-locals.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c3-locals.tf
index ce77cf4..3bce11f 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c3-locals.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c3-locals.tf
@@ -1,10 +1,10 @@
 # Define Local Values in Terraform
 locals {
-  owners = var.business_divsion
-  environment = var.environment
+  owners               = var.business_divsion
+  environment          = var.environment
   resource_name_prefix = "${var.business_divsion}-${var.environment}"
   common_tags = {
-    owners = local.owners
+    owners      = local.owners
     environment = local.environment
   }
 } 
\ No newline at end of file
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c4-random-resources.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c4-random-resources.tf
index b599262..686c5b7 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c4-random-resources.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c4-random-resources.tf
@@ -1,7 +1,7 @@
 # Random String Resource
 resource "random_string" "myrandom" {
-  length = 6
-  upper = false 
+  length  = 6
+  upper   = false
   special = false
-  number = false   
+  number  = false
 }
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c5-resource-group.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c5-resource-group.tf
index c3a7d70..261c58b 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c5-resource-group.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c5-resource-group.tf
@@ -1,7 +1,7 @@
 # Resource-1: Azure Resource Group
 resource "azurerm_resource_group" "rg" {
   # name = "${local.resource_name_prefix}-${var.resource_group_name}"
-  name = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
+  name     = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
   location = var.resource_group_location
-  tags = local.common_tags
+  tags     = local.common_tags
 }
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-01-vnet-input-variables.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-01-vnet-input-variables.tf
index 685f7fe..68da376 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-01-vnet-input-variables.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-01-vnet-input-variables.tf
@@ -3,69 +3,69 @@
 ## Virtual Network
 variable "vnet_name" {
   description = "Virtual Network name"
-  type = string
-  default = "vnet-default"
+  type        = string
+  default     = "vnet-default"
 }
 variable "vnet_address_space" {
   description = "Virtual Network address_space"
-  type = list(string)
-  default = ["10.0.0.0/16"]
+  type        = list(string)
+  default     = ["10.0.0.0/16"]
 }
 
 
 # Web Subnet Name
 variable "web_subnet_name" {
   description = "Virtual Network Web Subnet Name"
-  type = string
-  default = "websubnet"
+  type        = string
+  default     = "websubnet"
 }
 # Web Subnet Address Space
 variable "web_subnet_address" {
   description = "Virtual Network Web Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.1.0/24"]
+  type        = list(string)
+  default     = ["10.0.1.0/24"]
 }
 
 
 # App Subnet Name
 variable "app_subnet_name" {
   description = "Virtual Network App Subnet Name"
-  type = string
-  default = "appsubnet"
+  type        = string
+  default     = "appsubnet"
 }
 # App Subnet Address Space
 variable "app_subnet_address" {
   description = "Virtual Network App Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.11.0/24"]
+  type        = list(string)
+  default     = ["10.0.11.0/24"]
 }
 
 
 # Database Subnet Name
 variable "db_subnet_name" {
   description = "Virtual Network Database Subnet Name"
-  type = string
-  default = "dbsubnet"
+  type        = string
+  default     = "dbsubnet"
 }
 # Database Subnet Address Space
 variable "db_subnet_address" {
   description = "Virtual Network Database Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.21.0/24"]
+  type        = list(string)
+  default     = ["10.0.21.0/24"]
 }
 
 
 # Bastion / Management Subnet Name
 variable "bastion_subnet_name" {
   description = "Virtual Network Bastion Subnet Name"
-  type = string
-  default = "bastionsubnet"
+  type        = string
+  default     = "bastionsubnet"
 }
 # Bastion / Management Subnet Address Space
 variable "bastion_subnet_address" {
   description = "Virtual Network Bastion Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.100.0/24"]
+  type        = list(string)
+  default     = ["10.0.100.0/24"]
 }
 
 
@@ -73,12 +73,12 @@ variable "bastion_subnet_address" {
 # Application Gateway Subnet Name
 variable "ag_subnet_name" {
   description = "Virtual Network Application Gateway Subnet Name"
-  type = string
-  default = "agsubnet"
+  type        = string
+  default     = "agsubnet"
 }
 # Application Gateway Subnet Address Space
 variable "ag_subnet_address" {
   description = "Virtual Network Application Gateway Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.51.0/24"]
+  type        = list(string)
+  default     = ["10.0.51.0/24"]
 }
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-02-virtual-network.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-02-virtual-network.tf
index a10dd3c..2168469 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-02-virtual-network.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-02-virtual-network.tf
@@ -4,7 +4,7 @@ resource "azurerm_virtual_network" "vnet" {
   address_space       = var.vnet_address_space
   location            = azurerm_resource_group.rg.location
   resource_group_name = azurerm_resource_group.rg.name
-  tags = local.common_tags
+  tags                = local.common_tags
 }
 
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-03-web-subnet-and-nsg.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-03-web-subnet-and-nsg.tf
index 0a0b7f1..f95c9d0 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-03-web-subnet-and-nsg.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-03-web-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "websubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.web_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.web_subnet_address  
+  address_prefixes     = var.web_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "web_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "web_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.websubnet.id
   network_security_group_id = azurerm_network_security_group.web_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "120" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for WebTier Subnets
 resource "azurerm_network_security_rule" "web_nsg_rule_inbound" {
-  for_each = local.web_inbound_ports_map
+  for_each                    = local.web_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-04-app-subnet-and-nsg.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-04-app-subnet-and-nsg.tf
index cb560e1..f4bddb1 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-04-app-subnet-and-nsg.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-04-app-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "appsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.app_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.app_subnet_address  
+  address_prefixes     = var.app_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "app_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "app_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.app_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.app_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.appsubnet.id
   network_security_group_id = azurerm_network_security_group.app_subnet_nsg.id
 }
@@ -28,18 +28,18 @@ locals {
     "110" : "443",
     "120" : "8080",
     "130" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for AppTier Subnets
 resource "azurerm_network_security_rule" "app_nsg_rule_inbound" {
-  for_each = local.app_inbound_ports_map
+  for_each                    = local.app_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-05-db-subnet-and-nsg.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-05-db-subnet-and-nsg.tf
index 2e60aa8..2b0b05b 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-05-db-subnet-and-nsg.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-05-db-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "dbsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.db_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.db_subnet_address  
+  address_prefixes     = var.db_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "db_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "db_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.db_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.db_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.dbsubnet.id
   network_security_group_id = azurerm_network_security_group.db_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "3306", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "1433",
     "120" : "5432"
-  } 
+  }
 }
 ## NSG Inbound Rule for DBTier Subnets
 resource "azurerm_network_security_rule" "db_nsg_rule_inbound" {
-  for_each = local.db_inbound_ports_map
+  for_each                    = local.db_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
index 837e89e..04c59a9 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
@@ -1,6 +1,6 @@
 # Resource-1: Create Bastion / Management Subnet
 resource "azurerm_subnet" "bastionsubnet" {
-  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"  
+  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
   address_prefixes     = var.bastion_subnet_address
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "bastion_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "bastion_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.bastion_nsg_rule_inbound]    
+  depends_on                = [azurerm_network_security_rule.bastion_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.bastionsubnet.id
   network_security_group_id = azurerm_network_security_group.bastion_subnet_nsg.id
 }
@@ -26,18 +26,18 @@ locals {
   bastion_inbound_ports_map = {
     "100" : "22", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "3389"
-  } 
+  }
 }
 ## NSG Inbound Rule for Bastion / Management Subnets
 resource "azurerm_network_security_rule" "bastion_nsg_rule_inbound" {
-  for_each = local.bastion_inbound_ports_map
+  for_each                    = local.bastion_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-07-ag-subnet-and-nsg.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
index 32ff943..b8ef0ce 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "agsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.ag_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.ag_subnet_address  
+  address_prefixes     = var.ag_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "ag_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "ag_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.ag_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.ag_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.agsubnet.id
   network_security_group_id = azurerm_network_security_group.ag_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "130" : "65200-65535"
-  } 
+  }
 }
 ## NSG Inbound Rule for Azure Application Gateway Subnets
 resource "azurerm_network_security_rule" "ag_nsg_rule_inbound" {
-  for_each = local.ag_inbound_ports_map
+  for_each                    = local.ag_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-08-vnet-outputs.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-08-vnet-outputs.tf
index 8c84557..398909e 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-08-vnet-outputs.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c6-08-vnet-outputs.tf
@@ -2,36 +2,36 @@
 ## Virtual Network Name
 output "virtual_network_name" {
   description = "Virtual Network Name"
-  value = azurerm_virtual_network.vnet.name
+  value       = azurerm_virtual_network.vnet.name
 }
 ## Virtual Network ID
 output "virtual_network_id" {
   description = "Virtual Network ID"
-  value = azurerm_virtual_network.vnet.id
+  value       = azurerm_virtual_network.vnet.id
 }
 
 # Subnet Outputs (We will write for one web subnet and rest all we will ignore for now)
 ## Subnet Name 
 output "web_subnet_name" {
   description = "WebTier Subnet Name"
-  value = azurerm_subnet.websubnet.name
+  value       = azurerm_subnet.websubnet.name
 }
 
 ## Subnet ID 
 output "web_subnet_id" {
   description = "WebTier Subnet ID"
-  value = azurerm_subnet.websubnet.id
+  value       = azurerm_subnet.websubnet.id
 }
 
 # Network Security Outputs
 ## Web Subnet NSG Name 
 output "web_subnet_nsg_name" {
   description = "WebTier Subnet NSG Name"
-  value = azurerm_network_security_group.web_subnet_nsg.name
+  value       = azurerm_network_security_group.web_subnet_nsg.name
 }
 
 ## Web Subnet NSG ID 
 output "web_subnet_nsg_id" {
   description = "WebTier Subnet NSG ID"
-  value = azurerm_network_security_group.web_subnet_nsg.id
+  value       = azurerm_network_security_group.web_subnet_nsg.id
 }
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
index 66b74d8..41f58d4 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
@@ -1,14 +1,14 @@
 # Linux VM Input Variables Placeholder file.
 variable "app1_web_vmss_nsg_inbound_ports" {
   description = "App1 Web VMSS NSG Inbound Ports"
-  type = list(string)
-  default = [22, 80, 443]
+  type        = list(string)
+  default     = [22, 80, 443]
 }
 
 variable "app2_web_vmss_nsg_inbound_ports" {
   description = "App2 Web VMSS NSG Inbound Ports"
-  type = list(string)
-  default = [22, 80, 443]
+  type        = list(string)
+  default     = [22, 80, 443]
 }
 
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-02-web-linux-vmss-app1-nsg-inline-basic.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-02-web-linux-vmss-app1-nsg-inline-basic.tf
index 2789327..9dd4780 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-02-web-linux-vmss-app1-nsg-inline-basic.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-02-web-linux-vmss-app1-nsg-inline-basic.tf
@@ -8,7 +8,7 @@ resource "azurerm_network_security_group" "app1_web_vmss_nsg" {
     for_each = var.app1_web_vmss_nsg_inbound_ports
     content {
       name                       = "inbound-rule-${security_rule.key}"
-      description                = "Inbound Rule ${security_rule.key}"    
+      description                = "Inbound Rule ${security_rule.key}"
       priority                   = sum([100, security_rule.key])
       direction                  = "Inbound"
       access                     = "Allow"
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-03-web-linux-vmss-app1-resource.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-03-web-linux-vmss-app1-resource.tf
index f6d9160..d1cbd4d 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-03-web-linux-vmss-app1-resource.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-03-web-linux-vmss-app1-resource.tf
@@ -1,6 +1,6 @@
 # Locals Block for custom data
 locals {
-app1_webvm_custom_data = <<CUSTOM_DATA
+  app1_webvm_custom_data = <<CUSTOM_DATA
 #!/bin/sh
 #sudo yum update -y
 sudo yum install -y httpd
@@ -21,7 +21,7 @@ CUSTOM_DATA
 
 # Resource: Azure Linux Virtual Machine Scale Set - App1
 resource "azurerm_linux_virtual_machine_scale_set" "app1_web_vmss" {
-  name                = "${local.resource_name_prefix}-app1-web-vmss"
+  name = "${local.resource_name_prefix}-app1-web-vmss"
   #computer_name_prefix = "vmss-app1" # if name argument is not valid one for VMs, we can use this for VM Names
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
@@ -36,9 +36,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "app1_web_vmss" {
 
   source_image_reference {
     publisher = "RedHat"
-    offer = "RHEL"
-    sku = "83-gen2"
-    version = "latest"
+    offer     = "RHEL"
+    sku       = "83-gen2"
+    version   = "latest"
   }
 
   os_disk {
@@ -47,21 +47,21 @@ resource "azurerm_linux_virtual_machine_scale_set" "app1_web_vmss" {
   }
 
   upgrade_mode = "Automatic"
-  
+
   network_interface {
-    name    = "app1-web-vmss-nic"
-    primary = true
+    name                      = "app1-web-vmss-nic"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.app1_web_vmss_nsg.id
     ip_configuration {
       name      = "internal"
       primary   = true
-      subnet_id = azurerm_subnet.websubnet.id  
+      subnet_id = azurerm_subnet.websubnet.id
       #load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.web_lb_backend_address_pool.id]
-      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[0].id]            
+      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[0].id]
     }
   }
   #custom_data = filebase64("${path.module}/app-scripts/redhat-app1-script.sh")      
-  custom_data = base64encode(local.app1_webvm_custom_data)  
+  custom_data = base64encode(local.app1_webvm_custom_data)
 }
-  
+
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-04-web-linux-vmss-app1-autoscaling-default-profile.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-04-web-linux-vmss-app1-autoscaling-default-profile.tf
index 251d40b..9375570 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-04-web-linux-vmss-app1-autoscaling-default-profile.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-04-web-linux-vmss-app1-autoscaling-default-profile.tf
@@ -26,39 +26,39 @@ resource "azurerm_monitor_autoscale_setting" "app1_web_vmss_autoscale" {
   target_resource_id  = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
   # Notification  
   notification {
-      email {
-        send_to_subscription_administrator    = true
-        send_to_subscription_co_administrator = true
-        custom_emails                         = ["myadminteam@ourorg.com"]
-      }
-    }    
-################################################################################
-################################################################################
-#######################  Profile-1: Default Profile  ###########################
-################################################################################
-################################################################################    
-# Profile-1: Default Profile 
+    email {
+      send_to_subscription_administrator    = true
+      send_to_subscription_co_administrator = true
+      custom_emails                         = ["myadminteam@ourorg.com"]
+    }
+  }
+  ################################################################################
+  ################################################################################
+  #######################  Profile-1: Default Profile  ###########################
+  ################################################################################
+  ################################################################################    
+  # Profile-1: Default Profile 
   profile {
     name = "default"
-  # Capacity Block     
+    # Capacity Block     
     capacity {
       default = 2
       minimum = 2
       maximum = 6
     }
-###########  START: Percentage CPU Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Percentage CPU Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -68,18 +68,18 @@ resource "azurerm_monitor_autoscale_setting" "app1_web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -88,21 +88,21 @@ resource "azurerm_monitor_autoscale_setting" "app1_web_vmss_autoscale" {
         threshold          = 25
       }
     }
-###########  END: Percentage CPU Metric Rules   ###########    
+    ###########  END: Percentage CPU Metric Rules   ###########    
 
-###########  START: Available Memory Bytes Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Available Memory Bytes Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -112,18 +112,18 @@ resource "azurerm_monitor_autoscale_setting" "app1_web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -132,7 +132,7 @@ resource "azurerm_monitor_autoscale_setting" "app1_web_vmss_autoscale" {
         threshold          = 2147483648 # Decrease 1 VM when Memory In Bytes is Greater than 2GB
       }
     }
-###########  END: Available Memory Bytes Metric Rules  ###########  
+    ###########  END: Available Memory Bytes Metric Rules  ###########  
 
   } # End of Profile-1
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-05-web-linux-vmss-app2-nsg-inline-basic.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-05-web-linux-vmss-app2-nsg-inline-basic.tf
index 6889147..8b2a914 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-05-web-linux-vmss-app2-nsg-inline-basic.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-05-web-linux-vmss-app2-nsg-inline-basic.tf
@@ -8,7 +8,7 @@ resource "azurerm_network_security_group" "app2_web_vmss_nsg" {
     for_each = var.app2_web_vmss_nsg_inbound_ports
     content {
       name                       = "inbound-rule-${security_rule.key}"
-      description                = "Inbound Rule ${security_rule.key}"    
+      description                = "Inbound Rule ${security_rule.key}"
       priority                   = sum([100, security_rule.key])
       direction                  = "Inbound"
       access                     = "Allow"
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-06-web-linux-vmss-app2-resource.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-06-web-linux-vmss-app2-resource.tf
index ae6f97a..9502ad8 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-06-web-linux-vmss-app2-resource.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-06-web-linux-vmss-app2-resource.tf
@@ -1,6 +1,6 @@
 # Locals Block for custom data
 locals {
-app2_webvm_custom_data = <<CUSTOM_DATA
+  app2_webvm_custom_data = <<CUSTOM_DATA
 #!/bin/sh
 #sudo yum update -y
 sudo yum install -y httpd
@@ -21,7 +21,7 @@ CUSTOM_DATA
 
 # Resource: Azure Linux Virtual Machine Scale Set - App2
 resource "azurerm_linux_virtual_machine_scale_set" "app2_web_vmss" {
-  name                = "${local.resource_name_prefix}-app2-web-vmss"
+  name = "${local.resource_name_prefix}-app2-web-vmss"
   #computer_name_prefix = "vmss-app1" # if name argument is not valid one for VMs, we can use this for VM Names
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
@@ -36,9 +36,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "app2_web_vmss" {
 
   source_image_reference {
     publisher = "RedHat"
-    offer = "RHEL"
-    sku = "83-gen2"
-    version = "latest"
+    offer     = "RHEL"
+    sku       = "83-gen2"
+    version   = "latest"
   }
 
   os_disk {
@@ -47,21 +47,21 @@ resource "azurerm_linux_virtual_machine_scale_set" "app2_web_vmss" {
   }
 
   upgrade_mode = "Automatic"
-  
+
   network_interface {
-    name    = "app2-web-vmss-nic"
-    primary = true
+    name                      = "app2-web-vmss-nic"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.app2_web_vmss_nsg.id
     ip_configuration {
       name      = "internal"
       primary   = true
-      subnet_id = azurerm_subnet.websubnet.id  
+      subnet_id = azurerm_subnet.websubnet.id
       #load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.web_lb_backend_address_pool.id]
-      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[1].id]            
+      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[1].id]
     }
   }
   #custom_data = filebase64("${path.module}/app-scripts/redhat-app1-script.sh")      
-  custom_data = base64encode(local.app2_webvm_custom_data)  
+  custom_data = base64encode(local.app2_webvm_custom_data)
 }
-  
+
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-07-web-linux-vmss-app2-autoscaling-default-profile.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-07-web-linux-vmss-app2-autoscaling-default-profile.tf
index 5e5e1c8..05f93b7 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-07-web-linux-vmss-app2-autoscaling-default-profile.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-07-web-linux-vmss-app2-autoscaling-default-profile.tf
@@ -26,39 +26,39 @@ resource "azurerm_monitor_autoscale_setting" "app2_web_vmss_autoscale" {
   target_resource_id  = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
   # Notification  
   notification {
-      email {
-        send_to_subscription_administrator    = true
-        send_to_subscription_co_administrator = true
-        custom_emails                         = ["myadminteam@ourorg.com"]
-      }
-    }    
-################################################################################
-################################################################################
-#######################  Profile-1: Default Profile  ###########################
-################################################################################
-################################################################################    
-# Profile-1: Default Profile 
+    email {
+      send_to_subscription_administrator    = true
+      send_to_subscription_co_administrator = true
+      custom_emails                         = ["myadminteam@ourorg.com"]
+    }
+  }
+  ################################################################################
+  ################################################################################
+  #######################  Profile-1: Default Profile  ###########################
+  ################################################################################
+  ################################################################################    
+  # Profile-1: Default Profile 
   profile {
     name = "default"
-  # Capacity Block     
+    # Capacity Block     
     capacity {
       default = 2
       minimum = 2
       maximum = 6
     }
-###########  START: Percentage CPU Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Percentage CPU Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -68,18 +68,18 @@ resource "azurerm_monitor_autoscale_setting" "app2_web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -88,21 +88,21 @@ resource "azurerm_monitor_autoscale_setting" "app2_web_vmss_autoscale" {
         threshold          = 25
       }
     }
-###########  END: Percentage CPU Metric Rules   ###########    
+    ###########  END: Percentage CPU Metric Rules   ###########    
 
-###########  START: Available Memory Bytes Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Available Memory Bytes Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -112,18 +112,18 @@ resource "azurerm_monitor_autoscale_setting" "app2_web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -132,7 +132,7 @@ resource "azurerm_monitor_autoscale_setting" "app2_web_vmss_autoscale" {
         threshold          = 2147483648 # Decrease 1 VM when Memory In Bytes is Greater than 2GB
       }
     }
-###########  END: Available Memory Bytes Metric Rules  ###########  
+    ###########  END: Available Memory Bytes Metric Rules  ###########  
 
   } # End of Profile-1
 
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-08-web-linux-vmss-outputs.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-08-web-linux-vmss-outputs.tf
index 5042d6a..b5f8a41 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-08-web-linux-vmss-outputs.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c7-08-web-linux-vmss-outputs.tf
@@ -2,10 +2,10 @@
 
 output "app1_web_vmss_id" {
   description = "App1 Web Virtual Machine Scale Set ID"
-  value = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id 
+  value       = azurerm_linux_virtual_machine_scale_set.app1_web_vmss.id
 }
 
 output "app2_web_vmss_id" {
   description = "App2 Web Virtual Machine Scale Set ID"
-  value = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id 
+  value       = azurerm_linux_virtual_machine_scale_set.app2_web_vmss.id
 }
\ No newline at end of file
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-02-application-gateway-resource.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-02-application-gateway-resource.tf
index 650538e..b325098 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-02-application-gateway-resource.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-02-application-gateway-resource.tf
@@ -4,31 +4,31 @@ resource "azurerm_public_ip" "web_ag_publicip" {
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
   allocation_method   = "Static"
-  sku = "Standard"  
+  sku                 = "Standard"
 }
 
 # Azure Application Gateway - Locals Block 
 #since these variables are re-used - a locals block makes this more maintainable
-locals { 
+locals {
   # Generic 
   frontend_port_name             = "${azurerm_virtual_network.vnet.name}-feport"
   frontend_ip_configuration_name = "${azurerm_virtual_network.vnet.name}-feip"
   listener_name                  = "${azurerm_virtual_network.vnet.name}-httplstn"
   request_routing_rule1_name     = "${azurerm_virtual_network.vnet.name}-rqrt-1"
-  url_path_map                   =  "${azurerm_virtual_network.vnet.name}-upm-app1-app2"  
+  url_path_map                   = "${azurerm_virtual_network.vnet.name}-upm-app1-app2"
 
   # App1
-  backend_address_pool_name_app1      = "${azurerm_virtual_network.vnet.name}-beap-app1"
-  http_setting_name_app1              = "${azurerm_virtual_network.vnet.name}-be-htst-app1"
+  backend_address_pool_name_app1 = "${azurerm_virtual_network.vnet.name}-beap-app1"
+  http_setting_name_app1         = "${azurerm_virtual_network.vnet.name}-be-htst-app1"
   probe_name_app1                = "${azurerm_virtual_network.vnet.name}-be-probe-app1"
 
   # App2
-  backend_address_pool_name_app2      = "${azurerm_virtual_network.vnet.name}-beap-app2"
-  http_setting_name_app2              = "${azurerm_virtual_network.vnet.name}-be-htst-app2"
-  probe_name_app2                    = "${azurerm_virtual_network.vnet.name}-be-probe-app2"
+  backend_address_pool_name_app2 = "${azurerm_virtual_network.vnet.name}-beap-app2"
+  http_setting_name_app2         = "${azurerm_virtual_network.vnet.name}-be-htst-app2"
+  probe_name_app2                = "${azurerm_virtual_network.vnet.name}-be-probe-app2"
 
   # Default Redirect on Root Context (/)
-  redirect_configuration_name    = "${azurerm_virtual_network.vnet.name}-rdrcfg"
+  redirect_configuration_name = "${azurerm_virtual_network.vnet.name}-rdrcfg"
 
 }
 
@@ -39,25 +39,25 @@ resource "azurerm_application_gateway" "web_ag" {
   name                = "${local.resource_name_prefix}-web-ag"
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
-# START: --------------------------------------- #
-# SKU: Standard_v2 (New Version )
+  # START: --------------------------------------- #
+  # SKU: Standard_v2 (New Version )
   sku {
-    name     = "Standard_v2"
-    tier     = "Standard_v2"
+    name = "Standard_v2"
+    tier = "Standard_v2"
     #capacity = 2
   }
   autoscale_configuration {
     min_capacity = 0
     max_capacity = 10
-  }  
-# END: --------------------------------------- #
+  }
+  # END: --------------------------------------- #
 
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = azurerm_subnet.agsubnet.id
   }
 
-# Front End Configs
+  # Front End Configs
   frontend_port {
     name = local.frontend_port_name
     port = 80
@@ -65,10 +65,10 @@ resource "azurerm_application_gateway" "web_ag" {
 
   frontend_ip_configuration {
     name                 = local.frontend_ip_configuration_name
-    public_ip_address_id = azurerm_public_ip.web_ag_publicip.id    
+    public_ip_address_id = azurerm_public_ip.web_ag_publicip.id
   }
 
-# Listerner: HTTP Port 80
+  # Listerner: HTTP Port 80
   http_listener {
     name                           = local.listener_name
     frontend_ip_configuration_name = local.frontend_ip_configuration_name
@@ -76,7 +76,7 @@ resource "azurerm_application_gateway" "web_ag" {
     protocol                       = "Http"
   }
 
-# App1 Backend Configs
+  # App1 Backend Configs
   backend_address_pool {
     name = local.backend_address_pool_name_app1
   }
@@ -98,13 +98,13 @@ resource "azurerm_application_gateway" "web_ag" {
     port                = 80
     path                = "/app1/status.html"
     match { # Optional
-      body              = "App1"
-      status_code       = ["200"]
+      body        = "App1"
+      status_code = ["200"]
     }
-  }   
+  }
 
 
-# App2 Backend Configs
+  # App2 Backend Configs
   backend_address_pool {
     name = local.backend_address_pool_name_app2
   }
@@ -113,9 +113,9 @@ resource "azurerm_application_gateway" "web_ag" {
     cookie_based_affinity = "Disabled"
     port                  = 80
     protocol              = "Http"
-    request_timeout       = 60  
-    probe_name            = local.probe_name_app2    
-  }  
+    request_timeout       = 60
+    probe_name            = local.probe_name_app2
+  }
   probe {
     name                = local.probe_name_app2
     host                = "127.0.0.1"
@@ -126,42 +126,42 @@ resource "azurerm_application_gateway" "web_ag" {
     port                = 80
     path                = "/app2/status.html"
     match { # Optional
-      body              = "App2"
-      status_code       = ["200"]
+      body        = "App2"
+      status_code = ["200"]
     }
-  }  
+  }
 
-# Path based Routing Rule
+  # Path based Routing Rule
   request_routing_rule {
-    name                       = local.request_routing_rule1_name
-    rule_type                  = "PathBasedRouting"
-    http_listener_name         = local.listener_name
-    url_path_map_name           = local.url_path_map        
+    name               = local.request_routing_rule1_name
+    rule_type          = "PathBasedRouting"
+    http_listener_name = local.listener_name
+    url_path_map_name  = local.url_path_map
   }
 
-# URL Path Map - Define Path based Routing    
+  # URL Path Map - Define Path based Routing    
   url_path_map {
-    name = local.url_path_map  
+    name                                = local.url_path_map
     default_redirect_configuration_name = local.redirect_configuration_name
     path_rule {
-      name = "app1-rule"
-      paths = ["/app1/*"]
-      backend_address_pool_name = local.backend_address_pool_name_app1
+      name                       = "app1-rule"
+      paths                      = ["/app1/*"]
+      backend_address_pool_name  = local.backend_address_pool_name_app1
       backend_http_settings_name = local.http_setting_name_app1
     }
     path_rule {
-      name = "app2-rule"
-      paths = ["/app2/*"]
-      backend_address_pool_name = local.backend_address_pool_name_app2
-      backend_http_settings_name = local.http_setting_name_app2           
-    }    
+      name                       = "app2-rule"
+      paths                      = ["/app2/*"]
+      backend_address_pool_name  = local.backend_address_pool_name_app2
+      backend_http_settings_name = local.http_setting_name_app2
+    }
   }
 
   # Default Root Context (/ - Redirection Config)
   redirect_configuration {
-    name = local.redirect_configuration_name
+    name          = local.redirect_configuration_name
     redirect_type = "Permanent"
-    target_url = "https://stacksimplify.com/azure-aks/azure-kubernetes-service-introduction/"
+    target_url    = "https://stacksimplify.com/azure-aks/azure-kubernetes-service-introduction/"
   }
 
 }
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-03-application-gateway-outputs.tf b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-03-application-gateway-outputs.tf
index 9318565..3a40259 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-03-application-gateway-outputs.tf
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/c9-03-application-gateway-outputs.tf
@@ -1,10 +1,10 @@
 # Application Gateway Outputs
 output "web_ag_id" {
-  description = "Azure Application Gateway ID"  
-  value = azurerm_application_gateway.web_ag.id 
+  description = "Azure Application Gateway ID"
+  value       = azurerm_application_gateway.web_ag.id
 }
 
 output "web_ag_public_ip_1" {
-  description = "Azure Application Gateway Public IP 1"  
-  value = azurerm_public_ip.web_ag_publicip.ip_address
+  description = "Azure Application Gateway Public IP 1"
+  value       = azurerm_public_ip.web_ag_publicip.ip_address
 }
\ No newline at end of file
diff --git a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/terraform.tfvars b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/terraform.tfvars
index f7b5428..4bbeafd 100644
--- a/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/terraform.tfvars
+++ b/28-Azure-Application-Gateway-Path-Based-Routing/terraform-manifests/terraform.tfvars
@@ -1,20 +1,20 @@
-business_divsion = "hr"
-environment = "dev"
-resource_group_name = "rg"
+business_divsion        = "hr"
+environment             = "dev"
+resource_group_name     = "rg"
 resource_group_location = "eastus"
-vnet_name = "vnet"
-vnet_address_space = ["10.1.0.0/16"]
+vnet_name               = "vnet"
+vnet_address_space      = ["10.1.0.0/16"]
 
-web_subnet_name = "websubnet"
+web_subnet_name    = "websubnet"
 web_subnet_address = ["10.1.1.0/24"]
 
-app_subnet_name = "appsubnet"
+app_subnet_name    = "appsubnet"
 app_subnet_address = ["10.1.11.0/24"]
 
-db_subnet_name = "dbsubnet"
+db_subnet_name    = "dbsubnet"
 db_subnet_address = ["10.1.21.0/24"]
 
-bastion_subnet_name = "bastionsubnet"
+bastion_subnet_name    = "bastionsubnet"
 bastion_subnet_address = ["10.1.100.0/24"]
 
 #bastion_service_subnet_name = "AzureBastionSubnet"
@@ -23,5 +23,5 @@ bastion_subnet_address = ["10.1.100.0/24"]
 app1_web_vmss_nsg_inbound_ports = [22, 80, 443]
 app2_web_vmss_nsg_inbound_ports = [22, 80, 443]
 
-ag_subnet_name = "agsubnet"
+ag_subnet_name    = "agsubnet"
 ag_subnet_address = ["10.1.51.0/24"]
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c1-versions.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c1-versions.tf
index 2fbbb75..62228ee 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c1-versions.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c1-versions.tf
@@ -3,23 +3,23 @@ terraform {
   required_version = ">= 1.0.0"
   required_providers {
     azurerm = {
-      source = "hashicorp/azurerm"
-      version = ">= 2.0" 
+      source  = "hashicorp/azurerm"
+      version = ">= 2.0"
     }
     random = {
-      source = "hashicorp/random"
+      source  = "hashicorp/random"
       version = ">= 3.0"
     }
     null = {
-      source = "hashicorp/null"
+      source  = "hashicorp/null"
       version = ">= 3.0"
-    }    
+    }
   }
 }
 
 # Provider Block
 provider "azurerm" {
- features {}          
+  features {}
 }
 
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-02-storage-account.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-02-storage-account.tf
index afbbf71..26a8f35 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-02-storage-account.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-02-storage-account.tf
@@ -21,11 +21,11 @@ locals {
 
 # Resource-2: Add Static html files to blob storage
 resource "azurerm_storage_blob" "static_container_blob" {
-  for_each = toset(local.pages)
+  for_each               = toset(local.pages)
   name                   = each.value
   storage_account_name   = azurerm_storage_account.storage_account.name
   storage_container_name = "$web"
   type                   = "Block"
   content_type           = "text/html"
-  source = "${path.module}/custom-error-pages/${each.value}"
+  source                 = "${path.module}/custom-error-pages/${each.value}"
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-03-storage-account-outputs.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-03-storage-account-outputs.tf
index 9765e85..93716d7 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-03-storage-account-outputs.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c10-03-storage-account-outputs.tf
@@ -1,6 +1,6 @@
 # Storage Account Outputs
 output "storage_account_primary_access_key" {
-  value = azurerm_storage_account.storage_account.primary_access_key
+  value     = azurerm_storage_account.storage_account.primary_access_key
   sensitive = true
 }
 output "storage_account_primary_web_endpoint" {
@@ -10,5 +10,5 @@ output "storage_account_primary_web_host" {
   value = azurerm_storage_account.storage_account.primary_web_host
 }
 output "storage_account_name" {
-   value = azurerm_storage_account.storage_account.name 
+  value = azurerm_storage_account.storage_account.name
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c11-02-azure-key-vault-resource.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c11-02-azure-key-vault-resource.tf
index 99e9dcf..23200db 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c11-02-azure-key-vault-resource.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c11-02-azure-key-vault-resource.tf
@@ -3,26 +3,26 @@ data "azurerm_client_config" "current" {}
 
 # Resource-1: Azure Key Vault
 resource "azurerm_key_vault" "keyvault" {
-  name                        = "${var.business_divsion}${var.environment}keyvault${random_string.myrandom.id}"
-  location                    = azurerm_resource_group.rg.location
-  resource_group_name         = azurerm_resource_group.rg.name
-  enabled_for_disk_encryption = true
-  tenant_id                   = data.azurerm_client_config.current.tenant_id
-  soft_delete_retention_days  = 7
-  purge_protection_enabled    = false
+  name                            = "${var.business_divsion}${var.environment}keyvault${random_string.myrandom.id}"
+  location                        = azurerm_resource_group.rg.location
+  resource_group_name             = azurerm_resource_group.rg.name
+  enabled_for_disk_encryption     = true
+  tenant_id                       = data.azurerm_client_config.current.tenant_id
+  soft_delete_retention_days      = 7
+  purge_protection_enabled        = false
   enabled_for_template_deployment = true
-  sku_name = "premium"
+  sku_name                        = "premium"
 }
 
 
 # Resource-2: Azure Key Vault Default Policy
 resource "azurerm_key_vault_access_policy" "key_vault_default_policy" {
   key_vault_id = azurerm_key_vault.keyvault.id
-  tenant_id = data.azurerm_client_config.current.tenant_id
-  object_id = data.azurerm_client_config.current.object_id
+  tenant_id    = data.azurerm_client_config.current.tenant_id
+  object_id    = data.azurerm_client_config.current.object_id
   lifecycle {
     create_before_destroy = true
-  }  
+  }
   certificate_permissions = [
     "Backup", "Create", "Delete", "DeleteIssuers", "Get", "GetIssuers", "Import", "List", "ListIssuers", "ManageContacts", "ManageIssuers", "Purge", "Recover", "Restore", "SetIssuers", "Update"
   ]
@@ -52,7 +52,7 @@ resource "azurerm_key_vault_access_policy" "appag_key_vault_access_policy" {
 
 # Resource-4: Import the SSL certificate into Key Vault and store the certificate SID in a variable
 resource "azurerm_key_vault_certificate" "my_cert_1" {
-  depends_on = [azurerm_key_vault_access_policy.key_vault_default_policy]
+  depends_on   = [azurerm_key_vault_access_policy.key_vault_default_policy]
   name         = "my-cert-1"
   key_vault_id = azurerm_key_vault.keyvault.id
 
@@ -60,7 +60,7 @@ resource "azurerm_key_vault_certificate" "my_cert_1" {
     contents = filebase64("${path.module}/ssl-self-signed/httpd.pfx")
     password = "kalyan"
   }
-  
+
   certificate_policy {
     issuer_parameters {
       name = "Unknown"
@@ -78,7 +78,7 @@ resource "azurerm_key_vault_certificate" "my_cert_1" {
     }
     lifetime_action {
       action {
-        action_type = "EmailContacts"        
+        action_type = "EmailContacts"
       }
       trigger {
         days_before_expiry = 10
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c2-generic-input-variables.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c2-generic-input-variables.tf
index dd40ef9..3b48802 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c2-generic-input-variables.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c2-generic-input-variables.tf
@@ -2,27 +2,27 @@
 # Business Division
 variable "business_divsion" {
   description = "Business Division in the large organization this Infrastructure belongs"
-  type = string
-  default = "sap"
+  type        = string
+  default     = "sap"
 }
 # Environment Variable
 variable "environment" {
   description = "Environment Variable used as a prefix"
-  type = string
-  default = "dev"
+  type        = string
+  default     = "dev"
 }
 
 # Azure Resource Group Name 
 variable "resource_group_name" {
   description = "Resource Group Name"
-  type = string
-  default = "rg-default"  
+  type        = string
+  default     = "rg-default"
 }
 
 # Azure Resources Location
 variable "resource_group_location" {
   description = "Region in which Azure Resources to be created"
-  type = string
-  default = "eastus2"  
+  type        = string
+  default     = "eastus2"
 }
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c3-locals.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c3-locals.tf
index ce77cf4..3bce11f 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c3-locals.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c3-locals.tf
@@ -1,10 +1,10 @@
 # Define Local Values in Terraform
 locals {
-  owners = var.business_divsion
-  environment = var.environment
+  owners               = var.business_divsion
+  environment          = var.environment
   resource_name_prefix = "${var.business_divsion}-${var.environment}"
   common_tags = {
-    owners = local.owners
+    owners      = local.owners
     environment = local.environment
   }
 } 
\ No newline at end of file
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c4-random-resources.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c4-random-resources.tf
index b599262..686c5b7 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c4-random-resources.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c4-random-resources.tf
@@ -1,7 +1,7 @@
 # Random String Resource
 resource "random_string" "myrandom" {
-  length = 6
-  upper = false 
+  length  = 6
+  upper   = false
   special = false
-  number = false   
+  number  = false
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c5-resource-group.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c5-resource-group.tf
index c3a7d70..261c58b 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c5-resource-group.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c5-resource-group.tf
@@ -1,7 +1,7 @@
 # Resource-1: Azure Resource Group
 resource "azurerm_resource_group" "rg" {
   # name = "${local.resource_name_prefix}-${var.resource_group_name}"
-  name = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
+  name     = "${local.resource_name_prefix}-${var.resource_group_name}-${random_string.myrandom.id}"
   location = var.resource_group_location
-  tags = local.common_tags
+  tags     = local.common_tags
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-01-vnet-input-variables.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-01-vnet-input-variables.tf
index 685f7fe..68da376 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-01-vnet-input-variables.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-01-vnet-input-variables.tf
@@ -3,69 +3,69 @@
 ## Virtual Network
 variable "vnet_name" {
   description = "Virtual Network name"
-  type = string
-  default = "vnet-default"
+  type        = string
+  default     = "vnet-default"
 }
 variable "vnet_address_space" {
   description = "Virtual Network address_space"
-  type = list(string)
-  default = ["10.0.0.0/16"]
+  type        = list(string)
+  default     = ["10.0.0.0/16"]
 }
 
 
 # Web Subnet Name
 variable "web_subnet_name" {
   description = "Virtual Network Web Subnet Name"
-  type = string
-  default = "websubnet"
+  type        = string
+  default     = "websubnet"
 }
 # Web Subnet Address Space
 variable "web_subnet_address" {
   description = "Virtual Network Web Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.1.0/24"]
+  type        = list(string)
+  default     = ["10.0.1.0/24"]
 }
 
 
 # App Subnet Name
 variable "app_subnet_name" {
   description = "Virtual Network App Subnet Name"
-  type = string
-  default = "appsubnet"
+  type        = string
+  default     = "appsubnet"
 }
 # App Subnet Address Space
 variable "app_subnet_address" {
   description = "Virtual Network App Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.11.0/24"]
+  type        = list(string)
+  default     = ["10.0.11.0/24"]
 }
 
 
 # Database Subnet Name
 variable "db_subnet_name" {
   description = "Virtual Network Database Subnet Name"
-  type = string
-  default = "dbsubnet"
+  type        = string
+  default     = "dbsubnet"
 }
 # Database Subnet Address Space
 variable "db_subnet_address" {
   description = "Virtual Network Database Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.21.0/24"]
+  type        = list(string)
+  default     = ["10.0.21.0/24"]
 }
 
 
 # Bastion / Management Subnet Name
 variable "bastion_subnet_name" {
   description = "Virtual Network Bastion Subnet Name"
-  type = string
-  default = "bastionsubnet"
+  type        = string
+  default     = "bastionsubnet"
 }
 # Bastion / Management Subnet Address Space
 variable "bastion_subnet_address" {
   description = "Virtual Network Bastion Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.100.0/24"]
+  type        = list(string)
+  default     = ["10.0.100.0/24"]
 }
 
 
@@ -73,12 +73,12 @@ variable "bastion_subnet_address" {
 # Application Gateway Subnet Name
 variable "ag_subnet_name" {
   description = "Virtual Network Application Gateway Subnet Name"
-  type = string
-  default = "agsubnet"
+  type        = string
+  default     = "agsubnet"
 }
 # Application Gateway Subnet Address Space
 variable "ag_subnet_address" {
   description = "Virtual Network Application Gateway Subnet Address Spaces"
-  type = list(string)
-  default = ["10.0.51.0/24"]
+  type        = list(string)
+  default     = ["10.0.51.0/24"]
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-02-virtual-network.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-02-virtual-network.tf
index a10dd3c..2168469 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-02-virtual-network.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-02-virtual-network.tf
@@ -4,7 +4,7 @@ resource "azurerm_virtual_network" "vnet" {
   address_space       = var.vnet_address_space
   location            = azurerm_resource_group.rg.location
   resource_group_name = azurerm_resource_group.rg.name
-  tags = local.common_tags
+  tags                = local.common_tags
 }
 
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-03-web-subnet-and-nsg.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-03-web-subnet-and-nsg.tf
index 0a0b7f1..f95c9d0 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-03-web-subnet-and-nsg.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-03-web-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "websubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.web_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.web_subnet_address  
+  address_prefixes     = var.web_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "web_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "web_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.web_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.websubnet.id
   network_security_group_id = azurerm_network_security_group.web_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "120" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for WebTier Subnets
 resource "azurerm_network_security_rule" "web_nsg_rule_inbound" {
-  for_each = local.web_inbound_ports_map
+  for_each                    = local.web_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-04-app-subnet-and-nsg.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-04-app-subnet-and-nsg.tf
index cb560e1..f4bddb1 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-04-app-subnet-and-nsg.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-04-app-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "appsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.app_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.app_subnet_address  
+  address_prefixes     = var.app_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "app_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "app_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.app_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.app_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.appsubnet.id
   network_security_group_id = azurerm_network_security_group.app_subnet_nsg.id
 }
@@ -28,18 +28,18 @@ locals {
     "110" : "443",
     "120" : "8080",
     "130" : "22"
-  } 
+  }
 }
 ## NSG Inbound Rule for AppTier Subnets
 resource "azurerm_network_security_rule" "app_nsg_rule_inbound" {
-  for_each = local.app_inbound_ports_map
+  for_each                    = local.app_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-05-db-subnet-and-nsg.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-05-db-subnet-and-nsg.tf
index 2e60aa8..2b0b05b 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-05-db-subnet-and-nsg.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-05-db-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "dbsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.db_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.db_subnet_address  
+  address_prefixes     = var.db_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "db_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "db_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.db_nsg_rule_inbound]  
+  depends_on                = [azurerm_network_security_rule.db_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.dbsubnet.id
   network_security_group_id = azurerm_network_security_group.db_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "3306", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "1433",
     "120" : "5432"
-  } 
+  }
 }
 ## NSG Inbound Rule for DBTier Subnets
 resource "azurerm_network_security_rule" "db_nsg_rule_inbound" {
-  for_each = local.db_inbound_ports_map
+  for_each                    = local.db_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
index 837e89e..04c59a9 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-06-bastion-subnet-and-nsg.tf
@@ -1,6 +1,6 @@
 # Resource-1: Create Bastion / Management Subnet
 resource "azurerm_subnet" "bastionsubnet" {
-  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"  
+  name                 = "${azurerm_virtual_network.vnet.name}-${var.bastion_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
   address_prefixes     = var.bastion_subnet_address
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "bastion_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "bastion_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.bastion_nsg_rule_inbound]    
+  depends_on                = [azurerm_network_security_rule.bastion_nsg_rule_inbound]
   subnet_id                 = azurerm_subnet.bastionsubnet.id
   network_security_group_id = azurerm_network_security_group.bastion_subnet_nsg.id
 }
@@ -26,18 +26,18 @@ locals {
   bastion_inbound_ports_map = {
     "100" : "22", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "3389"
-  } 
+  }
 }
 ## NSG Inbound Rule for Bastion / Management Subnets
 resource "azurerm_network_security_rule" "bastion_nsg_rule_inbound" {
-  for_each = local.bastion_inbound_ports_map
+  for_each                    = local.bastion_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-07-ag-subnet-and-nsg.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
index 32ff943..b8ef0ce 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-07-ag-subnet-and-nsg.tf
@@ -3,7 +3,7 @@ resource "azurerm_subnet" "agsubnet" {
   name                 = "${azurerm_virtual_network.vnet.name}-${var.ag_subnet_name}"
   resource_group_name  = azurerm_resource_group.rg.name
   virtual_network_name = azurerm_virtual_network.vnet.name
-  address_prefixes     = var.ag_subnet_address  
+  address_prefixes     = var.ag_subnet_address
 }
 
 # Resource-2: Create Network Security Group (NSG)
@@ -15,7 +15,7 @@ resource "azurerm_network_security_group" "ag_subnet_nsg" {
 
 # Resource-3: Associate NSG and Subnet
 resource "azurerm_subnet_network_security_group_association" "ag_subnet_nsg_associate" {
-  depends_on = [ azurerm_network_security_rule.ag_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
+  depends_on                = [azurerm_network_security_rule.ag_nsg_rule_inbound] # Every NSG Rule Association will disassociate NSG from Subnet and Associate it, so we associate it only after NSG is completely created - Azure Provider Bug https://github.com/terraform-providers/terraform-provider-azurerm/issues/354  
   subnet_id                 = azurerm_subnet.agsubnet.id
   network_security_group_id = azurerm_network_security_group.ag_subnet_nsg.id
 }
@@ -27,18 +27,18 @@ locals {
     "100" : "80", # If the key starts with a number, you must use the colon syntax ":" instead of "="
     "110" : "443",
     "130" : "65200-65535"
-  } 
+  }
 }
 ## NSG Inbound Rule for Azure Application Gateway Subnets
 resource "azurerm_network_security_rule" "ag_nsg_rule_inbound" {
-  for_each = local.ag_inbound_ports_map
+  for_each                    = local.ag_inbound_ports_map
   name                        = "Rule-Port-${each.value}"
   priority                    = each.key
   direction                   = "Inbound"
   access                      = "Allow"
   protocol                    = "Tcp"
   source_port_range           = "*"
-  destination_port_range      = each.value 
+  destination_port_range      = each.value
   source_address_prefix       = "*"
   destination_address_prefix  = "*"
   resource_group_name         = azurerm_resource_group.rg.name
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-08-vnet-outputs.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-08-vnet-outputs.tf
index 8c84557..398909e 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-08-vnet-outputs.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c6-08-vnet-outputs.tf
@@ -2,36 +2,36 @@
 ## Virtual Network Name
 output "virtual_network_name" {
   description = "Virtual Network Name"
-  value = azurerm_virtual_network.vnet.name
+  value       = azurerm_virtual_network.vnet.name
 }
 ## Virtual Network ID
 output "virtual_network_id" {
   description = "Virtual Network ID"
-  value = azurerm_virtual_network.vnet.id
+  value       = azurerm_virtual_network.vnet.id
 }
 
 # Subnet Outputs (We will write for one web subnet and rest all we will ignore for now)
 ## Subnet Name 
 output "web_subnet_name" {
   description = "WebTier Subnet Name"
-  value = azurerm_subnet.websubnet.name
+  value       = azurerm_subnet.websubnet.name
 }
 
 ## Subnet ID 
 output "web_subnet_id" {
   description = "WebTier Subnet ID"
-  value = azurerm_subnet.websubnet.id
+  value       = azurerm_subnet.websubnet.id
 }
 
 # Network Security Outputs
 ## Web Subnet NSG Name 
 output "web_subnet_nsg_name" {
   description = "WebTier Subnet NSG Name"
-  value = azurerm_network_security_group.web_subnet_nsg.name
+  value       = azurerm_network_security_group.web_subnet_nsg.name
 }
 
 ## Web Subnet NSG ID 
 output "web_subnet_nsg_id" {
   description = "WebTier Subnet NSG ID"
-  value = azurerm_network_security_group.web_subnet_nsg.id
+  value       = azurerm_network_security_group.web_subnet_nsg.id
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
index 5061e24..c06f336 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-01-web-linux-vmss-input-variables.tf
@@ -1,7 +1,7 @@
 # Linux VM Input Variables Placeholder file.
 variable "web_vmss_nsg_inbound_ports" {
   description = "Web VMSS NSG Inbound Ports"
-  type = list(string)
-  default = [22, 80, 443]
+  type        = list(string)
+  default     = [22, 80, 443]
 }
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-02-web-linux-vmss-nsg-inline-basic.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-02-web-linux-vmss-nsg-inline-basic.tf
index fd9245c..814bbec 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-02-web-linux-vmss-nsg-inline-basic.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-02-web-linux-vmss-nsg-inline-basic.tf
@@ -8,7 +8,7 @@ resource "azurerm_network_security_group" "web_vmss_nsg" {
     for_each = var.web_vmss_nsg_inbound_ports
     content {
       name                       = "inbound-rule-${security_rule.key}"
-      description                = "Inbound Rule ${security_rule.key}"    
+      description                = "Inbound Rule ${security_rule.key}"
       priority                   = sum([100, security_rule.key])
       direction                  = "Inbound"
       access                     = "Allow"
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-03-web-linux-vmss-resource.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-03-web-linux-vmss-resource.tf
index a109ec0..5aba42b 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-03-web-linux-vmss-resource.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-03-web-linux-vmss-resource.tf
@@ -1,6 +1,6 @@
 # Locals Block for custom data
 locals {
-webvm_custom_data = <<CUSTOM_DATA
+  webvm_custom_data = <<CUSTOM_DATA
 #!/bin/sh
 #sudo yum update -y
 sudo yum install -y httpd
@@ -21,7 +21,7 @@ CUSTOM_DATA
 
 # Resource: Azure Linux Virtual Machine Scale Set - App1
 resource "azurerm_linux_virtual_machine_scale_set" "web_vmss" {
-  name                = "${local.resource_name_prefix}-web-vmss"
+  name = "${local.resource_name_prefix}-web-vmss"
   #computer_name_prefix = "vmss-app1" # if name argument is not valid one for VMs, we can use this for VM Names
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
@@ -36,9 +36,9 @@ resource "azurerm_linux_virtual_machine_scale_set" "web_vmss" {
 
   source_image_reference {
     publisher = "RedHat"
-    offer = "RHEL"
-    sku = "83-gen2"
-    version = "latest"
+    offer     = "RHEL"
+    sku       = "83-gen2"
+    version   = "latest"
   }
 
   os_disk {
@@ -47,21 +47,21 @@ resource "azurerm_linux_virtual_machine_scale_set" "web_vmss" {
   }
 
   upgrade_mode = "Automatic"
-  
+
   network_interface {
-    name    = "web-vmss-nic"
-    primary = true
+    name                      = "web-vmss-nic"
+    primary                   = true
     network_security_group_id = azurerm_network_security_group.web_vmss_nsg.id
     ip_configuration {
       name      = "internal"
       primary   = true
-      subnet_id = azurerm_subnet.websubnet.id  
+      subnet_id = azurerm_subnet.websubnet.id
       #load_balancer_backend_address_pool_ids = [azurerm_lb_backend_address_pool.web_lb_backend_address_pool.id]
-      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[0].id]            
+      application_gateway_backend_address_pool_ids = [azurerm_application_gateway.web_ag.backend_address_pool[0].id]
     }
   }
   #custom_data = filebase64("${path.module}/app-scripts/redhat-app1-script.sh")      
-  custom_data = base64encode(local.webvm_custom_data)  
+  custom_data = base64encode(local.webvm_custom_data)
 }
-  
+
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-04-web-linux-vmss-outputs.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-04-web-linux-vmss-outputs.tf
index ffc696c..2e734a2 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-04-web-linux-vmss-outputs.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-04-web-linux-vmss-outputs.tf
@@ -2,5 +2,5 @@
 
 output "web_vmss_id" {
   description = "Web Virtual Machine Scale Set ID"
-  value = azurerm_linux_virtual_machine_scale_set.web_vmss.id 
+  value       = azurerm_linux_virtual_machine_scale_set.web_vmss.id
 }
\ No newline at end of file
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-05-web-linux-vmss-autoscaling-default-profile.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-05-web-linux-vmss-autoscaling-default-profile.tf
index fa3a976..8eb9303 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-05-web-linux-vmss-autoscaling-default-profile.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c7-05-web-linux-vmss-autoscaling-default-profile.tf
@@ -26,39 +26,39 @@ resource "azurerm_monitor_autoscale_setting" "web_vmss_autoscale" {
   target_resource_id  = azurerm_linux_virtual_machine_scale_set.web_vmss.id
   # Notification  
   notification {
-      email {
-        send_to_subscription_administrator    = true
-        send_to_subscription_co_administrator = true
-        custom_emails                         = ["myadminteam@ourorg.com"]
-      }
-    }    
-################################################################################
-################################################################################
-#######################  Profile-1: Default Profile  ###########################
-################################################################################
-################################################################################    
-# Profile-1: Default Profile 
+    email {
+      send_to_subscription_administrator    = true
+      send_to_subscription_co_administrator = true
+      custom_emails                         = ["myadminteam@ourorg.com"]
+    }
+  }
+  ################################################################################
+  ################################################################################
+  #######################  Profile-1: Default Profile  ###########################
+  ################################################################################
+  ################################################################################    
+  # Profile-1: Default Profile 
   profile {
     name = "default"
-  # Capacity Block     
+    # Capacity Block     
     capacity {
       default = 2
       minimum = 2
       maximum = 6
     }
-###########  START: Percentage CPU Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Percentage CPU Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -68,18 +68,18 @@ resource "azurerm_monitor_autoscale_setting" "web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Percentage CPU"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -88,21 +88,21 @@ resource "azurerm_monitor_autoscale_setting" "web_vmss_autoscale" {
         threshold          = 25
       }
     }
-###########  END: Percentage CPU Metric Rules   ###########    
+    ###########  END: Percentage CPU Metric Rules   ###########    
 
-###########  START: Available Memory Bytes Metric Rules  ###########    
-  ## Scale-Out 
+    ###########  START: Available Memory Bytes Metric Rules  ###########    
+    ## Scale-Out 
     rule {
       scale_action {
         direction = "Increase"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }            
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"        
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -112,18 +112,18 @@ resource "azurerm_monitor_autoscale_setting" "web_vmss_autoscale" {
       }
     }
 
-  ## Scale-In 
+    ## Scale-In 
     rule {
       scale_action {
         direction = "Decrease"
         type      = "ChangeCount"
         value     = 1
         cooldown  = "PT5M"
-      }        
+      }
       metric_trigger {
         metric_name        = "Available Memory Bytes"
         metric_resource_id = azurerm_linux_virtual_machine_scale_set.web_vmss.id
-        metric_namespace   = "microsoft.compute/virtualmachinescalesets"                
+        metric_namespace   = "microsoft.compute/virtualmachinescalesets"
         time_grain         = "PT1M"
         statistic          = "Average"
         time_window        = "PT5M"
@@ -132,9 +132,9 @@ resource "azurerm_monitor_autoscale_setting" "web_vmss_autoscale" {
         threshold          = 2147483648 # Decrease 1 VM when Memory In Bytes is Greater than 2GB
       }
     }
-###########  END: Available Memory Bytes Metric Rules  ###########  
+    ###########  END: Available Memory Bytes Metric Rules  ###########  
 
-/*
+    /*
 ###########  START: LB SYN Count Metric Rules - Just to Test scale-in, scale-out  ###########    
   ## Scale-Out 
     rule {
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-02-application-gateway-resource.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-02-application-gateway-resource.tf
index 8291204..6518a88 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-02-application-gateway-resource.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-02-application-gateway-resource.tf
@@ -4,7 +4,7 @@ resource "azurerm_public_ip" "web_ag_publicip" {
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
   allocation_method   = "Static"
-  sku = "Standard"  
+  sku                 = "Standard"
 }
 
 # Azure Application Gateway - Locals Block 
@@ -16,66 +16,66 @@ locals {
 
 
   # App1
-  backend_address_pool_name_app1      = "${azurerm_virtual_network.vnet.name}-beap-app1"
-  http_setting_name_app1              = "${azurerm_virtual_network.vnet.name}-be-htst-app1"
+  backend_address_pool_name_app1 = "${azurerm_virtual_network.vnet.name}-beap-app1"
+  http_setting_name_app1         = "${azurerm_virtual_network.vnet.name}-be-htst-app1"
   probe_name_app1                = "${azurerm_virtual_network.vnet.name}-be-probe-app1"
 
   # HTTP Listener -  Port 80
-  listener_name_http                  = "${azurerm_virtual_network.vnet.name}-lstn-http"
-  request_routing_rule_name_http      = "${azurerm_virtual_network.vnet.name}-rqrt-http"
-  frontend_port_name_http             = "${azurerm_virtual_network.vnet.name}-feport-http"
+  listener_name_http             = "${azurerm_virtual_network.vnet.name}-lstn-http"
+  request_routing_rule_name_http = "${azurerm_virtual_network.vnet.name}-rqrt-http"
+  frontend_port_name_http        = "${azurerm_virtual_network.vnet.name}-feport-http"
 
 
   # HTTPS Listener -  Port 443
-  listener_name_https                  = "${azurerm_virtual_network.vnet.name}-lstn-https"
-  request_routing_rule_name_https      = "${azurerm_virtual_network.vnet.name}-rqrt-https"
-  frontend_port_name_https             = "${azurerm_virtual_network.vnet.name}-feport-https"
-  ssl_certificate_name                 = "my-cert-1" 
-  ssl_certificate_name_keyvault        = "keyvault-my-cert-1"
+  listener_name_https             = "${azurerm_virtual_network.vnet.name}-lstn-https"
+  request_routing_rule_name_https = "${azurerm_virtual_network.vnet.name}-rqrt-https"
+  frontend_port_name_https        = "${azurerm_virtual_network.vnet.name}-feport-https"
+  ssl_certificate_name            = "my-cert-1"
+  ssl_certificate_name_keyvault   = "keyvault-my-cert-1"
 }
 
 
 
 # Resource-2: Azure Application Gateway - Standard
 resource "azurerm_application_gateway" "web_ag" {
-  depends_on = [ azurerm_storage_blob.static_container_blob  ]  
+  depends_on          = [azurerm_storage_blob.static_container_blob]
   name                = "${local.resource_name_prefix}-web-ag"
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
-# START: --------------------------------------- #
-# SKU: Standard_v2 (New Version )
+  # START: --------------------------------------- #
+  # SKU: Standard_v2 (New Version )
   sku {
-    name     = "Standard_v2"
-    tier     = "Standard_v2"
+    name = "Standard_v2"
+    tier = "Standard_v2"
     #capacity = 2
   }
   autoscale_configuration {
     min_capacity = 0
     max_capacity = 10
-  }  
-# END: --------------------------------------- #
+  }
+  # END: --------------------------------------- #
 
   gateway_ip_configuration {
     name      = "my-gateway-ip-configuration"
     subnet_id = azurerm_subnet.agsubnet.id
   }
 
-# Frontend Port  - HTTP Port 80
+  # Frontend Port  - HTTP Port 80
   frontend_port {
-    name = local.frontend_port_name_http 
-    port = 80    
+    name = local.frontend_port_name_http
+    port = 80
   }
 
-# Frontend Port  - HTTP Port 443
+  # Frontend Port  - HTTP Port 443
   frontend_port {
     name = local.frontend_port_name_https
-    port = 443    
-  }  
+    port = 443
+  }
 
-# Frontend IP Configuration
+  # Frontend IP Configuration
   frontend_ip_configuration {
     name                 = local.frontend_ip_configuration_name
-    public_ip_address_id = azurerm_public_ip.web_ag_publicip.id    
+    public_ip_address_id = azurerm_public_ip.web_ag_publicip.id
   }
 
   # App1 Configs
@@ -86,10 +86,10 @@ resource "azurerm_application_gateway" "web_ag" {
     name                  = local.http_setting_name_app1
     cookie_based_affinity = "Disabled"
     #path                  = "/app1/"
-    port                  = 80
-    protocol              = "Http"
-    request_timeout       = 60
-    probe_name            = local.probe_name_app1
+    port            = 80
+    protocol        = "Http"
+    request_timeout = 60
+    probe_name      = local.probe_name_app1
   }
   probe {
     name                = local.probe_name_app1
@@ -101,75 +101,75 @@ resource "azurerm_application_gateway" "web_ag" {
     port                = 80
     path                = "/app1/status.html"
     match { # Optional
-      body              = "App1"
-      status_code       = ["200"]
+      body        = "App1"
+      status_code = ["200"]
     }
-  }   
+  }
 
-# HTTP Listener - Port 80
+  # HTTP Listener - Port 80
   http_listener {
     name                           = local.listener_name_http
     frontend_ip_configuration_name = local.frontend_ip_configuration_name
     frontend_port_name             = local.frontend_port_name_http
-    protocol                       = "Http"    
+    protocol                       = "Http"
   }
-# HTTP Routing Rule - HTTP to HTTPS Redirect
+  # HTTP Routing Rule - HTTP to HTTPS Redirect
   request_routing_rule {
-    name                       = local.request_routing_rule_name_http
-    rule_type                  = "Basic"
-    http_listener_name         = local.listener_name_http 
+    name                        = local.request_routing_rule_name_http
+    rule_type                   = "Basic"
+    http_listener_name          = local.listener_name_http
     redirect_configuration_name = local.redirect_configuration_name
   }
-# Redirect Config for HTTP to HTTPS Redirect  
+  # Redirect Config for HTTP to HTTPS Redirect  
   redirect_configuration {
-    name = local.redirect_configuration_name
-    redirect_type = "Permanent"
+    name                 = local.redirect_configuration_name
+    redirect_type        = "Permanent"
     target_listener_name = local.listener_name_https
-    include_path = true
+    include_path         = true
     include_query_string = true
-  }  
+  }
 
 
-# SSL Certificate Block
-/*  ssl_certificate {
+  # SSL Certificate Block
+  /*  ssl_certificate {
     name = local.ssl_certificate_name
     password = "kalyan"
     data = filebase64("${path.module}/ssl-self-signed/httpd.pfx")
   }*/
 
   ssl_certificate {
-    name = local.ssl_certificate_name_keyvault
-    key_vault_secret_id = azurerm_key_vault_certificate.my_cert_1.secret_id    
+    name                = local.ssl_certificate_name_keyvault
+    key_vault_secret_id = azurerm_key_vault_certificate.my_cert_1.secret_id
   }
 
   identity {
     identity_ids = [azurerm_user_assigned_identity.appag_umid.id]
-  }  
+  }
 
-# HTTPS Listener - Port 443  
+  # HTTPS Listener - Port 443  
   http_listener {
     name                           = local.listener_name_https
     frontend_ip_configuration_name = local.frontend_ip_configuration_name
     frontend_port_name             = local.frontend_port_name_https
-    protocol                       = "Https"    
-    ssl_certificate_name           = local.ssl_certificate_name_keyvault    
+    protocol                       = "Https"
+    ssl_certificate_name           = local.ssl_certificate_name_keyvault
     custom_error_configuration {
       custom_error_page_url = "${azurerm_storage_account.storage_account.primary_web_endpoint}502.html"
-      status_code = "HttpStatus502"
+      status_code           = "HttpStatus502"
     }
     custom_error_configuration {
       custom_error_page_url = "${azurerm_storage_account.storage_account.primary_web_endpoint}403.html"
-      status_code = "HttpStatus403"
-    }    
+      status_code           = "HttpStatus403"
+    }
   }
 
-# HTTPS Routing Rule - Port 443
+  # HTTPS Routing Rule - Port 443
   request_routing_rule {
     name                       = local.request_routing_rule_name_https
     rule_type                  = "Basic"
     http_listener_name         = local.listener_name_https
     backend_address_pool_name  = local.backend_address_pool_name_app1
-    backend_http_settings_name = local.http_setting_name_app1    
+    backend_http_settings_name = local.http_setting_name_app1
   }
 
 
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-03-application-gateway-outputs.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-03-application-gateway-outputs.tf
index 9318565..3a40259 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-03-application-gateway-outputs.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-03-application-gateway-outputs.tf
@@ -1,10 +1,10 @@
 # Application Gateway Outputs
 output "web_ag_id" {
-  description = "Azure Application Gateway ID"  
-  value = azurerm_application_gateway.web_ag.id 
+  description = "Azure Application Gateway ID"
+  value       = azurerm_application_gateway.web_ag.id
 }
 
 output "web_ag_public_ip_1" {
-  description = "Azure Application Gateway Public IP 1"  
-  value = azurerm_public_ip.web_ag_publicip.ip_address
+  description = "Azure Application Gateway Public IP 1"
+  value       = azurerm_public_ip.web_ag_publicip.ip_address
 }
\ No newline at end of file
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-04-application-gateway-managed-identity.tf b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-04-application-gateway-managed-identity.tf
index 4f1e366..c6af2cc 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-04-application-gateway-managed-identity.tf
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/c9-04-application-gateway-managed-identity.tf
@@ -1,7 +1,7 @@
 # https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/user_assigned_identity
 # Resource: User Assigned Managed Identity
 resource "azurerm_user_assigned_identity" "appag_umid" {
-  name = "${local.resource_name_prefix}-appgw-umid"
+  name                = "${local.resource_name_prefix}-appgw-umid"
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
 }
diff --git a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/terraform.tfvars b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/terraform.tfvars
index f3bf573..fcf5041 100644
--- a/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/terraform.tfvars
+++ b/31-Azure-Application-Gateway-SSL-SelfSigned-KeyVault/terraform-manifests/terraform.tfvars
@@ -1,20 +1,20 @@
-business_divsion = "hr"
-environment = "dev"
-resource_group_name = "rg"
+business_divsion        = "hr"
+environment             = "dev"
+resource_group_name     = "rg"
 resource_group_location = "eastus"
-vnet_name = "vnet"
-vnet_address_space = ["10.1.0.0/16"]
+vnet_name               = "vnet"
+vnet_address_space      = ["10.1.0.0/16"]
 
-web_subnet_name = "websubnet"
+web_subnet_name    = "websubnet"
 web_subnet_address = ["10.1.1.0/24"]
 
-app_subnet_name = "appsubnet"
+app_subnet_name    = "appsubnet"
 app_subnet_address = ["10.1.11.0/24"]
 
-db_subnet_name = "dbsubnet"
+db_subnet_name    = "dbsubnet"
 db_subnet_address = ["10.1.21.0/24"]
 
-bastion_subnet_name = "bastionsubnet"
+bastion_subnet_name    = "bastionsubnet"
 bastion_subnet_address = ["10.1.100.0/24"]
 
 #bastion_service_subnet_name = "AzureBastionSubnet"
@@ -22,7 +22,7 @@ bastion_subnet_address = ["10.1.100.0/24"]
 
 web_vmss_nsg_inbound_ports = [22, 80, 443]
 
-ag_subnet_name = "agsubnet"
+ag_subnet_name    = "agsubnet"
 ag_subnet_address = ["10.1.51.0/24"]
 
 storage_account_name              = "staticwebsite"

From 27059933ea65acc565487f244d5f0c98ad3890b7 Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 05:50:39 -0400
Subject: [PATCH 03/10] ADD Github Actions files

---
 .github/dependabot.yml            |  7 +++++++
 .github/workflows/superlinter.yml | 24 ++++++++++++++++++++++++
 .github/workflows/terraform.yml   | 29 +++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/superlinter.yml
 create mode 100644 .github/workflows/terraform.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..b306abb
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "terraform"
+    directory: "/"
+    schedule:
+      interval: "daily"
\ No newline at end of file
diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml
new file mode 100644
index 0000000..ef355ce
--- /dev/null
+++ b/.github/workflows/superlinter.yml
@@ -0,0 +1,24 @@
+---
+name: "Code Quality: Super-Linter"
+on:
+  pull_request:
+jobs:
+  superlinter:
+    name: Super-Linter
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - name: Lint Code
+        uses: docker://github/super-linter:v4
+        env:
+          VALIDATE_ALL_CODEBASE: true
+          DEFAULT_BRANCH: "main"
+          DISABLE_ERRORS: false
+          VALIDATE_BASH: true
+          VALIDATE_JSON: true
+          VALIDATE_MD: true
+          VALIDATE_TERRAFORM: true
+          VALIDATE_YAML: true
\ No newline at end of file
diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
new file mode 100644
index 0000000..3ab8a21
--- /dev/null
+++ b/.github/workflows/terraform.yml
@@ -0,0 +1,29 @@
+---
+name: "Code Quality: Terraform"
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  terraform:
+    name: Terraform
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 1
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v1
+
+      - name: Run `terraform fmt`
+        id: fmt
+        run: terraform fmt -diff -check -no-color -recursive
+      - name: Run `terraform init`
+        id: init
+        run: terraform init
+      - name: Run `terraform validate`
+        id: validate
+        if: github.event_name == 'pull_request'
+        run: terraform validate -no-color
\ No newline at end of file

From b995045718cb1bf0f2f3acc8ad396148b2b3e3f7 Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 05:55:24 -0400
Subject: [PATCH 04/10] UPDATE disable validate

---
 .github/workflows/superlinter.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml
index ef355ce..086ec57 100644
--- a/.github/workflows/superlinter.yml
+++ b/.github/workflows/superlinter.yml
@@ -14,11 +14,11 @@ jobs:
       - name: Lint Code
         uses: docker://github/super-linter:v4
         env:
-          VALIDATE_ALL_CODEBASE: true
+          VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: "main"
           DISABLE_ERRORS: false
-          VALIDATE_BASH: true
-          VALIDATE_JSON: true
-          VALIDATE_MD: true
-          VALIDATE_TERRAFORM: true
-          VALIDATE_YAML: true
\ No newline at end of file
+          VALIDATE_BASH: false
+          VALIDATE_JSON: false
+          VALIDATE_MD: false
+          VALIDATE_TERRAFORM: false
+          VALIDATE_YAML: false
\ No newline at end of file

From e529f3a4c7b7601e4b51620dc086b7906b3b5d3a Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:11:22 -0400
Subject: [PATCH 05/10] UPDATE terraform workflows

---
 .github/workflows/terraform.yml | 62 ++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 3ab8a21..ba03c88 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -10,20 +10,64 @@ jobs:
     name: Terraform
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 1
+      - name: Checkout
+        uses: actions/checkout@v3
+
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
 
-      - name: Run `terraform fmt`
+      - name: Terraform Format
         id: fmt
-        run: terraform fmt -diff -check -no-color -recursive
-      - name: Run `terraform init`
+        run: terraform fmt -check -recursive
+
+      - name: Terraform Init
         id: init
         run: terraform init
-      - name: Run `terraform validate`
+
+      - name: Terraform Validate
         id: validate
+        run: terraform validate -no-color
+
+      - name: Terraform Plan
+        id: plan
+        run: terraform plan -no-color -input=false
+        continue-on-error: true
+
+      - name: Update Pull Request
+        uses: actions/github-script@6
         if: github.event_name == 'pull_request'
-        run: terraform validate -no-color
\ No newline at end of file
+        env:
+          PLAN: "terraform\n${{ steps.plan.outputs.stdout }}"
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
+            #### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
+            #### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
+            #### Terraform Validation 🤖\`${{ steps.validate.outcome }}\`
+
+            <details><summary>Show Plan</summary>
+
+            \`\`\`\n
+            ${process.env.PLAN}
+            \`\`\`
+
+            </details>
+
+            *Pushed by: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`;
+
+            github.rest.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: output
+            })
+            
+
+      - name: Terraform Plan Status
+        if: steps.plan.outcome == 'failure'
+        run: exit 1
+
+      - name: Terraform Apply
+        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
+        run: terraform apply -auto-approve -input=false
\ No newline at end of file

From 1777806cf0a048e88ba66f98fee30af91f155c41 Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:12:49 -0400
Subject: [PATCH 06/10] UPDATE terraform workflows

---
 .github/workflows/terraform.yml | 41 +--------------------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index ba03c88..550b5a7 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -31,43 +31,4 @@ jobs:
       - name: Terraform Plan
         id: plan
         run: terraform plan -no-color -input=false
-        continue-on-error: true
-
-      - name: Update Pull Request
-        uses: actions/github-script@6
-        if: github.event_name == 'pull_request'
-        env:
-          PLAN: "terraform\n${{ steps.plan.outputs.stdout }}"
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const output = `#### Terraform Format and Style 🖌\`${{ steps.fmt.outcome }}\`
-            #### Terraform Initialization ⚙️\`${{ steps.init.outcome }}\`
-            #### Terraform Plan 📖\`${{ steps.plan.outcome }}\`
-            #### Terraform Validation 🤖\`${{ steps.validate.outcome }}\`
-
-            <details><summary>Show Plan</summary>
-
-            \`\`\`\n
-            ${process.env.PLAN}
-            \`\`\`
-
-            </details>
-
-            *Pushed by: @${{ github.actor }}, Action: \`${{ github.event_name }}\`*`;
-
-            github.rest.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: output
-            })
-            
-
-      - name: Terraform Plan Status
-        if: steps.plan.outcome == 'failure'
-        run: exit 1
-
-      - name: Terraform Apply
-        if: github.ref == 'refs/heads/main' && github.event_name == 'push'
-        run: terraform apply -auto-approve -input=false
\ No newline at end of file
+        continue-on-error: true
\ No newline at end of file

From 69203f8c3c1b244bd5b56551bf63f293789e793f Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:14:33 -0400
Subject: [PATCH 07/10] UPDATE terraform workflow fmt

---
 .github/workflows/terraform.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 550b5a7..ebe16f7 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Setup Terraform
         uses: hashicorp/setup-terraform@v1
 
-      - name: Terraform Format
-        id: fmt
-        run: terraform fmt -check -recursive
+#      - name: Terraform Format
+#        id: fmt
+#        run: terraform fmt -check -recursive
 
       - name: Terraform Init
         id: init

From 24abd3e96f2ec36e8ff72285489ecdedfe3ee0ea Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:19:12 -0400
Subject: [PATCH 08/10] UPDATE terraform workflows

---
 .github/workflows/terraform.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index ebe16f7..2831aff 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -10,6 +10,7 @@ jobs:
     name: Terraform
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout
         uses: actions/checkout@v3
 
@@ -28,7 +29,7 @@ jobs:
         id: validate
         run: terraform validate -no-color
 
-      - name: Terraform Plan
-        id: plan
-        run: terraform plan -no-color -input=false
-        continue-on-error: true
\ No newline at end of file
+#      - name: Terraform Plan
+#        id: plan
+#        run: terraform plan -no-color -input=false
+#        continue-on-error: true
\ No newline at end of file

From ba20dfb2d75e3d0c11352185037f6c463ced8895 Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:22:46 -0400
Subject: [PATCH 09/10] ADD azurerm_network_watcher.default

---
 .../terraform-manifests/nwwatcher.tf                      | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 10-Azure-Virtual-Network-4Tier/terraform-manifests/nwwatcher.tf

diff --git a/10-Azure-Virtual-Network-4Tier/terraform-manifests/nwwatcher.tf b/10-Azure-Virtual-Network-4Tier/terraform-manifests/nwwatcher.tf
new file mode 100644
index 0000000..1c1327e
--- /dev/null
+++ b/10-Azure-Virtual-Network-4Tier/terraform-manifests/nwwatcher.tf
@@ -0,0 +1,8 @@
+resource "azurerm_network_watcher" "default" {
+  location            = "eastus"
+  name                = "NetworkWatcher_eastus"
+  resource_group_name = "NetworkWatcherRG"
+  tags                = {}
+
+  timeouts {}
+}
\ No newline at end of file

From 9e5e6763fbe5d3f454fd0eff43bbd7d0044330fd Mon Sep 17 00:00:00 2001
From: Jose Almenarez <jose.almenarez@gmail.com>
Date: Sat, 23 Jul 2022 06:24:30 -0400
Subject: [PATCH 10/10] UPDATE workflow superlinter

---
 .github/workflows/superlinter.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/superlinter.yml b/.github/workflows/superlinter.yml
index 086ec57..523ff46 100644
--- a/.github/workflows/superlinter.yml
+++ b/.github/workflows/superlinter.yml
@@ -7,18 +7,18 @@ jobs:
     name: Super-Linter
     runs-on: ubuntu-latest
     steps:
+
       - name: Checkout Repository
         uses: actions/checkout@v3
-        with:
-          fetch-depth: 1
+
       - name: Lint Code
         uses: docker://github/super-linter:v4
         env:
-          VALIDATE_ALL_CODEBASE: false
+          VALIDATE_ALL_CODEBASE: true
           DEFAULT_BRANCH: "main"
           DISABLE_ERRORS: false
-          VALIDATE_BASH: false
-          VALIDATE_JSON: false
-          VALIDATE_MD: false
-          VALIDATE_TERRAFORM: false
-          VALIDATE_YAML: false
\ No newline at end of file
+          VALIDATE_BASH: true
+          VALIDATE_JSON: true
+          VALIDATE_MD: true
+          VALIDATE_TERRAFORM: true
+          VALIDATE_YAML: true
\ No newline at end of file