From d8e9d4b7ae1f5eff5910e24142325c9fc4de5c59 Mon Sep 17 00:00:00 2001
From: Tom Archer <tarcher@microsoft.com>
Date: Thu, 16 Feb 2023 10:55:02 -0800
Subject: [PATCH] Edits per Code Review

---
 quickstart/101-devtest-labs/TestRecord.md |  1 -
 quickstart/101-devtest-labs/main.tf       | 36 ++++++++++++++++-------
 quickstart/101-devtest-labs/outputs.tf    |  5 ++++
 quickstart/101-devtest-labs/variables.tf  |  1 +
 4 files changed, 31 insertions(+), 12 deletions(-)
 delete mode 100644 quickstart/101-devtest-labs/TestRecord.md

diff --git a/quickstart/101-devtest-labs/TestRecord.md b/quickstart/101-devtest-labs/TestRecord.md
deleted file mode 100644
index 5808cbaa..00000000
--- a/quickstart/101-devtest-labs/TestRecord.md
+++ /dev/null
@@ -1 +0,0 @@
-Article not yet tested by automated testing pipeline.
\ No newline at end of file
diff --git a/quickstart/101-devtest-labs/main.tf b/quickstart/101-devtest-labs/main.tf
index f7c80c1b..ee3cf910 100644
--- a/quickstart/101-devtest-labs/main.tf
+++ b/quickstart/101-devtest-labs/main.tf
@@ -7,6 +7,20 @@ resource "azurerm_resource_group" "rg" {
   location = var.resource_group_location
 }
 
+resource "random_password" "password" {
+  count       = var.password == null ? 1 : 0
+  length      = 20
+  special     = true
+  min_numeric = 1
+  min_upper   = 1
+  min_lower   = 1
+  min_special = 1
+}
+
+locals {
+  password = try(random_password.password[0].result, var.password)
+}
+
 resource "azurerm_dev_test_lab" "lab" {
   name                = var.lab_name
   location            = azurerm_resource_group.rg.location
@@ -20,17 +34,17 @@ resource "azurerm_dev_test_virtual_network" "vnet" {
 }
 
 resource "azurerm_dev_test_windows_virtual_machine" "vm" {
-  name                = var.vm_name
-  lab_name            = azurerm_dev_test_lab.lab.name
-  lab_subnet_name     = "Dtl${var.lab_name}Subnet"
-  resource_group_name = azurerm_resource_group.rg.name
-  location            = azurerm_resource_group.rg.location
-  storage_type        = "Standard"
-  size                = var.vm_size
-  username            = var.user_name
-  password            = var.password
-  allow_claim         = false
-  lab_virtual_network_id      = azurerm_dev_test_virtual_network.vnet.id
+  name                   = var.vm_name
+  lab_name               = azurerm_dev_test_lab.lab.name
+  lab_subnet_name        = "Dtl${var.lab_name}Subnet"
+  resource_group_name    = azurerm_resource_group.rg.name
+  location               = azurerm_resource_group.rg.location
+  storage_type           = "Standard"
+  size                   = var.vm_size
+  username               = var.user_name
+  password               = local.password
+  allow_claim            = false
+  lab_virtual_network_id = azurerm_dev_test_virtual_network.vnet.id
 
   gallery_image_reference {
     offer     = "WindowsServer"
diff --git a/quickstart/101-devtest-labs/outputs.tf b/quickstart/101-devtest-labs/outputs.tf
index 917d478f..d99a1f92 100644
--- a/quickstart/101-devtest-labs/outputs.tf
+++ b/quickstart/101-devtest-labs/outputs.tf
@@ -1,3 +1,8 @@
 output "lab_id" {
   value = azurerm_dev_test_lab.lab.id
 }
+
+output "password" {
+  sensitive = true
+  value     = local.password
+}
diff --git a/quickstart/101-devtest-labs/variables.tf b/quickstart/101-devtest-labs/variables.tf
index c90cc87f..e3c2f38a 100644
--- a/quickstart/101-devtest-labs/variables.tf
+++ b/quickstart/101-devtest-labs/variables.tf
@@ -27,4 +27,5 @@ variable "user_name" {
 
 variable "password" {
   description = "The password for the local account that will be created on the new vm."
+  sensitive   = true
 }