[ServiceBus]: Adding MinTLS and SupportsScaling (#19025)

* Adding minTLS and SupportsScaling

* Pushing Test Recording

* ChangeLog updated

* XML fixes

* Help file fixes

* Addressing comments

* Addressing comments

* Addressing comments

Author: damodaravadhani

src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.cs

@@ -30,5 +30,12 @@ public void ClusterTestCURD()
         {
             TestRunner.RunTestScript("ClusterTest");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void SelfServeClusterTestCURD()
+        {
+            TestRunner.RunTestScript("SelfServeCluster");
+        }
     }
 }

src/EventHub/EventHub.Test/ScenarioTests/ClusterTest.ps1

@@ -17,6 +17,17 @@
 Tests Eventhub Cluster operations.
 #>
 
+function assertClusterProperties {
+	
+	param([Microsoft.Azure.Commands.EventHub.Models.PSEventHubClusterAttributes]$expectedCluster,[Microsoft.Azure.Commands.EventHub.Models.PSEventHubClusterAttributes]$cluster)
+
+	Assert-AreEqual $expectedCluster.Name $cluster.Name
+	Assert-AreEqual $expectedCluster.Tags.Count $cluster.Tags.Count
+	Assert-AreEqual $expectedCluster.Location $cluster.Location
+	Assert-AreEqual $expectedCluster.Capacity $cluster.Capacity
+	Assert-AreEqual $expectedCluster.Sku.Capacity $cluster.Sku.Capacity
+}
+
 function ClusterTest
 {
     # Setup
@@ -26,21 +37,64 @@ function ClusterTest
 
 	Write-Debug "  Create resource group"
     Write-Debug " Resource Group Name : $resourceGroupName"
-    $ResultResourceGroup = New-AzResourceGroup -Name $resourceGroupName -Location $location -Force   
+    New-AzResourceGroup -Name $resourceGroupName -Location $location -Force   
 
     Write-Debug " Create a Cluster in South Central US"
     Write-Debug "Cluster Name : $clusterName" 
-    $result = New-AzEventHubCluster -ResourceGroup $resourceGroupName -Name $clusterName -Location $location  -Capacity "1"
-	Assert-AreEqual $result.Name $clusterName "Created Cluster Name matches"
-	
-	# Get Cluster
+    $expectedCluster = New-AzEventHubCluster -ResourceGroupName $resourceGroupName -Name $clusterName -Location $location
+	Assert-AreEqual $expectedCluster.Name $clusterName
+	Assert-AreEqual $expectedCluster.Location $location
+	Assert-AreEqual $expectedCluster.Capacity 1
+	Assert-AreEqual 0 $expectedCluster.Tags.Count
+
     Write-Debug "Get the created cluster within the resource group"	
-	$getResponse = Get-AzEventHubCluster -ResourceGroup $resourceGroupName -Name $clusterName
-	    
-	Assert-AreEqual $getResponse.Name $clusterName "Cluster get : Cluster name matches"
-	Assert-AreEqual $getResponse.Sku.Capacity "1" "Cluster get : Capacity matches"
+	$cluster = Get-AzEventHubCluster -ResourceGroupName $resourceGroupName -Name $clusterName
+	assertClusterProperties $expectedCluster $cluster
 
 	#Update Cluster
-	$resultUpdate = Set-AzEventHubCluster -ResourceGroup $resourceGroupName -Name $clusterName -Location $location -Tag @{"ClusterTag1" = "Tag3"; "ClusterTag2" = "Tag4";}
-	Assert-AreEqual $resultUpdate.Name $clusterName "Updated Cluster Name matches"    
+	$cluster = Set-AzEventHubCluster -ResourceGroupName $resourceGroupName -Name $clusterName -Location $location -Tag @{"ClusterTag1" = "Tag3"; "ClusterTag2" = "Tag4";}
+	$expectedCluster.Tags = $cluster.Tags
+	assertClusterProperties $expectedCluster $cluster
+}
+
+function SelfServeCluster{
+	# Setup
+    $location = "southcentralus"
+	$locationForAssert = "South Central US"
+	$clusterName = getAssetName "Eventhub-Cluster-"
+    $resourceGroupName = getAssetName "RSG-Cluster"
+	$namespaceName = getAssetName "ClusterNamespace-"
+	
+    New-AzResourceGroup -Name $resourceGroupName -Location $location -Force   
+
+    $expectedCluster = New-AzEventHubCluster -ResourceGroup $resourceGroupName -Name $clusterName -Location $location -Capacity 2 -SupportsScaling
+	Assert-AreEqual $expectedCluster.Name $clusterName
+	Assert-True { $expectedCluster.SupportsScaling }
+	Assert-AreEqual $expectedCluster.Capacity 2
+	Assert-AreEqual $location $expectedCluster.Location
+
+	$cluster = Get-AzEventHubCluster -ResourceGroup $resourceGroupName -Name $clusterName
+	assertClusterProperties $expectedCluster $cluster
+
+	$cluster.Capacity = 3
+	$cluster = Set-AzEventHubCluster -InputObject $cluster
+	Assert-AreEqual 3 $cluster.Capacity
+	$expectedCluster.Capacity = $cluster.Capacity
+	$expectedCluster.Sku.Capacity = $cluster.Capacity
+	assertClusterProperties $expectedCluster $cluster
+
+	$cluster = Set-AzEventHubCluster -ResourceId $expectedCluster.Id -Tag @{k1='v1'; k2='v2'}
+	$expectedCluster.Tags = $cluster.Tags
+	assertClusterProperties $expectedCluster $cluster
+
+	$cluster = Set-AzEventHubCluster -ResourceGroupName $resourceGroupName -Name $clusterName -Capacity 1
+	$expectedCluster.Capacity = 1
+	$expectedCluster.Sku.Capacity = 1
+	assertClusterProperties $expectedCluster $cluster
+
+
+	$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -ClusterARMId $expectedCluster.Id -SkuName Standard -Location $location
+	Assert-NotNull $namespace.ClusterArmId
+
+
 }

src/EventHub/EventHub.Test/ScenarioTests/NamespaceTests.ps1

@@ -188,119 +188,143 @@ function NamespaceAuthTests
 Tests New Parameter for EventHub Namespace Create List Remove operations.
 #>
 
+function assertNamespaceUpdates{
+    param([Microsoft.Azure.Commands.EventHub.Models.PSNamespaceAttributes]$expectedNamespace,[Microsoft.Azure.Commands.EventHub.Models.PSNamespaceAttributes]$namespace)
+
+    Assert-AreEqual $expectedNamespace.Sku.Name $namespace.Sku.Name
+    Assert-AreEqual $expectedNamespace.Sku.Tier $namespace.Sku.Tier
+    Assert-AreEqual $expectedNamespace.Sku.Capacity $namespace.Sku.Capacity
+    Assert-AreEqual $expectedNamespace.Name $namespace.Name
+    Assert-AreEqual $expectedNamespace.MaximumThroughputUnits $namespace.MaximumThroughputUnits
+    Assert-AreEqual $expectedNamespace.MinimumTlsVersion $namespace.MinimumTlsVersion
+    Assert-AreEqual $expectedNamespace.Location $namespace.Location
+    Assert-AreEqual $expectedNamespace.IsAutoInflateEnabled $namespace.IsAutoInflateEnabled
+    Assert-AreEqual $expectedNamespace.KafkaEnabled $namespace.KafkaEnabled
+    Assert-AreEqual $expectedNamespace.ZoneRedundant $namespace.ZoneRedundant
+    Assert-AreEqual $expectedNamespace.DisableLocalAuth $namespace.DisableLocalAuth
+    Assert-AreEqual $expectedNamespace.Tags.Count $namespace.Tags.Count
+}
+
+function assertStandardNamespace{
+    param([Microsoft.Azure.Commands.EventHub.Models.PSNamespaceAttributes]$namespace)
+
+    Assert-AreEqual 1 $namespace.Sku.Capacity
+    Assert-AreEqual 'Standard' $namespace.Sku.Name
+    Assert-AreEqual 0 $namespace.MaximumThroughputUnits
+    Assert-AreEqual '1.2' $namespace.MinimumTlsVersion
+    Assert-AreEqual 'East US' $namespace.Location
+    Assert-False { $namespace.IsAutoInflateEnabled }
+    Assert-False { $namespace.ZoneRedundant }
+    Assert-False { $namespace.DisableLocalAuth }
+    Assert-True { $namespace.KafkaEnabled }
+}
+
+function assertPremiumNamespace{
+    param([Microsoft.Azure.Commands.EventHub.Models.PSNamespaceAttributes]$namespace)
+
+    Assert-AreEqual 1 $namespace.Sku.Capacity
+    Assert-AreEqual 'Premium' $namespace.Sku.Name
+    Assert-AreEqual 0 $namespace.MaximumThroughputUnits
+    Assert-AreEqual '1.2' $namespace.MinimumTlsVersion
+    Assert-AreEqual 'East US' $namespace.Location
+    Assert-False { $namespace.IsAutoInflateEnabled }
+    Assert-True { $namespace.ZoneRedundant }
+    Assert-False { $namespace.DisableLocalAuth }
+    Assert-True { $namespace.KafkaEnabled }
+}
+
 function NamespaceTests
 {
-    # Setup    
-    $location = "eastus"	
-	$locationKafka = "eastus"
-	$namespaceName = getAssetName "Eventhub-Namespace1-"
-	$namespaceName2 = getAssetName "Eventhub-Namespace2-"
-    $namespaceName3 = getAssetName "Eventhub-Namespace3-"
-    $namespace4 = getAssetName "Eventhub-Namespace4-"
-    $resourceGroupName = getAssetName "RGName1-"
-	$secondResourceGroup = getAssetName "RGName2-"
-	$namespaceNameKafka = getAssetName "Eh-NamespaceKafka-"
+    try{
+        
+        # Setup    
+        $location = "eastus"
+	    $namespaceName = getAssetName "Eventhub-Namespace1-"
+	    $namespaceName2 = getAssetName "Eventhub-Namespace2-"
+        $namespaceName3 = getAssetName "Eventhub-Namespace3-"
+        $resourceGroupName = getAssetName "RGName1-"
 
 
-    Write-Debug "Create resource group"
-    Write-Debug "ResourceGroup name : $resourceGroupName"
-	New-AzResourceGroup -Name $resourceGroupName -Location $location -Force 
+        Write-Debug "Create resource group"
+        Write-Debug "ResourceGroup name : $resourceGroupName"
+	    New-AzResourceGroup -Name $resourceGroupName -Location $location -Force 
 
-    Write-Debug "Create resource group"
-    Write-Debug "ResourceGroup name : $secondResourceGroup"
-	New-AzResourceGroup -Name $secondResourceGroup -Location $location -Force 
+	    # Check Namespace Name Availability
 
-	# Check Namespace Name Availability
+	    $checkNameResult = Test-AzEventHubName -Namespace $namespaceName 
+	    Assert-True {$checkNameResult.NameAvailable}
 
-	$checkNameResult = Test-AzEventHubName -Namespace $namespaceName 
-	Assert-True {$checkNameResult.NameAvailable}
+        $namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -SkuCapacity 10 -MaximumThroughputUnits 18 -SkuName Standard -Location $location -ZoneRedundant -Tag @{k1='v1'; k2='v2'} -EnableAutoInflate -DisableLocalAuth -EnableKafka -MinimumTlsVersion 1.1
+    
+        Assert-AreEqual 10 $namespace.Sku.Capacity
+        Assert-AreEqual 'Standard' $namespace.Sku.Name
+        Assert-AreEqual 18 $namespace.MaximumThroughputUnits
+        Assert-AreEqual '1.1' $namespace.MinimumTlsVersion
+        Assert-AreEqual 'East US' $namespace.Location
+        Assert-True { $namespace.IsAutoInflateEnabled }
+        Assert-True { $namespace.ZoneRedundant }
+        Assert-True { $namespace.DisableLocalAuth }
+        Assert-True { $namespace.KafkaEnabled }
 
-    $result1 = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespace4 -Location northeurope -SkuName Standard
-    Assert-AreEqual $result1.Name $namespace4
-    Assert-AreEqual $result1.Location "North Europe"
+        $expectedNamespace = $namespace
 
-    $result1 = Set-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespace4 -EnableAutoInflate -MaximumThroughputUnits 12
-    Assert-AreEqual $result1.Name $namespace4
-    Assert-AreEqual $result1.Location "North Europe"
-    Assert-True {$result1.IsAutoInflateEnabled}
-    Assert-True {$result1.KafkaEnabled}
-    Assert-AreEqual $result1.MaximumThroughputUnits 12
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -EnableAutoInflate:$false -MaximumThroughputUnits 0
+        $expectedNamespace.IsAutoInflateEnabled = $false
+        $expectedNamespace.MaximumThroughputUnits = 0
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-    $result1 = Set-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespace4 -EnableKafka
-    Assert-AreEqual $result1.Name $namespace4
-    Assert-AreEqual $result1.Location "North Europe"
-    Assert-True {$result1.IsAutoInflateEnabled}
-    Assert-True {$result1.KafkaEnabled}
-    Assert-AreEqual $result1.MaximumThroughputUnits 12
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -EnableAutoInflate:$true -MaximumThroughputUnits 18
+        $expectedNamespace.IsAutoInflateEnabled = $true
+        $expectedNamespace.MaximumThroughputUnits = 18
+        assertNamespaceUpdates $expectedNamespace $namespace
 
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -SkuCapacity 12
+        $expectedNamespace.Sku.Capacity = 12
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-	Write-Debug " Create new Eventhub Kafka namespace"
-    Write-Debug "Kafka Namespace name : $namespaceNameKafka"	
-    $resultkafka = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceNameKafka -Location $locationKafka -EnableKafka -DisableLocalAuth
-	Assert-AreEqual $resultkafka.Name $namespaceNameKafka "Namespace created earlier is not found."
-	Assert-True {$resultkafka.KafkaEnabled}    
-    Assert-True {$resultkafka.DisableLocalAuth}
-    
-    Write-Debug " Create new eventHub namespace"
-    Write-Debug "NamespaceName : $namespaceName" 
-    $result = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName -Location $location -SkuName "Standard" -SkuCapacity "1" -EnableAutoInflate -MaximumThroughputUnits 10
-	Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
-	Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -MaximumThroughputUnits 25
+        $expectedNamespace.MaximumThroughputUnits = 25
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-    Write-Debug " Create new eventHub premium namespace"
-    Write-Debug "NamespaceName : $namespaceName3" 
-    $result = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3 -Location $location -SkuName "Premium" -DisableLocalAuth
-	Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
-	Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"    
-    Assert-True { $result.DisableLocalAuth }
-    Assert-AreEqual $result.Sku.Name "Premium" "Namespace Premium"
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -MinimumTlsVersion 1.0
+        $expectedNamespace.MinimumTlsVersion = '1.0'
+        assertNamespaceUpdates $expectedNamespace $namespace
 
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -MinimumTlsVersion 1.2
+        $expectedNamespace.MinimumTlsVersion = '1.2'
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-    $result = Set-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3 -IdentityType "SystemAssigned" -Location $location
-	Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
-	Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"    
-    Assert-True { $result.DisableLocalAuth }
-    Assert-True { $result.Identity }
-    Assert-AreEqual $result.Sku.Name "Premium" "Namespace Premium"
-	
-	# Assert 
-	Assert-AreEqual $result.ProvisioningState "Succeeded"
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -DisableLocalAuth:$false
+        $expectedNamespace.DisableLocalAuth = $false
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-    Write-Debug "Get the created namespace within the resource group"
-    $createdNamespace = Get-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
-	Assert-AreEqual $createdNamespace.ResourceGroup $resourceGroupName "Namespace get : ResourceGroup name matches"
-	Assert-AreEqual $createdNamespace.ResourceGroupName $resourceGroupName "Namespace get: ResourceGroupName name matches"
+        $namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName -DisableLocalAuth
+        $expectedNamespace.DisableLocalAuth = $true
+        assertNamespaceUpdates $expectedNamespace $namespace
 
-    Assert-AreEqual $createdNamespace.Name $namespaceName "Namespace created earlier is not found."	  
-    
-    Write-Debug "Namespace name : $namespaceName2"
-    $result = New-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2 -Location $location
-
-    ### change the Namespace SKU to Basic
-    Write-Debug "Namespace name : $namespaceName2"
-    $result = Set-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2 -Location $location -SkuName "Basic"
-    Assert-AreEqual $result.Sku.Name "Basic" "Namespace SKU not changed."
-       
-    Write-Debug "Get all the namespaces created in the resourceGroup"
-    $allCreatedNamespace = Get-AzEventHubNamespace -ResourceGroup $secondResourceGroup
-    
-    #Assert
-    Assert-True {$allCreatedNamespace.Count -ge 0 } "Namespace created earlier is not found. in list"
-    
-    Write-Debug "Get all the namespaces created in the subscription"
-    $allCreatedNamespace = Get-AzEventHubNamespace
-    
-    Assert-True {$allCreatedNamespace.Count -ge 0} "Namespaces created earlier is not found."
+        $namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName2 -SkuName Standard -Location $location
+        assertStandardNamespace $namespace
 
-    $listByResourceGroup = Get-AzEventHubNamespace -ResourceGroup $resourceGroupName
-    Assert-AreEqual 4 $listByResourceGroup.Count
+        $namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName3 -SkuName Premium -Location $location
+        assertPremiumNamespace $namespace
 
-    Write-Debug " Delete namespaces"
-    Remove-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2
-    Remove-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
+        $listOfNamespaces = Get-AzEventHubNamespace -ResourceGroupName $resourceGroupName
+        Assert-AreEqual 3 $listOfNamespaces.Count
 
-    Write-Debug " Delete resourcegroup"
-    Remove-AzResourceGroup -Name $resourceGroupName -Force
+        $listOfNamespaces = Get-AzEventHubNamespace
+        Assert-True { $listOfNamespaces.Count -gt 0 }
+
+    }
+    finally{
+        
+        Write-Debug " Delete namespaces"
+        Remove-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3
+        Remove-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName2
+        Remove-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName
+
+        Write-Debug " Delete resourcegroup"
+        Remove-AzResourceGroup -Name $resourceGroupName -Force
+    }
 }
 
 
@@ -442,6 +466,7 @@ function MSITest{
     }
     finally{
         Remove-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1
+        Remove-AzResourceGroup -Name $resourceGroupName -Force
     }
 }
 
@@ -510,6 +535,7 @@ function EncryptionTest{
 
     finally{
         Remove-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1
+        Remove-AzResourceGroup -Name $resourceGroupName -Force
     }
 }