fix: update CI workflow and format terraform code

- TFLint: use --minimum-failure-severity=error (warnings don't fail CI)
- Run terraform fmt -recursive for canonical formatting

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: JoshLuedeman

.github/workflows/ci.yml

@@ -62,7 +62,7 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
 
       - name: Run TFLint
-        run: tflint --recursive --format compact
+        run: tflint --recursive --format compact --minimum-failure-severity=error
 
   terraform-plan:
     name: "📋 Plan (Validation)"

infrastructure/terraform/03-modules.workload.spoke.tf

@@ -16,11 +16,11 @@ module "mod_workload_spoke" {
   subscription_id_workload = data.azurerm_client_config.current.subscription_id #var.subscription_id_workload_dev Change this to the subscription ID of the workload subscription
 
   # Hub Configuration
-  hub_virtual_network_id = module.mod_landing_zone.hub_virtual_network_id
-  firewall_private_ip    = module.mod_landing_zone.firewall_private_ip
-  hub_storage_account_id = module.mod_landing_zone.hub_storage_account_id
+  hub_virtual_network_id                   = module.mod_landing_zone.hub_virtual_network_id
+  firewall_private_ip                      = module.mod_landing_zone.firewall_private_ip
+  hub_storage_account_id                   = module.mod_landing_zone.hub_storage_account_id
   hub_managmement_logging_log_analytics_id = module.mod_landing_zone.ops_logging_log_analytics_resource_id
-  hub_managmement_logging_workspace_id = module.mod_landing_zone.ops_logging_log_analytics_workspace_id
+  hub_managmement_logging_workspace_id     = module.mod_landing_zone.ops_logging_log_analytics_workspace_id
 
   # Resource Lock Configuration
   enable_resource_locks = var.enable_resource_locks

infrastructure/terraform/modules/01-remote-state/main.tf

@@ -3,18 +3,18 @@
 
 # Generate a random storage name
 resource "random_string" "tf-name" {
-  length = 8
-  upper = false
-  number = true
-  lower = true
+  length  = 8
+  upper   = false
+  number  = true
+  lower   = true
   special = false
 }
 
 # Create a Resource Group for the Terraform State File
 resource "azurerm_resource_group" "state-rg" {
-  name = "${lower(var.org_name)}-network-artifacts-rg"
+  name     = "${lower(var.org_name)}-network-artifacts-rg"
   location = var.location
-  
+
   lifecycle {
     prevent_destroy = true
   }
@@ -25,16 +25,16 @@ resource "azurerm_resource_group" "state-rg" {
 
 # Create a Storage Account for the Terraform State File
 resource "azurerm_storage_account" "state-sta" {
-  depends_on = [azurerm_resource_group.state-rg]
-  name = "${lower(var.org_name)}tfmgtprod${random_string.tf-name.result}"
-  resource_group_name = azurerm_resource_group.state-rg.name
-  location = azurerm_resource_group.state-rg.location
-  account_kind = "StorageV2"
-  account_tier = "Standard"
-  access_tier = "Hot"
-  account_replication_type = "ZRS"
+  depends_on                = [azurerm_resource_group.state-rg]
+  name                      = "${lower(var.org_name)}tfmgtprod${random_string.tf-name.result}"
+  resource_group_name       = azurerm_resource_group.state-rg.name
+  location                  = azurerm_resource_group.state-rg.location
+  account_kind              = "StorageV2"
+  account_tier              = "Standard"
+  access_tier               = "Hot"
+  account_replication_type  = "ZRS"
   enable_https_traffic_only = true
-   
+
   lifecycle {
     prevent_destroy = true
   }
@@ -44,7 +44,7 @@ resource "azurerm_storage_account" "state-sta" {
 }
 # Create a Storage Container for the Core State File
 resource "azurerm_storage_container" "core-container" {
-  depends_on = [azurerm_storage_account.state-sta]
-  name = "core-mgt-prod-tfstate"
+  depends_on           = [azurerm_storage_account.state-sta]
+  name                 = "core-mgt-prod-tfstate"
   storage_account_name = azurerm_storage_account.state-sta.name
 }

infrastructure/terraform/modules/01-remote-state/variables.tf

@@ -3,19 +3,19 @@
 
 # Organization name
 variable "org_name" {
-  type = string
+  type        = string
   description = "mpe"
-  default = "afmpe"
+  default     = "afmpe"
 }
 # Environment
 variable "environment" {
-  type = string
+  type        = string
   description = "This variable defines the environment to be built"
-  default = "prod"
+  default     = "prod"
 }
 # Azure region
 variable "location" {
-  type = string
+  type        = string
   description = "Azure region where resources will be created"
-  default = "eastus"
+  default     = "eastus"
 }

infrastructure/terraform/modules/01-remote-state/versions.tf

@@ -1,4 +1,4 @@
 
 provider "azurerm" {
-    features{}
+  features {}
 }

infrastructure/terraform/modules/03-workload_spoke/locals.tf

@@ -20,5 +20,5 @@ locals {
   workload_resources_tags = merge(
     var.disable_base_module_tags ? local.empty_map : local.base_module_tags,
     var.default_tags,
-  )  
+  )
 }

infrastructure/terraform/modules/03-workload_spoke/main.tf

@@ -14,8 +14,8 @@ AUTHOR/S: jrspinella
 
 // Resources for the Operations Spoke
 module "mod_workload_network" {
-  source    = "azurenoops/overlays-workload-spoke/azurerm"
-  version   = ">= 2.0.0"
+  source  = "azurenoops/overlays-workload-spoke/azurerm"
+  version = ">= 2.0.0"
 
   # By default, this module will create a resource group, provide the name here
   # To use an existing resource group, specify the existing resource group name, 
@@ -26,7 +26,7 @@ module "mod_workload_network" {
   org_name              = var.org_name
   environment           = var.environment
   workload_name         = var.wl_name
-  
+
   # Collect Spoke Virtual Network Parameters
   # Spoke network details to create peering and other setup
   hub_virtual_network_id          = var.hub_virtual_network_id

infrastructure/terraform/modules/03-workload_spoke/versions.tf

@@ -1,12 +1,12 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
-terraform { 
-   # It is recommended to use remote state instead of local. Only use this if deploying the module only, and not from the root.
+terraform {
+  # It is recommended to use remote state instead of local. Only use this if deploying the module only, and not from the root.
   #backend "azurerm" {
-    # resource_group_name  = ""   # Partial configuration, provided during "terraform init"
-    # storage_account_name = ""   # Partial configuration, provided during "terraform init"
-    # container_name       = ""   # Partial configuration, provided during "terraform init"
-    # key                    = "landing_zone"
+  # resource_group_name  = ""   # Partial configuration, provided during "terraform init"
+  # storage_account_name = ""   # Partial configuration, provided during "terraform init"
+  # container_name       = ""   # Partial configuration, provided during "terraform init"
+  # key                    = "landing_zone"
   #}
 }
 

infrastructure/terraform/versions.tf

@@ -3,7 +3,7 @@ terraform {
   backend "local" {}
   # If you are using Azure Storage, You can update these values in order to configure your remote state. backend.conf is not required for local backend.
   #backend "azurerm" {    
-    #key                  = "anoa"
+  #key                  = "anoa"
   #}
   # If you are using Terraform Cloud, You can update these values in order to configure your remote state.
   /*  backend "remote" {