Merge pull request #7770 from hyonholee/november

[Compute] Fix identity issue for system assigned identity.

Author: markcowl

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

@@ -1047,11 +1047,20 @@ function Test-VirtualMachineScaleSetIdentity
         Assert-AreEqual "SystemAssigned" $vmssResult.Identity.Type;
         Assert-NotNull $vmssResult.Identity.PrincipalId;
         Assert-NotNull $vmssResult.Identity.TenantId;
-        Assert-Null $result.Identity.UserAssignedIdentities;
+        Assert-Null $vmssResult.Identity.UserAssignedIdentities;
 
         $vmssInstanceViewResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -InstanceView;
         Assert-AreEqual "ProvisioningState/succeeded" $vmssInstanceViewResult.VirtualMachine.StatusesSummary[0].Code;
         $output = $vmssInstanceViewResult | Out-String
+
+        Update-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName -VirtualMachineScaleSet $vmssResult;
+        $vmssResult = Get-AzureRmVmss -ResourceGroupName $rgname -VMScaleSetName $vmssName;
+
+        # Validate VMSS Identity
+        Assert-AreEqual "SystemAssigned" $vmssResult.Identity.Type;
+        Assert-NotNull $vmssResult.Identity.PrincipalId;
+        Assert-NotNull $vmssResult.Identity.TenantId;
+        Assert-Null $vmssResult.Identity.UserAssignedIdentities;
     }
     finally
     {

src/ResourceManager/Compute/Commands.Compute.Test/SessionRecords/Microsoft.Azure.Commands.Compute.Test.ScenarioTests.VirtualMachineScaleSetTests/TestVirtualMachineScaleSetIdentity.json

@@ -19,6 +19,7 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed identity issue for SystemAssigned identity
 
 ## Version 5.8.0
 * Add Add-AzureRmVmssVMDataDisk and Remove-AzureRmVmssVMDataDisk cmdlets

src/ResourceManager/Compute/Commands.Compute/ChangeLog.md

@@ -191,9 +191,15 @@ private static void Initialize()
 
                 // PSVirtualMachineIdentity <=> VirtualMachineIdentity
                 cfg.CreateMap<FROM.VirtualMachineIdentity, TO.PSVirtualMachineIdentity>()
-                    .ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
+                    .AfterMap((src, dest) =>
+                    {
+                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
+                    });
                 cfg.CreateMap<TO.PSVirtualMachineIdentity, FROM.VirtualMachineIdentity>()
-                    .ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
+                    .AfterMap((src, dest) =>
+                    {
+                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
+                    });
             });
 
             _mapper = config.CreateMapper();

src/ResourceManager/Compute/Commands.Compute/Common/ComputeAutoMapperProfile.cs

@@ -138,9 +138,15 @@ private static void Initialize()
                 cfg.CreateMap<FROM.RollingUpgradeStatusInfo, TO.PSRollingUpgradeStatusInfo>();
                 cfg.CreateMap<TO.PSRollingUpgradeStatusInfo, FROM.RollingUpgradeStatusInfo>();
                 cfg.CreateMap<FROM.VirtualMachineScaleSetIdentity, TO.PSVirtualMachineScaleSetIdentity>()
-                    .ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
+                    .AfterMap((src, dest) =>
+                    {
+                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
+                    });
                 cfg.CreateMap<TO.PSVirtualMachineScaleSetIdentity, FROM.VirtualMachineScaleSetIdentity>()
-                    .ForMember(c => c.UserAssignedIdentities, o => o.Condition(r => (r.UserAssignedIdentities != null)));
+                    .AfterMap((src, dest) =>
+                    {
+                        if (src.UserAssignedIdentities == null) dest.UserAssignedIdentities = null;
+                    });
                 cfg.CreateMap<FROM.VirtualMachineScaleSet, TO.PSVirtualMachineScaleSet>()
                     .ForMember(c => c.Zones, o => o.Condition(r => (r.Zones != null)));
                 cfg.CreateMap<TO.PSVirtualMachineScaleSet, FROM.VirtualMachineScaleSet>()