From 40a6a972dca5833acf0c80c54979403593531bfb Mon Sep 17 00:00:00 2001 From: Houssem Dellai Date: Sun, 7 Jan 2024 15:45:45 +0100 Subject: [PATCH] edited tf versions --- .github/workflows/github-actions.yml | 2 +- 410_private_endpoint_mssql/random.tf | 1 + .../random.tf | 1 + 431_service_endpoint_app_service/random.tf | 1 + .../random.tf | 1 + 700_api_management_public/random.tf | 1 + 705_api_management_external/public_ip-apim.tf | 2 +- 705_api_management_external/random.tf | 1 + 705_api_management_external/terraform.tfstate | 43 +++++++++++++++++++ 710_api_management_internal/random.tf | 1 + .../random.tf | 1 + scripts/terraform-cleaning.ps1 | 11 +++-- 12 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 705_api_management_external/terraform.tfstate diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 2c5bc93..a9fd589 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -88,7 +88,7 @@ jobs: RG_ARRAY=($RG) for name in "${RG_ARRAY[@]}"; do - echo "Resource group: $name" + echo "Deleting resource group: $name ..." az group delete -g $name --no-wait --yes done diff --git a/410_private_endpoint_mssql/random.tf b/410_private_endpoint_mssql/random.tf index 17045d2..732d4c4 100644 --- a/410_private_endpoint_mssql/random.tf +++ b/410_private_endpoint_mssql/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/430_service_endpoint_storage_account/random.tf b/430_service_endpoint_storage_account/random.tf index 17045d2..732d4c4 100644 --- a/430_service_endpoint_storage_account/random.tf +++ b/430_service_endpoint_storage_account/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/431_service_endpoint_app_service/random.tf b/431_service_endpoint_app_service/random.tf index 17045d2..732d4c4 100644 --- a/431_service_endpoint_app_service/random.tf +++ b/431_service_endpoint_app_service/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/520_application_gateway_vmss_tls_cert_keyvault/random.tf b/520_application_gateway_vmss_tls_cert_keyvault/random.tf index 17045d2..732d4c4 100644 --- a/520_application_gateway_vmss_tls_cert_keyvault/random.tf +++ b/520_application_gateway_vmss_tls_cert_keyvault/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/700_api_management_public/random.tf b/700_api_management_public/random.tf index 17045d2..732d4c4 100644 --- a/700_api_management_public/random.tf +++ b/700_api_management_public/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/705_api_management_external/public_ip-apim.tf b/705_api_management_external/public_ip-apim.tf index c5aecbd..2f558c2 100644 --- a/705_api_management_external/public_ip-apim.tf +++ b/705_api_management_external/public_ip-apim.tf @@ -6,4 +6,4 @@ resource "azurerm_public_ip" "pip-apim" { sku = "Standard" zones = ["1"] # ["1", "2", "3"] domain_name_label = "apim-external-${random_string.random.result}-${var.prefix}" -} +} \ No newline at end of file diff --git a/705_api_management_external/random.tf b/705_api_management_external/random.tf index 17045d2..732d4c4 100644 --- a/705_api_management_external/random.tf +++ b/705_api_management_external/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/705_api_management_external/terraform.tfstate b/705_api_management_external/terraform.tfstate new file mode 100644 index 0000000..be47a6b --- /dev/null +++ b/705_api_management_external/terraform.tfstate @@ -0,0 +1,43 @@ +{ + "version": 4, + "terraform_version": "1.6.6", + "serial": 5, + "lineage": "eaf51ed0-3ab6-e06b-4286-971c6c6babd5", + "outputs": { + "random": { + "value": "wp6q9", + "type": "string" + } + }, + "resources": [ + { + "mode": "managed", + "type": "random_string", + "name": "random", + "provider": "provider[\"registry.terraform.io/hashicorp/random\"]", + "instances": [ + { + "schema_version": 2, + "attributes": { + "id": "wp6q9", + "keepers": null, + "length": 5, + "lower": true, + "min_lower": 0, + "min_numeric": 0, + "min_special": 0, + "min_upper": 0, + "number": true, + "numeric": true, + "override_special": null, + "result": "wp6q9", + "special": false, + "upper": false + }, + "sensitive_attributes": [] + } + ] + } + ], + "check_results": null +} diff --git a/710_api_management_internal/random.tf b/710_api_management_internal/random.tf index 17045d2..732d4c4 100644 --- a/710_api_management_internal/random.tf +++ b/710_api_management_internal/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/715_api_management_internal_app_gateway/random.tf b/715_api_management_internal_app_gateway/random.tf index 17045d2..732d4c4 100644 --- a/715_api_management_internal_app_gateway/random.tf +++ b/715_api_management_internal_app_gateway/random.tf @@ -2,4 +2,5 @@ resource "random_string" "random" { length = 5 special = false lower = true + upper = false } \ No newline at end of file diff --git a/scripts/terraform-cleaning.ps1 b/scripts/terraform-cleaning.ps1 index 1dec8b7..d46c5dd 100644 --- a/scripts/terraform-cleaning.ps1 +++ b/scripts/terraform-cleaning.ps1 @@ -6,13 +6,16 @@ foreach ($folder in $(Get-ChildItem -Directory)) { if (Test-Path '*.tf') { - rm -Path ".terraform" -Recurse -Force + if (Test-Path '.terraform') { + + rm -Path ".terraform" -Recurse -Force + } - terraform init -upgrade + terraform init -upgrade - terraform fmt + terraform fmt - terraform validate + terraform validate } cd ..