Skip to content

Service Bus : Added -MinimumTlsVersion to New-AzServiceBusNamespace and Set-AzServiceBusNamespace #19254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 29, 2022
Merged

Service Bus : Added -MinimumTlsVersion to New-AzServiceBusNamespace and Set-AzServiceBusNamespace #19254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6de6ab
Added -MinimumTlsVersion to New-AzServiceBusNamespace and Set-AzServi…
Aug 17, 2022
250527e
fixes for CI failures
Aug 28, 2022
37373cc
Merge branch 'main' of https://github.com/Azure/azure-powershell into…
Aug 28, 2022
448c3cb
test fix for assert check for Sanitized
Aug 28, 2022
7d199fc
fix for test failure
Aug 28, 2022
4928d93
updated storage for eventgrid
Aug 28, 2022
24dbcc6
updated help and cleaned commented code
Aug 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/EventGrid/EventGrid.Test/EventGrid.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="7.0.0" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="4.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="25.0.0" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusMigrationConfigurationTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ function WaitforStatetoBeSucceded {

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

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

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

return $createdMigrationConfig
}
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void ServiceBusQueue_CURD()
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.LiveOnly)]
public void ServiceBusQueueAuth_CURD()
{
TestRunner.RunTestScript("ServiceBusQueueAuthTests");
Expand Down
13 changes: 9 additions & 4 deletions src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusQueueTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,10 @@ function ServiceBusQueueAuthTests {
$SasToken = New-AzServiceBusAuthorizationRuleSASToken -ResourceId $updatedAuthRule.Id -KeyType Primary -ExpiryTime $EndTime -StartTime $StartTime

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

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

$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -RegenerateKey $policyKey1
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }

if (getTestMode -eq "Record")
{
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
}
# Cleanup
Write-Debug "Delete the created Queue AuthorizationRule"
$result = Remove-AzServiceBusAuthorizationRule -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Queue $queueName -Name $authRuleName -Force
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void ServiceBusNameSpace_CURD_Tests()
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.LiveOnly)]
public void ServiceBusNameSpaceAuth_CURD_Tests()
{
TestRunner.RunTestScript("ServiceBusNameSpaceAuthTests");
Expand Down
23 changes: 17 additions & 6 deletions src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusServiceTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,24 @@ function ServiceBusTests {

Write-Debug " Create new eventHub namespace"
Write-Debug "NamespaceName : $namespaceName"
$result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -Tag @{Tag1="Tag1Value"}
$result = New-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Location $location -Name $namespaceName -SkuName "Standard" -Tag @{Tag1="Tag1Value"} -MinimumTlsVersion 1.2
# Assert
Assert-AreEqual $result.Name $namespaceName
Assert-AreEqual $result.ProvisioningState "Succeeded"
Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
Assert-AreEqual $result.MinimumTlsVersion "1.2" "Namespace MinimumTlsVersion matches"

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

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

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

$namespaceRegenerateKeysDefault = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey
Assert-True { $namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
if (getTestMode -eq "Record")
{
Assert-True { $namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey }
}


$namespaceRegenerateKeys = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey -KeyValue $namespaceListKeys.PrimaryKey

Assert-AreEqual $namespaceRegenerateKeys.PrimaryKey $namespaceListKeys.PrimaryKey

$policyKey1 = "SecondaryKey"

$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1 -KeyValue $namespaceListKeys.PrimaryKey

Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey

$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
if (getTestMode -eq "Record")
{
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
}

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

$namespace = Set-AzServiceBusNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "None" -IdentityId @()
Expand Down
2 changes: 1 addition & 1 deletion src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void ServiceBusTopic_CURD()
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.AcceptanceType, Category.LiveOnly)]
public void ServiceBusTopicAuth_CURD()
{
TestRunner.RunTestScript("ServiceBusTopicAuthTests");
Expand Down
12 changes: 9 additions & 3 deletions src/ServiceBus/ServiceBus.Test/ScenarioTests/ServiceBusTopicTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,10 @@ function ServiceBusTopicAuthTests {
$SasToken = New-AzServiceBusAuthorizationRuleSASToken -ResourceId $updatedAuthRule.Id -KeyType Primary -ExpiryTime $EndTime -StartTime $StartTime

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

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

$namespaceRegenerateKeys1 = New-AzServiceBusKey -ResourceGroupName $resourceGroupName -Namespace $namespaceName -Topic $TopicName -Name $authRuleName -RegenerateKey $policyKey1
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
if (getTestMode -eq "Record")
{
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey }
Assert-True { $namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.SecondaryKey }
}

# Cleanup
Write-Debug "Delete the created Topic AuthorizationRule"
Expand Down
4 changes: 2 additions & 2 deletions src/ServiceBus/ServiceBus.Test/ServiceBus.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PsModuleName>ServiceBus</PsModuleName>
Expand All @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="4.0.0-preview.1" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="4.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="5.0.0" />
</ItemGroup>

</Project>
2,103 changes: 1,048 additions & 1,055 deletions ....Azure.Commands.ServiceBus.Test.ScenarioTests.NetworkRuleSetTests/NetworkRuleSetCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading