From 0b3252df721133851939e0e92e4c6152e4b10ef0 Mon Sep 17 00:00:00 2001
From: Tom Archer <tarcher@microsoft.com>
Date: Sun, 5 Mar 2023 18:11:41 -0800
Subject: [PATCH] Edits per Tech Review

---
 quickstart/101-analysis-services-create/main.tf      |  9 ++++++++-
 quickstart/101-analysis-services-create/outputs.tf   |  6 ++++++
 quickstart/101-analysis-services-create/variables.tf | 12 +++++++++---
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/quickstart/101-analysis-services-create/main.tf b/quickstart/101-analysis-services-create/main.tf
index d401a6a3..04e2cf8d 100644
--- a/quickstart/101-analysis-services-create/main.tf
+++ b/quickstart/101-analysis-services-create/main.tf
@@ -7,8 +7,15 @@ resource "azurerm_resource_group" "rg" {
   location = var.resource_group_location
 }
 
+resource "random_string" "azurerm_analysis_services_server_name" {
+  length  = 25
+  upper   = false 
+  numeric = false
+  special = false
+}
+
 resource "azurerm_analysis_services_server" "server" {
-  name                = var.server_name
+  name                = random_string.azurerm_analysis_services_server_name.result
   resource_group_name = azurerm_resource_group.rg.name
   location            = azurerm_resource_group.rg.location
   sku                 = var.sku
diff --git a/quickstart/101-analysis-services-create/outputs.tf b/quickstart/101-analysis-services-create/outputs.tf
index 8b137891..7aa1895d 100644
--- a/quickstart/101-analysis-services-create/outputs.tf
+++ b/quickstart/101-analysis-services-create/outputs.tf
@@ -1 +1,7 @@
+output "resource_group_name" {
+  value = azurerm_resource_group.rg.name
+}
 
+output "azurerm_analysis_services_server_name" {
+  value = azurerm_analysis_services_server.server.name
+}
diff --git a/quickstart/101-analysis-services-create/variables.tf b/quickstart/101-analysis-services-create/variables.tf
index a52136a7..e26140da 100644
--- a/quickstart/101-analysis-services-create/variables.tf
+++ b/quickstart/101-analysis-services-create/variables.tf
@@ -1,24 +1,30 @@
 variable "resource_group_location" {
+  type        = string
   default     = "eastus"
   description = "Location for all resources."
 }
 
 variable "resource_group_name_prefix" {
+  type        = string
   default     = "rg"
   description = "Prefix of the resource group name that's combined with a random ID so name is unique in your Azure subscription."
 }
 
-variable "server_name" {
-  description = "The name of the Azure Analysis Services server to create. Server name must begin with a letter, be lowercase alphanumeric, and between 3 and 63 characters in length. Server name must be unique per region."
-  default     = "myserver"
+variable "azurerm_analysis_services_server_name_prefix" {
+  type        = string
+  default     = "mys"
+  description = "Prefix of the Azure Analysis Services Server name that's combined with a random string to create a unique server name in your Azure subscription."
 }
 
 variable "sku" {
+  type        = string
   description = "The sku name of the Azure Analysis Services server to create. Choose from: B1, B2, D1, S0, S1, S2, S3, S4, S8, S9. Some skus are region specific. See https://docs.microsoft.com/en-us/azure/analysis-services/analysis-services-overview#availability-by-region"
   default     = "S0"
 }
 
 variable "backup_blob_container_uri" {
+  type        = string
   description = "The SAS URI to a private Azure Blob Storage container with read, write and list permissions. Required only if you intend to use the backup/restore functionality. See https://docs.microsoft.com/en-us/azure/analysis-services/analysis-services-backup"
   default     = null
 }
+