Skip to content

Commit b4d3d17

Browse files
[EventHub]: Deprecating MSI properties for breaking change release (#18031)
* Deprecating MSI properties * Push Recordings * Fixes * Fixes * fixes * Update BreakingChangeIssues.csv * Update BreakingChangeIssues.csv * Update BreakingChangeIssues.csv * Update BreakingChangeIssues.csv * fix * Pushing recording
1 parent 4597e1b commit b4d3d17

File tree

27 files changed

+8407
-14992
lines changed

27 files changed

+8407
-14992
lines changed

src/EventHub/EventHub.Test/ScenarioTests/Namespace.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public void NamespaceAuthorizationRulesCRUD()
3838
TestRunner.RunTestScript("NamespaceAuthTests");
3939
}
4040

41-
[Fact(Skip = "Skip as current test framework does not support recording generated cmdlets.")]
41+
[Fact]
4242
[Trait(Category.AcceptanceType, Category.LiveOnly)]
4343
public void MSIEncryptionTest()
4444
{
4545
TestRunner.RunTestScript("EncryptionTest");
4646
}
4747

48-
[Fact(Skip = "Skip as current test framework does not support recording generated cmdlets.")]
48+
[Fact]
4949
[Trait(Category.AcceptanceType, Category.LiveOnly)]
5050
public void MSITest()
5151
{

src/EventHub/EventHub.Test/ScenarioTests/NamespaceBYOK.cs

Lines changed: 0 additions & 34 deletions
This file was deleted.

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

Lines changed: 0 additions & 105 deletions
This file was deleted.

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ function NamespaceTests
255255
Assert-AreEqual $result.Sku.Name "Premium" "Namespace Premium"
256256

257257

258-
$result = Set-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3 -Identity -Location $location
258+
$result = Set-AzEventHubNamespace -ResourceGroup $resourceGroupName -Name $namespaceName3 -IdentityType "SystemAssigned" -Location $location
259259
Assert-AreEqual $result.ResourceGroup $resourceGroupName "Namespace create : ResourceGroup name matches"
260260
Assert-AreEqual $result.ResourceGroupName $resourceGroupName "Namespace create : ResourceGroupName name matches"
261261
Assert-True { $result.DisableLocalAuth }
@@ -286,10 +286,10 @@ function NamespaceTests
286286
#Assert
287287
Assert-True {$allCreatedNamespace.Count -ge 0 } "Namespace created earlier is not found. in list"
288288

289-
Write-Debug "Get all the namespaces created in the subscription"
290-
$allCreatedNamespace = Get-AzEventHubNamespace
289+
#Write-Debug "Get all the namespaces created in the subscription"
290+
#$allCreatedNamespace = Get-AzEventHubNamespace
291291

292-
Assert-True {$allCreatedNamespace.Count -ge 0} "Namespaces created earlier is not found."
292+
#Assert-True {$allCreatedNamespace.Count -ge 0} "Namespaces created earlier is not found."
293293

294294
Write-Debug " Delete namespaces"
295295
Remove-AzEventHubNamespace -ResourceGroup $secondResourceGroup -Name $namespaceName2
@@ -406,11 +406,11 @@ function MSITest{
406406
$namespace2 = getAssetName "Namespace2-"
407407
try{
408408

409-
$uad1 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi1
410-
$uad2 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi2
411-
$uad3 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi3
409+
$uad1 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI1"
410+
$uad2 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI2"
411+
$uad3 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI3"
412412

413-
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -SkuName Standard -Location northeurope
413+
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -SkuName Standard -Location eastus
414414
Assert-AreEqual $namespace.Name $namespace1
415415
Assert-AreEqual $namespace.Sku.Name "Standard"
416416

@@ -419,19 +419,19 @@ function MSITest{
419419
Assert-AreEqual $namespace.Sku.Name "Standard"
420420
Assert-AreEqual $namespace.IdentityType "SystemAssigned"
421421

422-
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "UserAssigned" -IdentityId $uad1.Id,$uad2.Id
422+
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "UserAssigned" -IdentityId $uad1,$uad2
423423
Assert-AreEqual $namespace.Name $namespace1
424424
Assert-AreEqual $namespace.Sku.Name "Standard"
425425
Assert-AreEqual $namespace.IdentityType "UserAssigned"
426426
Assert-True { $namespace.IdentityId.Count -eq 2 }
427427

428-
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "SystemAssigned, UserAssigned" -IdentityId $uad1.Id,$uad2.Id
428+
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "SystemAssigned, UserAssigned"
429429
Assert-AreEqual $namespace.Name $namespace1
430430
Assert-AreEqual $namespace.Sku.Name "Standard"
431431
Assert-AreEqual $namespace.IdentityType "SystemAssignedUserAssigned"
432432
Assert-True { $namespace.IdentityId.Count -eq 2 }
433433

434-
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "None"
434+
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -IdentityType "None" -IdentityId @()
435435
Assert-AreEqual $namespace.Name $namespace1
436436
Assert-AreEqual $namespace.Sku.Name "Standard"
437437
Assert-Null $namespace.Identity
@@ -447,18 +447,18 @@ function EncryptionTest{
447447
$msi1 = "PS-Testing-MSI1"
448448
$msi2 = "PS-Testing-MSI2"
449449
$msi3 = "PS-Testing-MSI3"
450-
$kv1 = "PS-Testing-kv1"
451-
$kv2 = "PS-Testing-kv2"
452-
$kv1uri = "https://ps-testing-kv1.vault.azure.net/"
453-
$kv2uri = "https://ps-testing-kv2.vault.azure.net"
450+
$kv1 = "PS-Test-kv1"
451+
$kv2 = "PS-Test-kv2"
452+
$kv1uri = "https://ps-test-kv1.vault.azure.net/"
453+
$kv2uri = "https://ps-test-kv2.vault.azure.net"
454454
$namespace1 = getAssetName "Namespace1-"
455455
$namespace2 = getAssetName "Namespace2-"
456456

457-
$uad1 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi1
458-
$uad2 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi2
459-
$uad3 = Get-AzUserAssignedIdentity -ResourceGroupName $resourceGroupName -Name $msi3
457+
$uad1 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI1"
458+
$uad2 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI2"
459+
$uad3 = "/subscriptions/326100e2-f69d-4268-8503-075374f62b6e/resourceGroups/PS-Testing/providers/Microsoft.ManagedIdentity/userAssignedIdentities/PS-Testing-MSI3"
460460

461-
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace2 -SkuName Premium -Location northeurope -IdentityType SystemAssigned
461+
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace2 -SkuName Premium -Location eastus -IdentityType SystemAssigned
462462
Assert-AreEqual $namespace.Name $namespace2
463463
Assert-AreEqual $namespace.Sku.Name "Premium"
464464
Assert-AreEqual $namespace.IdentityType "SystemAssigned"
@@ -474,17 +474,17 @@ function EncryptionTest{
474474
Assert-AreEqual $namespace.IdentityType "SystemAssigned"
475475
Assert-True { $namespace.EncryptionConfig.Count -eq 2 }
476476

477-
$ec1 = New-AzEventHubEncryptionConfig -KeyName key1 -KeyVaultUri $kv1uri -UserAssignedIdentity $uad1.Id
478-
$ec2 = New-AzEventHubEncryptionConfig -KeyName key2 -KeyVaultUri $kv1uri -UserAssignedIdentity $uad1.Id
477+
$ec1 = New-AzEventHubEncryptionConfig -KeyName key1 -KeyVaultUri $kv1uri -UserAssignedIdentity $uad1
478+
$ec2 = New-AzEventHubEncryptionConfig -KeyName key2 -KeyVaultUri $kv1uri -UserAssignedIdentity $uad1
479479

480-
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -SkuName Premium -Location northeurope -IdentityType UserAssigned -IdentityId $uad1.Id,$uad2.Id -EncryptionConfig $ec1,$ec2
480+
$namespace = New-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -SkuName Premium -Location northeurope -IdentityType UserAssigned -IdentityId $uad1,$uad2 -EncryptionConfig $ec1,$ec2
481481
Assert-AreEqual $namespace.Name $namespace1
482482
Assert-AreEqual $namespace.Sku.Name "Premium"
483483
Assert-AreEqual $namespace.IdentityType "UserAssigned"
484484
Assert-True { $namespace.IdentityId.Count -eq 2 }
485485
Assert-True { $namespace.EncryptionConfig.Count -eq 2 }
486486

487-
$ec3 = New-AzEventHubEncryptionConfig -KeyName key1 -KeyVaultUri $kv2uri -UserAssignedIdentity $uad1.id
487+
$ec3 = New-AzEventHubEncryptionConfig -KeyName key1 -KeyVaultUri $kv2uri -UserAssignedIdentity $uad1
488488
$namespace.EncryptionConfig += $ec3
489489

490490
$namespace = Set-AzEventHubNamespace -ResourceGroupName $resourceGroupName -Name $namespace1 -EncryptionConfig $namespace.EncryptionConfig -Location northeurope

0 commit comments

Comments
 (0)