From af3343e56f843d91e4fadbf3b02b0a6e07820803 Mon Sep 17 00:00:00 2001
From: zjhe <lonegunmanb@hotmail.com>
Date: Sat, 5 Oct 2024 09:33:39 +0800
Subject: [PATCH] bump azurerm to v3

---
 quickstart/201-vmss-jumpbox/main.tf      | 17 +++++++++++++----
 quickstart/201-vmss-jumpbox/output.tf    |  6 +++---
 quickstart/201-vmss-jumpbox/variables.tf |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/quickstart/201-vmss-jumpbox/main.tf b/quickstart/201-vmss-jumpbox/main.tf
index d4196ab7..204c2da7 100644
--- a/quickstart/201-vmss-jumpbox/main.tf
+++ b/quickstart/201-vmss-jumpbox/main.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~>2.0"
+      version = "~>3.0"
     }
   }
 }
@@ -17,6 +17,15 @@ provider "azurerm" {
   }
 }
 
+resource "random_password" "password" {
+  count  = var.admin_password == null ? 1 : 0
+  length = 20
+}
+
+locals {
+  admin_password = try(random_password.password[0].result, var.admin_password)
+}
+
 resource "azurerm_resource_group" "vmss" {
   name     = var.resource_group_name
   location = var.location
@@ -27,7 +36,7 @@ resource "random_string" "fqdn" {
   length  = 6
   special = false
   upper   = false
-  number  = false
+  numeric = false
 }
 
 resource "azurerm_virtual_network" "vmss" {
@@ -127,7 +136,7 @@ resource "azurerm_virtual_machine_scale_set" "vmss" {
   os_profile {
     computer_name_prefix = "vmlab"
     admin_username       = var.admin_user
-    admin_password       = var.admin_password
+    admin_password       = local.admin_password
     custom_data          = file("web.conf")
   }
 
@@ -198,7 +207,7 @@ resource "azurerm_virtual_machine" "jumpbox" {
   os_profile {
     computer_name  = "jumpbox"
     admin_username = var.admin_user
-    admin_password = var.admin_password
+    admin_password = local.admin_password
   }
 
   os_profile_linux_config {
diff --git a/quickstart/201-vmss-jumpbox/output.tf b/quickstart/201-vmss-jumpbox/output.tf
index deb5d5fc..e5cbbf27 100644
--- a/quickstart/201-vmss-jumpbox/output.tf
+++ b/quickstart/201-vmss-jumpbox/output.tf
@@ -1,11 +1,11 @@
 output "vmss_public_ip_fqdn" {
-   value = azurerm_public_ip.vmss.fqdn
+  value = azurerm_public_ip.vmss.fqdn
 }
 
 output "jumpbox_public_ip_fqdn" {
-   value = azurerm_public_ip.jumpbox.fqdn
+  value = azurerm_public_ip.jumpbox.fqdn
 }
 
 output "jumpbox_public_ip" {
-   value = azurerm_public_ip.jumpbox.ip_address
+  value = azurerm_public_ip.jumpbox.ip_address
 }
diff --git a/quickstart/201-vmss-jumpbox/variables.tf b/quickstart/201-vmss-jumpbox/variables.tf
index 54b08854..d9093b6f 100644
--- a/quickstart/201-vmss-jumpbox/variables.tf
+++ b/quickstart/201-vmss-jumpbox/variables.tf
@@ -28,6 +28,6 @@ variable "admin_user" {
 
 variable "admin_password" {
   description = "Default password for admin account"
-  default     = "ChangeMe123!"
+  default     = null
   sensitive   = true
 }