Skip to content

Commit 4517b12

Browse files
Ajit Navasarewyunchi-msBethanyZhou
authored
EventHub: added support for Premium sku and 'DisableLocalAuth' to namespace (#15960)
* added support for Premium sku and namesapce and 'DisableLocalAuth' to Namespace * corrected description * statisc analysis * staticanalysis * Update BreakingChangeIssues.csv * wraping ManagedServiceIdentityType with PSObject * review comment changes * updated change log * Update src/EventHub/EventHub/ChangeLog.md * updated Microsoft.Azure.Management.EventHub version * updated eventgrid * added Microsoft.EventHub to dic in test base to skip API exclision on playback * Update tools/StaticAnalysis/Exceptions/Az.EventHub/BreakingChangeIssues.csv * Update src/EventHub/EventHub/Models/IdentityType.cs Co-authored-by: Yunchi Wang <[email protected]> Co-authored-by: Beisi Zhou <[email protected]> Co-authored-by: Beisi Zhou <[email protected]>
1 parent af55393 commit 4517b12

File tree

34 files changed

+7261
-6429
lines changed

34 files changed

+7261
-6429
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.Management.EventGrid" Version="6.0.0" />
15-
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="3.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
1717
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="3.0.0" />
1818
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="23.0.0" />

‎src/EventGrid/EventGrid.Test/ScenarioTests/EventGridController.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ public void RunPsTestWorkflow(
8383
{
8484
{"Microsoft.Resources", null},
8585
{"Microsoft.Features", null},
86-
{"Microsoft.Authorization", null}
86+
{"Microsoft.Authorization", null},
87+
{"Microsoft.EventHub", null}
8788
};
8889
var providersToIgnore = new Dictionary<string, string>
8990
{

‎src/EventHub/EventHub.Test/EventHub.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.5" />
15-
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.2" />
15+
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="3.0.0" />
1616
<PackageReference Include="Microsoft.Azure.Management.KeyVault" Version="3.1.0-preview.2" />
1717
</ItemGroup>
1818

‎src/EventHub/EventHub.Test/ScenarioTests/EventHubsTests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,10 @@ function EventHubsAuthTests
257257
$policyKey1 = "SecondaryKey"
258258

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

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

265265
# Cleanup
266266
Write-Debug "Delete the created EventHub AuthorizationRule"

‎src/EventHub/EventHub.Test/ScenarioTests/NamespaceBYOKTests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Tests BYOK for EventHub Namespace operations.
2020
function NamespaceTests
2121
{
2222
# Setup
23-
$location = Get-Location
24-
$locationKafka = "westus"
23+
$location = "East US 2"
24+
$locationKafka = "East US 2"
2525
$namespaceName = getAssetName "Eventhub-Namespace1-"
2626
$namespaceName2 = getAssetName "Eventhub-Namespace2-"
2727
$keyVaultName = "SDKTesting1Key"

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

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,15 @@ function NamespaceAuthTests
160160
Assert-True {$namespaceRegenerateKeysDefault.PrimaryKey -ne $namespaceListKeys.PrimaryKey}
161161

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

165165
$policyKey1 = "SecondaryKey"
166166

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

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

173173
# Cleanup
174174
Write-Debug "Delete the created Namespace AuthorizationRule"
@@ -190,10 +190,11 @@ Tests New Parameter for EventHub Namespace Create List Remove operations.
190190
function NamespaceTests
191191
{
192192
# Setup
193-
$location = Get-Location
194-
$locationKafka = "westus"
193+
$location = "eastus"
194+
$locationKafka = "eastus"
195195
$namespaceName = getAssetName "Eventhub-Namespace1-"
196196
$namespaceName2 = getAssetName "Eventhub-Namespace2-"
197+
$namespaceName3 = getAssetName "Eventhub-Namespace3-"
197198
$resourceGroupName = getAssetName "RGName1-"
198199
$secondResourceGroup = getAssetName "RGName2-"
199200
$namespaceNameKafka = getAssetName "Eh-NamespaceKafka-"
@@ -214,15 +215,24 @@ function NamespaceTests
214215

215216
Write-Debug " Create new Eventhub Kafka namespace"
216217
Write-Debug "Kafka Namespace name : $namespaceNameKafka"
217-
$resultkafka = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceNameKafka -Location $locationKafka -EnableKafka
218+
$resultkafka = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceNameKafka -Location $locationKafka -EnableKafka -DisableLocalAuth
218219
Assert-AreEqual $resultkafka.Name $namespaceNameKafka "Namespace created earlier is not found."
219-
Assert-True {$resultkafka.KafkaEnabled}
220+
Assert-True {$resultkafka.KafkaEnabled}
221+
Assert-True {$resultkafka.DisableLocalAuth}
220222

221223
Write-Debug " Create new eventHub namespace"
222224
Write-Debug "NamespaceName : $namespaceName"
223225
$result = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName -Location $location -SkuName "Standard" -SkuCapacity "1" -EnableAutoInflate -MaximumThroughputUnits 10
224226
Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
225227
Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
228+
229+
Write-Debug " Create new eventHub premium namespace"
230+
Write-Debug "NamespaceName : $namespaceName3"
231+
$result = New-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3 -Location $location -SkuName "Premium" -DisableLocalAuth
232+
Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
233+
Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
234+
Assert-True { $result.DisableLocalAuth }
235+
Assert-AreEqual $result.Sku.Name "Premium" "Namespace Premium"
226236

227237
# Assert
228238
Assert-AreEqual $result.ProvisioningState "Succeeded"

‎src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.ClusterTest/ClusterTestCURD.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"StatusCode": 201
6868
},
6969
{
70-
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/providers/Microsoft.EventHub/availableClusterRegions?api-version=2018-01-01-preview",
70+
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/providers/Microsoft.EventHub/availableClusterRegions?api-version=2021-06-01-preview",
7171
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Byb3ZpZGVycy9NaWNyb3NvZnQuRXZlbnRIdWIvYXZhaWxhYmxlQ2x1c3RlclJlZ2lvbnM/YXBpLXZlcnNpb249MjAxOC0wMS0wMS1wcmV2aWV3",
7272
"RequestMethod": "GET",
7373
"RequestBody": "",
@@ -134,7 +134,7 @@
134134
"StatusCode": 200
135135
},
136136
{
137-
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
137+
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
138138
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
139139
"RequestMethod": "PUT",
140140
"RequestBody": "{\r\n \"sku\": {\r\n \"capacity\": 1,\r\n \"name\": \"Dedicated\"\r\n },\r\n \"location\": \"southcentralus\",\r\n \"tags\": {}\r\n}",
@@ -207,7 +207,7 @@
207207
"StatusCode": 200
208208
},
209209
{
210-
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
210+
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
211211
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
212212
"RequestMethod": "GET",
213213
"RequestBody": "",
@@ -274,7 +274,7 @@
274274
"StatusCode": 200
275275
},
276276
{
277-
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2018-01-01-preview",
277+
"RequestUri": "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/RSG-Cluster2041/providers/Microsoft.EventHub/clusters/Eventhub-Cluster-2820?api-version=2021-06-01-preview",
278278
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMzI2MTAwZTItZjY5ZC00MjY4LTg1MDMtMDc1Mzc0ZjYyYjZlL3Jlc291cmNlR3JvdXBzL1JTRy1DbHVzdGVyMjA0MS9wcm92aWRlcnMvTWljcm9zb2Z0LkV2ZW50SHViL2NsdXN0ZXJzL0V2ZW50aHViLUNsdXN0ZXItMjgyMD9hcGktdmVyc2lvbj0yMDE4LTAxLTAxLXByZXZpZXc=",
279279
"RequestMethod": "PATCH",
280280
"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}",

‎src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.ConsumerGroupsTests/ConsumerGroupsCRUD.json‎

Lines changed: 293 additions & 401 deletions
Large diffs are not rendered by default.

‎src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.DRConfigurationTests/DRConfigurationsCURD.json‎

Lines changed: 1891 additions & 2060 deletions
Large diffs are not rendered by default.

‎src/EventHub/EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.DRConfigurationTests/DRConfigurationsCURDAlternateName.json‎

Lines changed: 1257 additions & 930 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)