From 432aa9aacc1c829e9fcfbd63e10ea8f8b8419708 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Mon, 2 Sep 2024 16:15:31 +0100 Subject: [PATCH 1/4] Update config.yml --- .github/ISSUE_TEMPLATE/config.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index bd9dfe4e..b0b8a2a4 100644 --- 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. From bbda427c5689adc3d100ab8d8a9b807ba75c0b29 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Mon, 2 Sep 2024 16:16:34 +0100 Subject: [PATCH 2/4] Delete .github/ISSUE_TEMPLATE/bug_report.yml --- .github/ISSUE_TEMPLATE/bug_report.yml | 111 -------------------------- 1 file changed, 111 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 8bf9d4bd..00000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,111 +0,0 @@ -name: "Bug report \U0001F41B" -description: Report errors or unexpected behaviour -title: "bug:" -labels: [bug] -body: - - type: markdown - attributes: - value: | - Thank you for taking the time to fill out a bug report. - - If you are not running the latest version of this module, please try to reproduce your bug with the latest version before opening an issue. - - type: checkboxes - attributes: - label: Is there an existing issue for this? - description: Please search to see if an issue already exists for the bug you encountered. - options: - - label: I have searched the existing issues - required: true - - type: dropdown - attributes: - label: Bootstrap or Starter Module Deployment? (Required) - description: Do you have a problem with deploying the Bootstrap Resources or the Starter Module through CI/CD? - multiple: false - options: - - bootstrap - - starter_module - validations: - required: true - - type: input - id: ps_module - attributes: - label: ALZ-PowerShell-Module Version (Required) - description: Which ALZ-PowerShell-Module version are you using? - placeholder: Example value, 1.1.6 - validations: - required: true - - type: input - id: alz_tf_acc - attributes: - label: alz-terraform-accelerator Version (Required) - description: Which alz-terraform-accelerator version are you using? - placeholder: Example value, 1.1.0 - validations: - required: true - - type: input - id: starter_module - attributes: - label: Starter Module (Required) - description: Which Starter Module are you using? - placeholder: Example value, complete - validations: - required: true - - type: textarea - id: inputs - attributes: - label: Input arguments of the ALZ-PowerShell-Module (Required) - description: | - Please provide the input arguments of the ALZ-PowerShell-Module that can reproduce the issue. If not stated explicitly please find these details in the `cache-bootstrap-.json` and `cache-starter-.json` files in the copy of the alz-terraform-accelerator that the ALZ-PowerShell-Module downloaded on execution. - render: YAML - validations: - required: true - - type: textarea - id: config - attributes: - label: Contents of the configuration file used for the `complete` starter module. (Optional) - description: | - Please provide contents of the configuration file used for the `complete` starter module. - render: YAML - - type: textarea - id: debug - attributes: - label: Debug Output/Panic Output (Optional) - description: | - For long debug logs please provide a link to a GitHub Gist containing the complete debug output. Please do NOT paste the debug output in the issue; just paste a link to the Gist. - - To obtain the debug output, see the [Terraform documentation on debugging](https://www.terraform.io/docs/internals/debugging.html). - render: shell - - type: textarea - id: expected - attributes: - label: Expected Behaviour (Required) - description: What should have happened? - validations: - required: true - - type: textarea - id: actual - attributes: - label: Actual Behaviour (Required) - description: What actually happened? - validations: - required: true - - type: textarea - id: reproduce - attributes: - label: Steps to Reproduce (Optional) - description: | - Please list the steps required to reproduce the issue, e.g. - - type: input - id: facts - attributes: - label: Important Factoids (Optional) - description: | - Are there anything atypical about your accounts that we should know? For example: Running in a Azure China/Germany/Government? - - type: textarea - id: references - attributes: - label: References (Optional) - description: | - Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests - - Are there any other GitHub issues (open or closed) or pull requests that should be linked here? Such as vendor documentation? From ac7f5555a4c5a7582567ccf323c617326a515014 Mon Sep 17 00:00:00 2001 From: Jared Holgate Date: Mon, 2 Sep 2024 16:16:48 +0100 Subject: [PATCH 3/4] Delete .github/ISSUE_TEMPLATE/feature_request.md --- .github/ISSUE_TEMPLATE/feature_request.md | 31 ----------------------- 1 file changed, 31 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index f361483c..00000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: "Feature request \U0001F680" -about: Suggest an idea for this project -title: 'Feature Request' -labels: 'needs triage :warning:' -assignees: '' ---- - -### Community Note - - - -- Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request -- Please do not leave "+1" or "me too" comments, they generate extra noise for issue followers and do not help prioritize the request -- If you are interested in working on this issue or have submitted a pull request, please leave a comment - - - -### Description - -**Is your feature request related to a problem?** - - - -**Describe the solution you'd like** - - - - - -**Additional context** From 4ad4c795abbb45e27b72c7b97f48487890ab1516 Mon Sep 17 00:00:00 2001 From: Sven Aelterman <17446043+SvenAelterman@users.noreply.github.com> Date: Tue, 3 Sep 2024 07:24:15 -0500 Subject: [PATCH 4/4] Support `.yml` extension for the config file (#162) ## Overview/Summary The intent seems to be that both `.yaml` and `.yml` would be valid configuration file extensions. However, in the current code, a `.yml` file extension would attempted to be parsed as JSON. ## This PR fixes/adds/changes/removes 1. Azure/ALZ-PowerShell-Module#153 ### Breaking Changes N/A ## As part of this Pull Request I have - [x] Checked for duplicate [Pull Requests](https://github.com/Azure/alz-terraform-accelerator/pulls) - [x] Associated it with relevant [issues](https://github.com/Azure/alz-terraform-accelerator/issues), for tracking and closure. - [x] Ensured my code/branch is up-to-date with the latest changes in the `main` [branch](https://github.com/Azure/alz-terraform-accelerator/tree/main) - [x] Performed testing and provided evidence. - [x] Updated relevant and associated documentation. --------- Co-authored-by: Jared Holgate --- templates/complete/locals.tf | 2 +- templates/complete_vnext/locals.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/complete/locals.tf b/templates/complete/locals.tf index 25c00381..5ab68584 100644 --- 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 index dc67fe83..21ed2865 100644 --- 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)) )