[Astro] Update astro custom logic for New-AzAstroOrganization and Update-AzAstroOrganization

src/Astro/Astro.Autorest/.gitignore

@@ -8,7 +8,9 @@ tools
 custom/*.psm1
 custom/autogen-model-cmdlets
 test/*-TestResults.xml
+license.txt
 /*.ps1
+/*.psd1
 /*.ps1xml
 /*.psm1
 /*.snk

src/Astro/Astro.Autorest/Properties/AssemblyInfo.cs

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the Apache License, Version 2.0 (the ""License"");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an ""AS IS"" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
+// is regenerated.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: System.Reflection.AssemblyCompanyAttribute("Microsoft")]
+[assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © Microsoft")]
+[assembly: System.Reflection.AssemblyProductAttribute("Microsoft Azure PowerShell")]
+[assembly: System.Reflection.AssemblyTitleAttribute("Microsoft Azure PowerShell - Astro")]
+[assembly: System.Reflection.AssemblyFileVersionAttribute("0.1.0.0")]
+[assembly: System.Reflection.AssemblyVersionAttribute("0.1.0.0")]
+[assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)]
+[assembly: System.CLSCompliantAttribute(false)]

src/Astro/Astro.Autorest/README.md

@@ -48,6 +48,7 @@ subject-prefix: $(service-name)
 # Disable transform IdentityType as GET+PUT can not replace patch
 # 1. Organizations_CreateOrUpdate can not update resources
 # 2. the input schemas of PUT and PATCH are different
+flatten-userassignedidentity: false
 disable-transform-identity-type: true
 
 directive:
@@ -74,4 +75,7 @@ directive:
   - where:
       verb: Update
     hide: true
+  - from: UserAssignedIdentities.dictionary.cs
+    where: $
+    transform: $ = $.replace('null != property.Key && null != property.Value', 'null != property.Key');
 ```

src/Astro/Astro.Autorest/custom/New-AzAstroOrganization.ps1

@@ -100,7 +100,7 @@ function New-AzAstroOrganization {
         # Last name of the user
         ${UserLastName},
 
-        [Parameter(ParameterSetName='CreateExpanded')]
+        [Parameter(ParameterSetName = 'CreateExpanded')]
         [Microsoft.Azure.PowerShell.Cmdlets.Astro.Category('Body')]
         [System.Management.Automation.SwitchParameter]
         # Decides if enable a system assigned identity for the resource.
@@ -282,7 +282,7 @@ function New-AzAstroOrganization {
     )
 
     process {
-        if($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity') -or $PSBoundParameters.ContainsKey('UserAssignedIdentity') ){
+        if ($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity') -or $PSBoundParameters.ContainsKey('UserAssignedIdentity')) {
             $supportsSystemAssignedIdentity = $PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity')
             $supportsUserAssignedIdentity = $PSBoundParameters.ContainsKey("UserAssignedIdentity") -and $UserAssignedIdentity.Length -gt 0
 
@@ -299,9 +299,20 @@ function New-AzAstroOrganization {
             else {
                 $PSBoundParameters.Add("IdentityType", "None")
             }
-
+
+            # If user input UserAssignedIdentity
+            if ($PSBoundParameters.ContainsKey('UserAssignedIdentity')) {
+                $userIdentityObject = [Microsoft.Azure.PowerShell.Cmdlets.Astro.Models.UserAssignedIdentity]::New()
+                $PSBoundParameters.IdentityUserAssignedIdentity = @{}
+                foreach ($item in $PSBoundParameters.UserAssignedIdentity) {
+                    $PSBoundParameters.IdentityUserAssignedIdentity.Add($item, $userIdentityObject )
+                }
+
+                $null = $PSBoundParameters.Remove('UserAssignedIdentity')
+            }
+
             # remove EnableSystemAssignedIdentity
-            if($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity')) {
+            if ($PSBoundParameters.ContainsKey('EnableSystemAssignedIdentity')) {
                 $null = $PSBoundParameters.Remove("EnableSystemAssignedIdentity")
             }
         }