Skip to content

Commit eef947e

Browse files
author
Ajit Navasare
authored
Service Bus : Added -MinimumTlsVersion to New-AzServiceBusNamespace and Set-AzServiceBusNamespace (#19254)
* Added -MinimumTlsVersion to New-AzServiceBusNamespace and Set-AzServiceBusNamespace * fixes for CI failures * test fix for assert check for Sanitized * fix for test failure * updated storage for eventgrid * updated help and cleaned commented code
1 parent 3466028 commit eef947e

File tree

43 files changed

+17695
-18195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+17695
-18195
lines changed

‎src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="7.0.0" />
1515
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="5.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
17-
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="4.0.0" />
17+
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="25.0.0" />
1919
</ItemGroup>
2020

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusMigrationConfigurationTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ function WaitforStatetoBeSucceded {
2121

2222
$createdMigrationConfig = Get-AzServiceBusMigration -ResourceGroup $resourceGroupName -Name $namespaceName
2323

24-
while ($createdMigrationConfig.MigrationState -ne "Active" -and $createdMigrationConfig.ProvisioningState -ne "Succeeded") {
25-
Wait-Seconds 10
24+
while ($createdMigrationConfig.PendingReplicationOperationsCount -ne $null -and $createdMigrationConfig.PendingReplicationOperationsCount -gt 0) {
25+
Wait-Seconds 15
2626
$createdMigrationConfig = Get-AzServiceBusMigration -ResourceGroup $resourceGroupName -Name $namespaceName
2727
}
2828

29-
while ($createdMigrationConfig.PendingReplicationOperationsCount -ne $null -and $createdMigrationConfig.PendingReplicationOperationsCount -gt 0) {
30-
Wait-Seconds 10
29+
while ($createdMigrationConfig.MigrationState -ne "Active" -and $createdMigrationConfig.ProvisioningState -ne "Succeeded") {
30+
Wait-Seconds 15
3131
$createdMigrationConfig = Get-AzServiceBusMigration -ResourceGroup $resourceGroupName -Name $namespaceName
32-
}
32+
}
3333

3434
return $createdMigrationConfig
3535
}

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ServiceBusQueue_CURD()
3232
}
3333

3434
[Fact]
35-
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
3636
public void ServiceBusQueueAuth_CURD()
3737
{
3838
TestRunner.RunTestScript("ServiceBusQueueAuthTests");

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.ps1

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ function ServiceBusQueueAuthTests {
209209
$SasToken = New-AzServiceBusAuthorizationRuleSASToken -ResourceId $updatedAuthRule.Id -KeyType Primary -ExpiryTime $EndTime -StartTime $StartTime
210210

211211
$namespaceRegenerateKeysDefault = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -RegenerateKey $policyKey
212-
Assert-True { $namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
212+
if (getTestMode -eq "Record")
213+
{
214+
Assert-True { $namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
215+
}
213216

214217
$namespaceRegenerateKeys = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -RegenerateKey $policyKey -KeyValue $namespaceListKeys.PrimaryKey
215218
Assert-AreEqual $namespaceRegenerateKeys.PrimaryKey $namespaceListKeys.PrimaryKey
@@ -220,9 +223,11 @@ function ServiceBusQueueAuthTests {
220223
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey
221224

222225
$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -RegenerateKey $policyKey1
223-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
224-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
225-
226+
if (getTestMode -eq "Record")
227+
{
228+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
229+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
230+
}
226231
# Cleanup
227232
Write-Debug "Delete the created Queue AuthorizationRule"
228233
$result = Remove-AzServiceBusAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -Force

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ServiceBusNameSpace_CURD_Tests()
3232
}
3333

3434
[Fact]
35-
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
3636
public void ServiceBusNameSpaceAuth_CURD_Tests()
3737
{
3838
TestRunner.RunTestScript("ServiceBusNameSpaceAuthTests");

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.ps1

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,24 @@ function ServiceBusTests {
3636

3737
Write-Debug " Create new eventHub namespace"
3838
Write-Debug "NamespaceName : $namespaceName"
39-
$result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -Tag @{Tag1="Tag1Value"}
39+
$result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -Tag @{Tag1="Tag1Value"} -MinimumTlsVersion 1.2
4040
# Assert
4141
Assert-AreEqual $result.Name $namespaceName
4242
Assert-AreEqual $result.ProvisioningState "Succeeded"
4343
Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
4444
Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
45+
Assert-AreEqual $result.MinimumTlsVersion "1.2" "Namespace MinimumTlsVersion matches"
4546

4647
Write-Debug "Get the created namespace within the resource group"
4748
$getNamespace = Get-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespaceName
4849
Assert-AreEqual $getNamespace.Name $namespaceName "Get-ServicebusName- created namespace not found"
4950
Assert-AreEqual $getNamespace.ResourceGroup $resourceGroupName "Namespace get : ResourceGroup name matches"
5051
Assert-AreEqual $getNamespace.ResourceGroupName $resourceGroupName "Namespace get : ResourceGroupName name matches"
5152

52-
$UpdatedNameSpace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -SkuCapacity 2 -Tag @{Tag1="Tag1Value"; Tag2="Tag1Value2"}
53+
$UpdatedNameSpace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -SkuCapacity 2 -Tag @{Tag1="Tag1Value"; Tag2="Tag1Value2"} -MinimumTlsVersion 1.1
5354
Assert-AreEqual $UpdatedNameSpace.Name $namespaceName
5455
Assert-True { $UpdatedNameSpace.Tags.Count -eq 2 }
56+
Assert-AreEqual $UpdatedNameSpace.MinimumTlsVersion "1.1" "Namespace MinimumTlsVersion matches after update"
5557

5658
$UpdatedNameSpace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard"
5759
Assert-AreEqual $UpdatedNameSpace.Name $namespaceName
@@ -218,19 +220,28 @@ function ServiceBusNameSpaceAuthTests {
218220
$policyKey = "PrimaryKey"
219221

220222
$namespaceRegenerateKeysDefault = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey
221-
Assert-True { $namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
223+
if (getTestMode -eq "Record")
224+
{
225+
Assert-True { $namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
226+
}
227+
222228

223229
$namespaceRegenerateKeys = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey -KeyValue $namespaceListKeys.PrimaryKey
230+
224231
Assert-AreEqual $namespaceRegenerateKeys.PrimaryKey $namespaceListKeys.PrimaryKey
225232

226233
$policyKey1 = "SecondaryKey"
227234

228235
$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1 -KeyValue $namespaceListKeys.PrimaryKey
236+
229237
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey
230238

231239
$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1
232-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
233-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
240+
if (getTestMode -eq "Record")
241+
{
242+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
243+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
244+
}
234245

235246
Write-Debug "Delete the created Namespace AuthorizationRule"
236247
$result = Remove-AzServiceBusAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -Force
@@ -271,7 +282,7 @@ function MSITest{
271282
$namespace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "SystemAssigned, UserAssigned"
272283
Assert-AreEqual $namespace.Name $namespace1
273284
Assert-AreEqual $namespace.Sku.Name "Standard"
274-
Assert-AreEqual $namespace.IdentityType "SystemAssignedUserAssigned"
285+
Assert-AreEqual $namespace.IdentityType "SystemAssigned, UserAssigned"
275286
Assert-True { $namespace.IdentityId.Count -eq 2 }
276287

277288
$namespace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "None" -IdentityId @()

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ServiceBusTopic_CURD()
3232
}
3333

3434
[Fact]
35-
[Trait(Category.AcceptanceType, Category.CheckIn)]
35+
[Trait(Category.AcceptanceType, Category.LiveOnly)]
3636
public void ServiceBusTopicAuth_CURD()
3737
{
3838
TestRunner.RunTestScript("ServiceBusTopicAuthTests");

‎src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.ps1

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,10 @@ function ServiceBusTopicAuthTests {
194194
$SasToken = New-AzServiceBusAuthorizationRuleSASToken -ResourceId $updatedAuthRule.Id -KeyType Primary -ExpiryTime $EndTime -StartTime $StartTime
195195

196196
$namespaceRegenerateKeysDefault = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $TopicName -Name $authRuleName -RegenerateKey $policyKey
197-
Assert-True { $namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
197+
if (getTestMode -eq "Record")
198+
{
199+
Assert-True { $namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
200+
}
198201

199202
$namespaceRegenerateKeys = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $TopicName -Name $authRuleName -RegenerateKey $policyKey -KeyValue $namespaceListKeys.PrimaryKey
200203
Assert-AreEqual $namespaceRegenerateKeys.PrimaryKey $namespaceListKeys.PrimaryKey
@@ -205,8 +208,11 @@ function ServiceBusTopicAuthTests {
205208
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey
206209

207210
$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $TopicName -Name $authRuleName -RegenerateKey $policyKey1
208-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
209-
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
211+
if (getTestMode -eq "Record")
212+
{
213+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
214+
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
215+
}
210216

211217
# Cleanup
212218
Write-Debug "Delete the created Topic AuthorizationRule"

‎src/ServiceBus/ServiceBus.Test/ServiceBus.Test.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<PsModuleName>ServiceBus</PsModuleName>
@@ -13,7 +13,7 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
1515
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
16-
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="4.0.0" />
16+
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
1717
</ItemGroup>
1818

1919
</Project>

‎src/ServiceBus/ServiceBus.Test/SessionRecords/Microsoft.Azure.Commands.ServiceBus.Test.ScenarioTests.NetworkRuleSetTests/NetworkRuleSetCRUD.json

Lines changed: 1048 additions & 1055 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)