Merge branch 'main' into main

Azure · Sep 4, 2024 · 7d9d97e · 7d9d97e
2 parents 3bcb3e8 + 4ad4c79
commit 7d9d97e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 144 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,2 +1,6 @@
 ---
 blank_issues_enabled: false
+contact_links:
+  - name: Azure Landing Zones Accelerator Issues
+    url: https://github.com/Azure/ALZ-PowerShell-Module/issues/new/choose
+    about: Please raise all issues for the Accelerators over at the Azure/ALZ-PowerShell-Module repository.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/templates/complete/locals.tf b/templates/complete/locals.tf
@@ -6,7 +6,7 @@ locals {
   const_yml             = "yml"
 }
 locals {
-  config = (local.config_file_extension == local.const_yaml ?
+  config = (local.config_file_extension == local.const_yaml || local.config_file_extension == local.const_yml ?
     yamldecode(templatefile("${path.module}/${local.config_file_name}", local.config_template_file_variables)) :
     jsondecode(templatefile("${path.module}/${local.config_file_name}", local.config_template_file_variables))
   )

diff --git a/templates/complete_vnext/locals.tf b/templates/complete_vnext/locals.tf
@@ -6,7 +6,7 @@ locals {
   const_yml             = "yml"
 }
 locals {
-  config = (local.config_file_extension == local.const_yaml ?
+  config = (local.config_file_extension == local.const_yaml || local.config_file_extension == local.const_yml ?
     yamldecode(templatefile("${path.module}/${local.config_file_name}", local.config_template_file_variables)) :
     jsondecode(templatefile("${path.module}/${local.config_file_name}", local.config_template_file_variables))
   )