Update terraform definition

Author: marvinbuss

code/infra/terraform.tf

@@ -4,22 +4,22 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.53.0"
+      version = "3.59.0"
     }
     azapi = {
       source  = "azure/azapi"
-      version = "1.5.0"
+      version = "1.6.0"
     }
   }
 
   backend "azurerm" {
     environment          = "public"
-    subscription_id      = "176a0de9-d99e-4faa-90cc-89780e1186fe"
-    resource_group_name  = "workload000-cicd"
-    storage_account_name = "workload000stg001"
-    container_name       = "terraform"
-    key                  = "terraform-function20.tfstate"
-    use_oidc             = true
+    subscription_id      = "8f171ff9-2b5b-4f0f-aed5-7fa360a1d094"
+    resource_group_name  = "mycrp-prd-cicd"
+    storage_account_name = "mycrpprdstg001"
+    container_name       = "function"
+    key                  = "terraform.tfstate"
+    # use_oidc             = true
   }
 }
 
@@ -28,7 +28,7 @@ provider "azurerm" {
   environment                    = "public"
   skip_provider_registration     = false
   storage_use_azuread            = true
-  use_oidc                       = true
+  # use_oidc                       = true
 
   features {
     key_vault {
@@ -52,5 +52,5 @@ provider "azapi" {
   disable_correlation_request_id = false
   environment                    = "public"
   skip_provider_registration     = false
-  use_oidc                       = true
+  # use_oidc                       = true
 }

code/infra/variables.tf

@@ -10,8 +10,8 @@ variable "environment" {
   sensitive   = false
   default     = "dev"
   validation {
-    condition     = contains(["dev", "tst", "prd"], var.environment)
-    error_message = "Please use an allowed value: \"dev\", \"tst\" or \"prd\"."
+    condition     = contains(["int", "dev", "tst", "qa", "uat", "prd"], var.environment)
+    error_message = "Please use an allowed value: \"int\", \"dev\", \"tst\", \"qa\", \"uat\" or \"prd\"."
   }
 }
 
@@ -27,14 +27,9 @@ variable "prefix" {
 
 variable "tags" {
   description = "Specifies the tags that you want to apply to all resources."
-  type        = map(any)
-  sensitive   = false
-}
-
-variable "timestamp_expiry" {
-  description = "Specifies the initial key vault key expiry."
-  type        = number
+  type        = map(string)
   sensitive   = false
+  default     = {}
 }
 
 variable "vnet_id" {

code/infra/vars.dev.tfvars

@@ -1,13 +1,12 @@
-location         = "eastus"
-environment      = "dev"
-prefix           = "mb020"
-tags             = {}
-timestamp_expiry = 1716628196
-vnet_id          = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/virtualNetworks/vnet-eastus002"
-nsg_id           = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/networkSecurityGroups/nsg-eastus002"
-route_table_id   = "/subscriptions/6a439cba-0e4d-46ca-9eda-e3b7a8f60a49/resourceGroups/vnet-eastus-rg002/providers/Microsoft.Network/routeTables/rt-eastus002"
-private_dns_zone_id_blob                = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
-private_dns_zone_id_queue               = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.queue.core.windows.net"
-private_dns_zone_id_table               = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.table.core.windows.net"
-private_dns_zone_id_file = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.file.core.windows.net"
-private_dns_zone_id_key_vault           = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"
+location                      = "northeurope"
+environment                   = "dev"
+prefix                        = "myfunc"
+tags                          = {}
+vnet_id                       = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/virtualNetworks/mycrp-prd-function-vnet001"
+nsg_id                        = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/networkSecurityGroups/mycrp-prd-function-nsg001"
+route_table_id                = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-function-network-rg/providers/Microsoft.Network/routeTables/mycrp-prd-function-rt001"
+private_dns_zone_id_blob      = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.blob.core.windows.net"
+private_dns_zone_id_queue     = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.queue.core.windows.net"
+private_dns_zone_id_table     = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.table.core.windows.net"
+private_dns_zone_id_file      = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.file.core.windows.net"
+private_dns_zone_id_key_vault = "/subscriptions/8f171ff9-2b5b-4f0f-aed5-7fa360a1d094/resourceGroups/mycrp-prd-global-dns/providers/Microsoft.Network/privateDnsZones/privatelink.vaultcore.azure.net"