From f12ea54334a4c988c5501b4065b2fe35e037ba7c Mon Sep 17 00:00:00 2001
From: Ritika Patil <94649368+riragh@users.noreply.github.com>
Date: Thu, 21 Mar 2024 10:05:59 -0500
Subject: [PATCH] 9.1.0 - March 21, 2024 (#370)

---
 .github/ISSUE_TEMPLATE/config.yml             |  1 +
 .github/ISSUE_TEMPLATE/issue--bug-report.md   | 84 -------------------
 ...-bug-report.yaml => issue--bug-report.yml} | 11 ++-
 .../ISSUE_TEMPLATE/issue--feature-request.yml | 44 ++++++++++
 Dockerfile                                    |  4 +-
 README.md                                     |  4 +-
 container-structure-test.yaml                 |  4 +-
 locals.tf                                     |  2 +-
 main.tf                                       |  2 +-
 versions.tf                                   |  4 +-
 10 files changed, 60 insertions(+), 100 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 delete mode 100644 .github/ISSUE_TEMPLATE/issue--bug-report.md
 rename .github/ISSUE_TEMPLATE/{issue--bug-report.yaml => issue--bug-report.yml} (91%)
 create mode 100644 .github/ISSUE_TEMPLATE/issue--feature-request.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..3ba13e0c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/.github/ISSUE_TEMPLATE/issue--bug-report.md b/.github/ISSUE_TEMPLATE/issue--bug-report.md
deleted file mode 100644
index bca34409..00000000
--- a/.github/ISSUE_TEMPLATE/issue--bug-report.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-name: 'Bug report'
-about: Let us know about an unexpected error or incorrect behavior
-labels: bug, new
-
----
-
-<!--
-Welcome,
-
-Thanks for opening an issue. The more information you provide, the easier it is for us to assess the problem, prioritize, assign, develop, then release a fix.
-
-The SAS Viya 4 IaC team
-
--->
-
-### Terraform Version
-
-<!---
-We ask this to be sure you are currently running a supported terraform version from your work environment. 
-
-Run `./files/tools/iac_tooling_version.sh` to show the version, and paste the result between the ``` marks below.
-
-If you are not running the latest version of Terraform we support, please try upgrading because your issue may have already been fixed.
-
-If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-azure#terraform to help.
--->
-
-```bash
-...
-```
-
-### Terraform Variable File
-
-<!--
-Paste the relevant parts of your Terraform variables between the ``` marks below.
-
-The relevant parts should come from your `terraform.tfvars` file or equivalent and small snippets of the `*.tf` file/files that seem to be causing the error.
-
-For security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
--->
-
-```terraform
-...
-```
-
-### Steps to Reproduce
-
-<!--
-Please list the full steps required to reproduce the issue, for example:
-1. `terraform init`
-2. `terraform apply`
--->
-
-### Expected Behavior
-
-<!--
-What should have happened?
--->
-
-### Actual Behavior
-
-<!--
-What actually happened? Here you can include output and information from your terraform run.
--->
-
-```bash
-...
-```
-
-### Additional Context
-
-<!--
-Are there anything atypical about your situation that we should know? For example: Are you passing any unusual command line options or environment variables to opt-in to non-default behavior?
--->
-
-### References
-
-<!--
-Are there any other GitHub issues (open or closed) or Pull Requests that should be linked here? For example:
-
-- #123
-
--->
diff --git a/.github/ISSUE_TEMPLATE/issue--bug-report.yaml b/.github/ISSUE_TEMPLATE/issue--bug-report.yml
similarity index 91%
rename from .github/ISSUE_TEMPLATE/issue--bug-report.yaml
rename to .github/ISSUE_TEMPLATE/issue--bug-report.yml
index bfcf531a..ee1ce804 100644
--- a/.github/ISSUE_TEMPLATE/issue--bug-report.yaml
+++ b/.github/ISSUE_TEMPLATE/issue--bug-report.yml
@@ -1,4 +1,4 @@
-name: Bug report
+name: Bug Report
 description: |
   Welcome, Thanks for opening an issue. The more information you provide, the easier it is for us to assess the problem, prioritize, assign, develop, then release a fix. The SAS Viya 4 IaC team.
 labels: [bug, new]
@@ -14,7 +14,7 @@ body:
 
         If you are not running the latest version of Terraform we support, please try upgrading because your issue may have already been fixed.
 
-        If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-aws#terraform to help.
+        If you're not sure which versions are supported, here's a link : https://github.com/sassoftware/viya4-iac-azure?tab=readme-ov-file#terraform-requirements to help.
     validations:
       required: false
   - type: textarea
@@ -23,10 +23,10 @@ body:
       label: Terraform Variable File Details
       description: |
         Paste the relevant parts of your Terraform variables here.
-        
+
         The relevant parts should come from your `terraform.tfvars` file or equivalent and small snippets of the `*.tf` file/files that seem to be causing the error.
-        
-        security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
+
+        For security reasons, do not copy and paste any sensitive information in this issue, like account information and passwords etc.
     validations:
       required: false
   - type: textarea
@@ -75,4 +75,3 @@ body:
       options:
         - label: I agree to follow this project's Code of Conduct
           required: true
-          
diff --git a/.github/ISSUE_TEMPLATE/issue--feature-request.yml b/.github/ISSUE_TEMPLATE/issue--feature-request.yml
new file mode 100644
index 00000000..8e0c33ac
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue--feature-request.yml
@@ -0,0 +1,44 @@
+name: Feature Request
+description: |
+  Welcome, Thanks for opening a feature request. The more information you provide, the easier it is for us to assess your request, prioritize, assign, develop, and release. The SAS Viya 4 IaC team.
+labels: [enhancement, new]
+body:
+  - type: textarea
+    id: problem
+    attributes:
+      label: Is your feature request related to a problem? Please describe.
+      description: |
+        A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe the solution you'd like
+      description: |
+        A clear and concise description of what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives you've considered
+      description: |
+        A clear and concise description of any alternative solutions or features you've considered.
+    validations:
+      required: false
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
+  - type: checkboxes
+    id: tf_terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/sassoftware/viya4-iac-azure/blob/main/CODE_OF_CONDUCT.md)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
diff --git a/Dockerfile b/Dockerfile
index a43b688b..bce76da5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
-ARG TERRAFORM_VERSION=1.6.6
-ARG AZURECLI_VERSION=2.56.0
+ARG TERRAFORM_VERSION=1.7.3
+ARG AZURECLI_VERSION=2.57.0
 
 FROM hashicorp/terraform:$TERRAFORM_VERSION as terraform
 FROM mcr.microsoft.com/azure-cli:$AZURECLI_VERSION
diff --git a/README.md b/README.md
index c48ff0a2..85a09e22 100644
--- a/README.md
+++ b/README.md
@@ -57,10 +57,10 @@ This project supports two options for running Terraform scripts:
 Access to an **Azure Subscription** and an [**Identity**](./docs/user/TerraformAzureAuthentication.md) with the *Contributor* role are required.
 
 #### Terraform Requirements:
-- [Terraform](https://www.terraform.io/downloads.html) - v1.6.6
+- [Terraform](https://www.terraform.io/downloads.html) - v1.7.3
 - [kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl) - v1.27.9
 - [jq](https://stedolan.github.io/jq/) - v1.6
-- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.56.0
+- [Azure CLI](https://docs.microsoft.com/en-us/cli/azure) - (optional - useful as an alternative to the Azure Portal) - v2.57.0
 
 #### Docker Requirements:
 - [Docker](https://docs.docker.com/get-docker/)
diff --git a/container-structure-test.yaml b/container-structure-test.yaml
index 1cd2c732..23b02380 100644
--- a/container-structure-test.yaml
+++ b/container-structure-test.yaml
@@ -17,7 +17,7 @@ commandTests:
   - name: "terraform version"
     command: "terraform"
     args: ["--version"]
-    expectedOutput: ["Terraform v1.6.6"]
+    expectedOutput: ["Terraform v1.7.3"]
   - name: "python version"
     command: "python3"
     args: ["--version"]
@@ -29,7 +29,7 @@ commandTests:
       - -c
       - |
         az version -o tsv
-    expectedOutput: ["2.56.0\t2.56.0\t1.1.0"]
+    expectedOutput: ["2.57.0\t2.57.0\t1.1.0"]
 
 metadataTest:
   workdir: "/viya4-iac-azure"
diff --git a/locals.tf b/locals.tf
index 99b57c5b..47e1d436 100644
--- a/locals.tf
+++ b/locals.tf
@@ -53,7 +53,7 @@ locals {
   )
 
   nsg         = var.nsg_name == null ? azurerm_network_security_group.nsg[0] : data.azurerm_network_security_group.nsg[0]
-  nsg_rg_name = var.nsg_name == null ? local.aks_rg.name : local.network_rg.name
+  nsg_rg_name = local.network_rg.name
 
   # Use BYO UAI if given, else create a UAI
   aks_uai_id = (var.aks_identity == "uai"
diff --git a/main.tf b/main.tf
index 3fcc5166..2edc59e7 100644
--- a/main.tf
+++ b/main.tf
@@ -62,7 +62,7 @@ resource "azurerm_network_security_group" "nsg" {
   count               = var.nsg_name == null ? 1 : 0
   name                = "${var.prefix}-nsg"
   location            = var.location
-  resource_group_name = local.aks_rg.name
+  resource_group_name = local.network_rg.name
   tags                = var.tags
 }
 
diff --git a/versions.tf b/versions.tf
index 249f9dbb..cf34f195 100644
--- a/versions.tf
+++ b/versions.tf
@@ -3,12 +3,12 @@
 
 terraform {
 
-  required_version = ">= 1.6.6"
+  required_version = ">= 1.7.3"
 
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "3.86.0"
+      version = "3.92.0"
     }
     azuread = {
       source  = "hashicorp/azuread"