Skip to content

EventHub: added support for Premium sku and 'DisableLocalAuth' to namespace #15960

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
BethanyZhou merged 20 commits into from
Oct 27, 2021
Merged

EventHub: added support for Premium sku and 'DisableLocalAuth' to namespace #15960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2288681
added support for Premium sku and namesapce and 'DisableLocalAuth' t…
Sep 28, 2021
a7446d3
corrected description
Sep 28, 2021
1d9e505
statisc analysis
Sep 28, 2021
72189c4
staticanalysis
Sep 28, 2021
3951b53
Update BreakingChangeIssues.csv
wyunchi-ms Sep 28, 2021
c900e1e
wraping ManagedServiceIdentityType with PSObject
Oct 27, 2021
c4f8564
review comment changes
Oct 27, 2021
0b4498c
Merge branch 'mstEH2021' of https://github.com/v-Ajnava/azure-powersh…
Oct 27, 2021
7afe4a3
updated change log
Oct 27, 2021
f594590
Update src/EventHub/EventHub/ChangeLog.md
BethanyZhou Oct 27, 2021
10db6c9
Merge branch 'release-2021-11-02' into mstEH2021
BethanyZhou Oct 27, 2021
9277a8e
updated Microsoft.Azure.Management.EventHub version
Oct 27, 2021
4004f30
updated eventgrid
Oct 27, 2021
d0c5183
Merge branch 'mstEH2021' of https://github.com/v-Ajnava/azure-powersh…
Oct 27, 2021
52714b5
Merge branch 'release-2021-11-02' into mstEH2021
BethanyZhou Oct 27, 2021
0725cf9
Merge branch 'release-2021-11-02' into mstEH2021
BethanyZhou Oct 27, 2021
2d665ee
added Microsoft.EventHub to dic in test base to skip API exclision on…
Oct 27, 2021
6c4e48b
Merge branch 'mstEH2021' of https://github.com/v-Ajnava/azure-powersh…
Oct 27, 2021
a4519e2
Update tools/StaticAnalysis/Exceptions/Az.EventHub/BreakingChangeIssu…
BethanyZhou Oct 27, 2021
4f8e5cc
Update src/EventHub/EventHub/Models/IdentityType.cs
BethanyZhou Oct 27, 2021
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 @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="23.0.0" />
Expand Down
3 changes: 2 additions & 1 deletion src/EventGrid/EventGrid.Test/ScenarioTests/EventGridController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ public void RunPsTestWorkflow(
{
{"Microsoft.Resources", null},
{"Microsoft.Features", null},
{"Microsoft.Authorization", null}
{"Microsoft.Authorization", null},
{"Microsoft.EventHub", null}
};
var providersToIgnore = new Dictionary<string, string>
{
Expand Down
2 changes: 1 addition & 1 deletion src/EventHub/EventHub.Test/EventHub.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.2" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/EventHub/EventHub.Test/ScenarioTests/EventHubsTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ function EventHubsAuthTests
$policyKey1 = "SecondaryKey"

$namespaceRegenerateKeys1 = New-AzEventHubKey -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleName -RegenerateKey $policyKey1 -KeyValue $namespaceListKeys.PrimaryKey
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey
Assert-True {$namespaceRegenerateKeys1.SecondaryKey -ne $namespaceRegenerateKeys.SecondaryKey}

$namespaceRegenerateKeys1 = New-AzEventHubKey -ResourceGroup $resourceGroupName -Namespace $namespaceName -EventHub $eventHubName -Name $authRuleName -RegenerateKey $policyKey1
Assert-True {$namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey}
Assert-True {$namespaceRegenerateKeys1.PrimaryKey -ne $namespaceListKeys.PrimaryKey}

# Cleanup
Write-Debug "Delete the created EventHub AuthorizationRule"
Expand Down
4 changes: 2 additions & 2 deletions src/EventHub/EventHub.Test/ScenarioTests/NamespaceBYOKTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ Tests BYOK for EventHub Namespace operations.
function NamespaceTests
{
# Setup
$location = Get-Location
$locationKafka = "westus"
$location = "East US 2"
$locationKafka = "East US 2"
$namespaceName = getAssetName "Eventhub-Namespace1-"
$namespaceName2 = getAssetName "Eventhub-Namespace2-"
$keyVaultName = "SDKTesting1Key"
Expand Down
24 changes: 17 additions & 7 deletions src/EventHub/EventHub.Test/ScenarioTests/NamespaceTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,15 +160,15 @@ function NamespaceAuthTests
Assert-True {$namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey}

$namespaceRegenerateKeys = New-AzEventHubKey -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey -KeyValue $namespaceListKeys.PrimaryKey
Assert-AreEqual $namespaceRegenerateKeys.PrimaryKey $namespaceListKeys.PrimaryKey
Assert-True { $namespaceRegenerateKeys.PrimaryKey -ne $namespaceListKeys.PrimaryKey }

$policyKey1 = "SecondaryKey"

$namespaceRegenerateKeys1 = New-AzEventHubKey -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1 -KeyValue $namespaceListKeys.PrimaryKey
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.PrimaryKey
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.SecondaryKey

$namespaceRegenerateKeys1 = New-AzEventHubKey -ResourceGroup $resourceGroupName -Namespace $namespaceName -Name $authRuleName -RegenerateKey $policyKey1
Assert-True {$namespaceRegenerateKeys1.SecondaryKey -ne $namespaceListKeys.PrimaryKey}
Assert-AreEqual $namespaceRegenerateKeys1.SecondaryKey $namespaceListKeys.SecondaryKey

# Cleanup
Write-Debug "Delete the created Namespace AuthorizationRule"
Expand All @@ -190,10 +190,11 @@ Tests New Parameter for EventHub Namespace Create List Remove operations.
function NamespaceTests
{
# Setup
$location = Get-Location
$locationKafka = "westus"
$location = "eastus"
$locationKafka = "eastus"
$namespaceName = getAssetName "Eventhub-Namespace1-"
$namespaceName2 = getAssetName "Eventhub-Namespace2-"
$namespaceName3 = getAssetName "Eventhub-Namespace3-"
$resourceGroupName = getAssetName "RGName1-"
$secondResourceGroup = getAssetName "RGName2-"
$namespaceNameKafka = getAssetName "Eh-NamespaceKafka-"
Expand All @@ -214,15 +215,24 @@ function NamespaceTests

Write-Debug " Create new Eventhub Kafka namespace"
Write-Debug "Kafka Namespace name : $namespaceNameKafka"
$resultkafka = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceNameKafka -Location $locationKafka -EnableKafka
$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.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"

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"

# Assert
Assert-AreEqual $result.ProvisioningState "Succeeded"
Expand Down
8 changes: 4 additions & 4 deletions ...rds/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.ClusterTest/ClusterTestCURD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"StatusCode": 201
},
{
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/providers/Microsoft.EventHub/availableClusterRegions?api-version=2018-01-01-preview",
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/providers/Microsoft.EventHub/availableClusterRegions?api-version=2021-06-01-preview",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Byb3ZpZGVycy9NaWNyb3NvZnQuRXZlbnRIdWIvYXZhaWxhYmxlQ2x1c3RlclJlZ2lvbnM/YXBpLXZlcnNpb249MjAxOC0wMS0wMS1wcmV2aWV3",
"RequestMethod": "GET",
"RequestBody": "",
Expand Down Expand Up @@ -134,7 +134,7 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"sku\": {\r\n \"capacity\": 1,\r\n \"name\": \"Dedicated\"\r\n },\r\n \"location\": \"southcentralus\",\r\n \"tags\": {}\r\n}",
Expand Down Expand Up @@ -207,7 +207,7 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
"RequestMethod": "GET",
"RequestBody": "",
Expand Down Expand Up @@ -274,7 +274,7 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
"RequestMethod": "PATCH",
"RequestBody": "{\r\n \"sku\": {\r\n \"capacity\": 1,\r\n \"name\": \"Dedicated\"\r\n },\r\n \"location\": \"southcentralus\",\r\n \"tags\": {\r\n \"ClusterTag2\": \"Tag4\",\r\n \"ClusterTag1\": \"Tag3\"\r\n }\r\n}",
Expand Down
694 changes: 293 additions & 401 deletions ...ft.Azure.Commands.EventHub.Test.ScenarioTests.ConsumerGroupsTests/ConsumerGroupsCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

3,951 changes: 1,891 additions & 2,060 deletions ...Azure.Commands.EventHub.Test.ScenarioTests.DRConfigurationTests/DRConfigurationsCURD.json
View file
Open in desktop

Large diffs are not rendered by default.

2,187 changes: 1,257 additions & 930 deletions ...s.EventHub.Test.ScenarioTests.DRConfigurationTests/DRConfigurationsCURDAlternateName.json
View file
Open in desktop

Large diffs are not rendered by default.

994 changes: 557 additions & 437 deletions ...est.ScenarioTests.EventHubsConsumerGroupsSkipTopTests/EventHubsConsumerGroupsskiptop.json
View file
Open in desktop

Large diffs are not rendered by default.

1,006 changes: 449 additions & 557 deletions ....Commands.EventHub.Test.ScenarioTests.EventHubsTests/EventHubsAuthorizationRulesCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

429 changes: 184 additions & 245 deletions ...ds/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.EventHubsTests/EventHubsCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading