Skip to content

Commit da31422

Browse files
Pan-QiPan-Qi
committed
Record test
1 parent c7ed9b7 commit da31422

File tree

14 files changed

+523
-323
lines changed

14 files changed

+523
-323
lines changed

‎src/LoadTesting/LoadTesting.Autorest/Properties/AssemblyInfo.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@
2626
[assembly: System.CLSCompliantAttribute(false)]
2727

2828

29+
30+
31+
32+

‎src/LoadTesting/LoadTesting.Autorest/custom/LoadTestResourceCustom.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ namespace Microsoft.Azure.PowerShell.Cmdlets.LoadTesting.Models
1010
public partial class EncryptionPropertiesIdentity
1111
{
1212
partial void AfterToJson(ref Microsoft.Azure.PowerShell.Cmdlets.LoadTesting.Runtime.Json.JsonObject container){
13-
if(string.Empty.Equals(this.ResourceId))
13+
if(string.IsNullOrEmpty(this.ResourceId))
1414
{
1515
container.Remove("resourceId");
16-
container.Add("resourceId", Runtime.Json.XNull.Instance);
16+
// Don't add null value back - completely remove the field for SystemAssigned identity
1717
}
1818
}
1919
}

‎src/LoadTesting/LoadTesting.Autorest/custom/New-AzLoad.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ param(
173173
$null = $PSBoundParameters.Add("EncryptionIdentityResourceId", $PSBoundParameters['EncryptionIdentity'])
174174
$null = $PSBoundParameters.Add("EncryptionIdentityType", 'UserAssigned')
175175
$null = $PSBoundParameters.Remove('EncryptionIdentity')
176+
$encryptionIdentityResourceId = $PSBoundParameters['EncryptionIdentityResourceId']
176177

177178
# Update the User Assigned Identities
178179
if ($PSBoundParameters.ContainsKey('UserAssignedIdentity')) {

‎src/LoadTesting/LoadTesting.Autorest/custom/Update-AzLoad.ps1‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,16 @@ param(
165165
if($PSBoundParameters['EncryptionIdentity'].ToLower() -eq 'systemassigned') {
166166
$null = $PSBoundParameters.Add("EncryptionIdentityType", 'SystemAssigned')
167167

168+
# For SystemAssigned encryption identity, we should NOT include EncryptionIdentityResourceId
169+
# Remove it if it exists in the parameters
168170
if($PSBoundParameters.ContainsKey('EncryptionIdentityResourceId')) {
169-
$PSBoundParameters['EncryptionIdentityResourceId'] = $null
170-
}
171-
else {
172-
$PSBoundParameters.Add('EncryptionIdentityResourceId', $null)
171+
$null = $PSBoundParameters.Remove('EncryptionIdentityResourceId')
173172
}
174173

174+
# CRITICAL: Explicitly set to empty string to prevent AutoRest from inferring from UserAssignedIdentity
175+
# This ensures the AfterToJson method will completely remove the resourceId field
176+
$null = $PSBoundParameters.Add('EncryptionIdentityResourceId', '')
177+
175178
# Update the identity type only if the input does not contain the encryption identity type
176179
# Update EnableSystemAssignedIdentity to enable system assigned identity
177180
# For user assigned identity, it will pass the value automatically if exist

‎src/LoadTesting/LoadTesting.Autorest/generate-info.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"generate_Id": "1a0c155c-9cf5-4157-b6c7-a00ff5eca2e6"
2+
"generate_Id": "2c23ec77-136d-43e8-b06e-2006562d6554"
33
}

‎src/LoadTesting/LoadTesting.Autorest/test/Az.LoadTesting.Recording.json‎

Lines changed: 456 additions & 278 deletions
Large diffs are not rendered by default.

‎src/LoadTesting/LoadTesting.Autorest/test/Az.LoadTesting.Tests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Describe 'New-AzLoad' {
1818
It 'Create with MI' {
1919
$name = $env.loadTestResource1
2020
$tags = @{"tag1"="value1"}
21-
$userAssigned = @{$env.identityid1=@{};$env.identityid2=@{}}
21+
$userAssigned = @($env.identityid1, $env.identityid2)
2222
$identityType = "SystemAssigned, UserAssigned"
2323

2424
$res = New-AzLoad -Name $name -ResourceGroupName $env.resourceGroup -Location $env.location -EnableSystemAssignedIdentity -UserAssignedIdentity $userAssigned -Tag $tags
@@ -107,10 +107,10 @@ Describe 'Get-AzLoad' {
107107
Describe 'Update-AzLoad (Recorded)' {
108108
It 'Remove a Managed Identity' {
109109
$name = $env.loadTestResource1
110-
$userAssigned = @{$env.identityid1=@{};$env.identityid2=$null}
110+
$userAssigned = @($env.identityid1)
111111
$identityType = "UserAssigned"
112112

113-
$res = Update-AzLoad -Name $name -ResourceGroupName $env.resourceGroup -UserAssignedIdentity $userAssigned
113+
$res = Update-AzLoad -Name $name -ResourceGroupName $env.resourceGroup -EnableSystemAssignedIdentity $false -UserAssignedIdentity $userAssigned
114114
$res.Name | Should -Be $name
115115
$res.ResourceGroupName | Should -Be $env.resourceGroup
116116
$res.Location | Should -Be $env.location

‎src/LoadTesting/LoadTesting.Autorest/test/deployment-templates/key-vault/parameters.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"name": {
6-
"value": "pwsh-loadtesting-kvwb08"
6+
"value": "pwsh-loadtesting-kv9k2t"
77
},
88
"location": {
99
"value": "westus2"
@@ -12,13 +12,13 @@
1212
"value": "Standard"
1313
},
1414
"mi1ObjectId": {
15-
"value": "1391d0ce-dbfa-4169-bfe0-7c9b4c849821"
15+
"value": "2ef7ed83-9d95-48d6-99a8-9b2eae7b87da"
1616
},
1717
"mi2ObjectId": {
18-
"value": "e5acca67-024c-4e09-a68c-89b67a87b802"
18+
"value": "667ca28a-4098-49ef-a19c-a41a9808bdcc"
1919
},
2020
"tenant": {
21-
"value": "72f988bf-86f1-41af-91ab-2d7cd011db47"
21+
"value": "213e87ed-8e08-4eb4-a63c-c073058f7b00"
2222
},
2323
"enabledForDeployment": {
2424
"value": false

‎src/LoadTesting/LoadTesting.Autorest/test/deployment-templates/key-vault/template.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@
9898
"applicationId": ""
9999
},
100100
{
101-
"tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
102-
"objectId": "b2ce67ee-5de9-4b0f-acd6-2f6465e7aa2f",
101+
"tenantId": "[parameters('tenant')]",
102+
"objectId": "8e05aabd-d028-4d31-96d7-ef255e3a3e78",
103103
"permissions": {
104104
"keys": [
105105
"Get",

‎src/LoadTesting/LoadTesting.Autorest/test/env.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
{
2-
"loadTestResource1": "pwsh-loadtestingwb08",
3-
"identityid1": "/subscriptions/7c71b563-0dc0-4bc0-bcf6-06f8f0516c7a/resourcegroups/pwsh-test-rgwb08/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pwshtestid1",
2+
"Tenant": "213e87ed-8e08-4eb4-a63c-c073058f7b00",
43
"identityName2": "pwshtestid2",
5-
"pwshKeyVault": "pwsh-loadtesting-kvwb08",
6-
"SubscriptionId": "7c71b563-0dc0-4bc0-bcf6-06f8f0516c7a",
7-
"loadTestResource2": "pwsh-loadtestingep65",
8-
"cmkkeyid1": "https://pwsh-loadtesting-kvwb08.vault.azure.net:443/keys/testkey1/9b7211af1eea4bc481428ab1c2132645",
9-
"cmkkey1name": "testkey1",
10-
"Tenant": "72f988bf-86f1-41af-91ab-2d7cd011db47",
11-
"resourceGroup": "pwsh-test-rgwb08",
12-
"cmkkey2name": "testkey2",
4+
"cmkkeyid2": "https://pwsh-loadtesting-kv9k2t.vault.azure.net:443/keys/testkey2/474dee41356149b2ab6ebca6b9e0db4f",
5+
"cmkkeyid1": "https://pwsh-loadtesting-kv9k2t.vault.azure.net:443/keys/testkey1/1268f4afbe664329b74f9f2a66d29ca2",
6+
"identityid1": "/subscriptions/0e745469-49f8-48c9-873b-24ca87143db1/resourcegroups/pwsh-test-rg9k2t/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pwshtestid1",
137
"identityName1": "pwshtestid1",
8+
"SubscriptionId": "0e745469-49f8-48c9-873b-24ca87143db1",
149
"location": "westus2",
15-
"identityid2": "/subscriptions/7c71b563-0dc0-4bc0-bcf6-06f8f0516c7a/resourcegroups/pwsh-test-rgwb08/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pwshtestid2",
16-
"cmkkeyid2": "https://pwsh-loadtesting-kvwb08.vault.azure.net:443/keys/testkey2/d80c4fd7a1cf45a1aa29dbc445ff3662"
10+
"identityid2": "/subscriptions/0e745469-49f8-48c9-873b-24ca87143db1/resourcegroups/pwsh-test-rg9k2t/providers/Microsoft.ManagedIdentity/userAssignedIdentities/pwshtestid2",
11+
"resourceGroup": "pwsh-test-rg9k2t",
12+
"cmkkey1name": "testkey1",
13+
"pwshKeyVault": "pwsh-loadtesting-kv9k2t",
14+
"loadTestResource1": "pwsh-loadtesting9k2t",
15+
"cmkkey2name": "testkey2",
16+
"loadTestResource2": "pwsh-loadtestingc6uw"
1717
}

0 commit comments

Comments
 (0)