update managed identity logic

Author: JoyerJin

src/Workloads/SapVirtualInstance.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonString.cs

@@ -403,7 +403,6 @@ protected override void ProcessRecord()
                 try
                 {
                     await ((Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.IEventListener)this).Signal(Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.Events.CmdletBeforeAPICall); if( ((Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.IEventListener)this).Token.IsCancellationRequested ) { return; }
-                    this.PreProcessManagedIdentityParameters();
                     await this.Client.SapVirtualInstancesCreateViaJsonString(SubscriptionId, ResourceGroupName, Name, JsonString, onOk, onDefault, this, Pipeline);
                     await ((Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.IEventListener)this).Signal(Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.Events.CmdletAfterAPICall); if( ((Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Runtime.IEventListener)this).Token.IsCancellationRequested ) { return; }
                 }
@@ -493,30 +492,5 @@ protected override void StopProcessing()
                 WriteObject((await response));
             }
         }
-        
-        private void PreProcessManagedIdentityParameters()
-        {
-            if (this.UserAssignedIdentity?.Length > 0)
-            {
-                // calculate UserAssignedIdentity
-                _resourceBody.IdentityUserAssignedIdentity.Clear();
-                foreach( var id in this.UserAssignedIdentity )
-                {
-                    _resourceBody.IdentityUserAssignedIdentity.Add(id, new Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Models.UserAssignedIdentity());
-                }
-            }
-            // calculate IdentityType
-            if (this.UserAssignedIdentity?.Length > 0)
-            {
-                if ("SystemAssigned".Equals(_resourceBody.IdentityType, StringComparison.InvariantCultureIgnoreCase))
-                {
-                    _resourceBody.IdentityType = "SystemAssigned,UserAssigned";
-                }
-                else
-                {
-                    _resourceBody.IdentityType = "UserAssigned";
-                }
-            }
-        }
     }
 }

src/Workloads/SapVirtualInstance.Autorest/custom/New-AzWorkloadsSapVirtualInstance/New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath.ps1

@@ -198,14 +198,39 @@ function New-AzWorkloadsSapVirtualInstance_CreateWithJsonTemplatePath {
             }
 
             $bodyHashTable.identity = @{}
-            if($PSBoundParameters.ContainsKey('IdentityType')) {
-              $bodyHashTable.identity.type = $IdentityType.ToString()
-              $null = $PSBoundParameters.Remove('IdentityType');
-            }
-            
-            if($PSBoundParameters.ContainsKey('UserAssignedIdentity')) {
-              $bodyHashTable.identity.userAssignedIdentities = $UserAssignedIdentity
-              $null = $PSBoundParameters.Remove('UserAssignedIdentity');
+            if ($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity') -or $PSBoundParameters.ContainsKey('UserAssignedIdentity')){
+              $supportsSystemAssignedIdentity = $PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity')
+              $supportsUserAssignedIdentity = $PSBoundParameters.ContainsKey("UserAssignedIdentity") -and $UserAssignedIdentity.Length -gt 0
+
+              # calculate IdentityType
+              if (($supportsSystemAssignedIdentity -and $supportsUserAssignedIdentity)) {
+                  $bodyHashTable.identity.type = "SystemAssigned,UserAssigned"
+              }
+              elseif ($supportsUserAssignedIdentity -and (-not $supportsSystemAssignedIdentity)) {
+                  $bodyHashTable.identity.type = "UserAssigned"
+              }
+              elseif ((-not $supportsUserAssignedIdentity) -and $supportsSystemAssignedIdentity) {
+                  $bodyHashTable.identity.type = "SystemAssigned"
+              }
+              else {
+                  $bodyHashTable.identity.type = "None"
+              }
+
+              # If user input UserAssignedIdentity
+              if ($PSBoundParameters.ContainsKey('UserAssignedIdentity')) {
+                  $userIdentityObject = [Microsoft.Azure.PowerShell.Cmdlets.Workloads.SapVirtualInstance.Models.UserAssignedIdentity]::New()
+                  $IdentityUserAssignedIdentity = @{}
+                  foreach ($item in $PSBoundParameters.UserAssignedIdentity) {
+                      $IdentityUserAssignedIdentity.Add($item, $userIdentityObject )
+                  }
+                  $bodyHashTable.identity.userAssignedIdentities = $IdentityUserAssignedIdentity
+                  $null = $PSBoundParameters.Remove('UserAssignedIdentity')
+              }
+
+              # remove EnableSystemAssignedIdentity
+              if ($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity')) {
+                  $null = $PSBoundParameters.Remove("EnableSystemAssignedIdentity")
+              }
             }
 
             if ($bodyHashTable.identity.Count -eq 0) {