Skip to content

Commit 5b63f91

Browse files
committed
Fix UserIdentity issue for VMSS
1 parent cc655ce commit 5b63f91

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,7 @@ function Test-VirtualMachineScaleSetIdentity
10111011
Assert-AreEqual "SystemAssigned" $result.Identity.Type;
10121012
Assert-NotNull $result.Identity.PrincipalId;
10131013
Assert-NotNull $result.Identity.TenantId;
1014+
Assert-Null $result.Identity.UserAssignedIdentities;
10141015

10151016
# Validate Network Profile
10161017
Assert-AreEqual 'test' $result.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].Name;
@@ -1046,6 +1047,7 @@ function Test-VirtualMachineScaleSetIdentity
10461047
Assert-AreEqual "SystemAssigned" $vmssResult.Identity.Type;
10471048
Assert-NotNull $vmssResult.Identity.PrincipalId;
10481049
Assert-NotNull $vmssResult.Identity.TenantId;
1050+
Assert-Null $result.Identity.UserAssignedIdentities;
10491051

10501052
$vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
10511053
Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;

src/ResourceManager/Compute/Commands.Compute/Generated/Models/ComputeAutoMapperProfile.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,10 @@ private static void Initialize()
137137
cfg.CreateMap<TO.PSRunCommandDocumentBase, FROM.RunCommandDocumentBase>();
138138
cfg.CreateMap<FROM.RollingUpgradeStatusInfo, TO.PSRollingUpgradeStatusInfo>();
139139
cfg.CreateMap<TO.PSRollingUpgradeStatusInfo, FROM.RollingUpgradeStatusInfo>();
140-
cfg.CreateMap<FROM.VirtualMachineScaleSetIdentity, TO.PSVirtualMachineScaleSetIdentity>();
141-
cfg.CreateMap<TO.PSVirtualMachineScaleSetIdentity, FROM.VirtualMachineScaleSetIdentity>();
140+
cfg.CreateMap<FROM.VirtualMachineScaleSetIdentity, TO.PSVirtualMachineScaleSetIdentity>()
141+
.ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
142+
cfg.CreateMap<TO.PSVirtualMachineScaleSetIdentity, FROM.VirtualMachineScaleSetIdentity>()
143+
.ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
142144
cfg.CreateMap<FROM.VirtualMachineScaleSet, TO.PSVirtualMachineScaleSet>()
143145
.ForMember(c => c.Zones, o => o.Condition(r => (r.Zones != null)));
144146
cfg.CreateMap<TO.PSVirtualMachineScaleSet, FROM.VirtualMachineScaleSet>()

0 commit comments

Comments
 (0)