From 1ff77143ef46ec276ce02dab08fd3dbeba0300d0 Mon Sep 17 00:00:00 2001
From: hezijie <lonegunmanb@hotmail.com>
Date: Sat, 14 Sep 2024 13:17:14 +0800
Subject: [PATCH] bump azurerm to v3 so we can use oidc

---
 quickstart/201-vmss-packer-jumpbox/main.tf      | 14 ++++++--------
 quickstart/201-vmss-packer-jumpbox/variables.tf |  2 +-
 test/e2e/quickstart_test.go                     |  4 ----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/quickstart/201-vmss-packer-jumpbox/main.tf b/quickstart/201-vmss-packer-jumpbox/main.tf
index 8525398a..6357bbb7 100644
--- a/quickstart/201-vmss-packer-jumpbox/main.tf
+++ b/quickstart/201-vmss-packer-jumpbox/main.tf
@@ -5,10 +5,10 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>2.0"
+      version = "~>3.0"
     }
     azapi = {
-      source = "Azure/azapi"
+      source  = "Azure/azapi"
       version = "~> 1.0"
     }
     local = {
@@ -88,20 +88,18 @@ resource "azurerm_lb_backend_address_pool" "bpepool" {
 }
 
 resource "azurerm_lb_probe" "vmss" {
-  resource_group_name = azurerm_resource_group.vmss.name
-  loadbalancer_id     = azurerm_lb.vmss.id
-  name                = "ssh-running-probe"
-  port                = var.application_port
+  loadbalancer_id = azurerm_lb.vmss.id
+  name            = "ssh-running-probe"
+  port            = var.application_port
 }
 
 resource "azurerm_lb_rule" "lbnatrule" {
-  resource_group_name            = azurerm_resource_group.vmss.name
   loadbalancer_id                = azurerm_lb.vmss.id
   name                           = "http"
   protocol                       = "Tcp"
   frontend_port                  = var.application_port
   backend_port                   = var.application_port
-  backend_address_pool_id        = azurerm_lb_backend_address_pool.bpepool.id
+  backend_address_pool_ids       = [azurerm_lb_backend_address_pool.bpepool.id]
   frontend_ip_configuration_name = "PublicIPAddress"
   probe_id                       = azurerm_lb_probe.vmss.id
 }
diff --git a/quickstart/201-vmss-packer-jumpbox/variables.tf b/quickstart/201-vmss-packer-jumpbox/variables.tf
index 92aeca5e..ed6a8bc3 100644
--- a/quickstart/201-vmss-packer-jumpbox/variables.tf
+++ b/quickstart/201-vmss-packer-jumpbox/variables.tf
@@ -21,7 +21,7 @@ variable "location" {
 variable "tags" {
   description = "Map of the tags to use for the resources that are deployed"
   type        = map(string)
-  default     = {
+  default = {
     environment = "codelab"
   }
 }
diff --git a/test/e2e/quickstart_test.go b/test/e2e/quickstart_test.go
index 28a240da..06b2550f 100644
--- a/test/e2e/quickstart_test.go
+++ b/test/e2e/quickstart_test.go
@@ -27,10 +27,6 @@ var speicalTests = map[string]func(*testing.T){
 
 func Test_Quickstarts(t *testing.T) {
 	t.Parallel()
-	msiId := os.Getenv("MSI_ID")
-	if msiId != "" {
-		_ = os.Setenv("TF_VAR_msi_id", msiId)
-	}
 	input := os.Getenv("CHANGED_FOLDERS")
 	folders := strings.Split(input, ",")
 	if input == "" {