edited tf versions

HoussemDellai · Jan 7, 2024 · e041263 · e041263
1 parent 40a6a97
commit e041263
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       max-parallel: 30
       matrix:
-        directory: [001_vnet_subnets_tf, 002_vm_bastion, 003_vm_bastion_nsg, 004_vnet_peering_tf, 003_vm_bastion_nsg, 200_hub_spoke_firewall, 300_load_balancer_vm, 301_load_balancer_vmss, 302_load_balancer_internal_vmss_natgateway, 400_private_dns_zone, 410_private_endpoint_mssql, 420_private_endpoint_pls, 430_service_endpoint_storage_account, 431_service_endpoint_app_service, 500_application_gateway_vmss, 520_application_gateway_vmss_tls_cert_keyvault, 600_public_ip_vm, 620_nat_gateway, 621_nat_gateway_lb, 700_api_management_public, 705_api_management_external, 710_api_management_internal, 715_api_management_internal_app_gateway]
+        directory: [001_vnet_subnets_tf, 002_vm_bastion, 003_vm_bastion_nsg, 004_vnet_peering_tf, 005_vm_linux_win_bastion, 006_route_table, 200_hub_spoke_firewall, 300_load_balancer_vm, 301_load_balancer_vmss, 302_load_balancer_internal_vmss_natgateway, 400_private_dns_zone, 410_private_endpoint_mssql, 420_private_endpoint_pls, 430_service_endpoint_storage_account, 431_service_endpoint_app_service, 500_application_gateway_vmss, 520_application_gateway_vmss_tls_cert_keyvault, 600_public_ip_vm, 620_nat_gateway, 621_nat_gateway_lb, 700_api_management_public, 705_api_management_external, 710_api_management_internal, 715_api_management_internal_app_gateway]
         # directory: [004_vnet_peering_tf, 003_vm_bastion_nsg, 200_hub_spoke_firewall, 300_load_balancer_vm, 301_load_balancer_vmss, 302_load_balancer_internal_vmss_natgateway, 400_private_dns_zone, 410_private_endpoint_mssql, 420_private_endpoint_pls]
 #       node: [14, 16,]
 
@@ -50,7 +50,37 @@ jobs:
         azcliversion: latest
         inlineScript: |
           az account show
-          
+
+    # Delete terraform.tfstate if exists
+    - name: Delete terraform.tfstate file if exists
+      run: |
+
+        if [ -f "terraform.tfstate" ]; then
+            echo "File terraform.tfstate exists."
+            rm terraform.tfstate
+            echo "File terraform.tfstate deleted."
+        else
+            echo "File terraform.tfstate does not exist."
+        fi
+        
+      working-directory: ${{ matrix.directory }}
+      continue-on-error: true
+
+    # Delete Bastion if exists
+    - name: Delete Bastion Terraform file if exists
+      run: |
+
+        if [ -f "bastion.tf" ]; then
+            echo "File bastion.tf exists."
+            rm bastion.tf
+            echo "File bastion.tf deleted."
+        else
+            echo "File bastion.tf does not exist."
+        fi
+        
+      working-directory: ${{ matrix.directory }}
+      continue-on-error: true
+
     # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc.
     - name: Terraform Init
       run: terraform -chdir=${{ matrix.directory }} init 

diff --git a/715_api_management_internal_app_gateway/keyvault.tf b/715_api_management_internal_app_gateway/keyvault.tf
@@ -1,7 +1,7 @@
 data "azurerm_client_config" "current" {}
 
 resource "azurerm_key_vault" "keyvault" {
-  name                       = "kv-apgw-${var.prefix}"
+  name                       = "kv-appgw-${var.prefix}"
   location                   = azurerm_resource_group.rg.location
   resource_group_name        = azurerm_resource_group.rg.name
   tenant_id                  = data.azurerm_client_config.current.tenant_id