From 3c6a978b247cce2f071dfa57db2288fb0882e8ca Mon Sep 17 00:00:00 2001
From: Azad Abbasi <azabbasi@microsoft.com>
Date: Wed, 17 Jun 2020 10:28:29 -0700
Subject: [PATCH] fix(setup): Validate minimum number of characters for
 DigitalTwins name (#12842)

---
 .../tests/prerequisites/prerequisite readme.md         |  4 ++++
 .../tests/prerequisites/setup.ps1                      | 10 +++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/prerequisite readme.md b/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/prerequisite readme.md
index d9967bc9613ad..4729abf44bee1 100644
--- a/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/prerequisite readme.md	
+++ b/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/prerequisite readme.md	
@@ -2,6 +2,10 @@
 
 ## Install
 
+### Install the latest Powershell 7
+
+- Make sure you run the script using the latest stable version of [powershell 7](https://github.com/PowerShell/PowerShell/releases)
+
 ### Install the latest Azure CLI package
 
 - If already installed, check latest version:
diff --git a/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/setup.ps1 b/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/setup.ps1
index a1faa72d7a1d8..da82eb1891f20 100644
--- a/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/setup.ps1
+++ b/sdk/digitaltwins/Azure.DigitalTwins.Core/tests/prerequisites/setup.ps1
@@ -8,14 +8,15 @@ param(
     [Parameter(Mandatory)]
     [string] $SubscriptionId,
 
-    [Parameter()]
+    [Parameter(Mandatory)]
+    [ValidateLength(6, 64)]
     [string] $DigitalTwinName,
 
     [Parameter()]
     [string] $AppRegistrationName
 )
 
-Function Connect-AzureSubscription()
+Function Connect-AzureSubscription
 {
     # Ensure the user is logged in
     try
@@ -52,11 +53,6 @@ Connect-AzureSubscription
 
 $Region = $Region.Replace(' ', '')
 
-if (-not $DigitalTwinName)
-{
-    $DigitalTwinName = $ResourceGroup
-}
-
 if (-not $AppRegistrationName)
 {
     $AppRegistrationName = $ResourceGroup