upgrade websites module to autorest v4

Author: Pan-Qi

src/Websites/Websites.Autorest/Az.Websites.nuspec

@@ -13,7 +13,7 @@
     <copyright>Microsoft Corporation. All rights reserved.</copyright>
     <tags>Azure ResourceManager ARM PSModule $(service-name)</tags>
     <dependencies>
-      <dependency id="Az.Accounts" version="2.2.3" />
+      <dependency id="Az.Accounts" version="2.7.5" />
     </dependencies>
   </metadata>
   <files>
@@ -23,9 +23,9 @@
     <!-- https://github.com/NuGet/Home/issues/3584 -->
     <file src="bin/Az.Websites.private.dll" target="bin" />
     <file src="bin\Az.Websites.private.deps.json" target="bin" />
-    <file src="internal\**\*.*" exclude="internal\readme.md" target="internal" />
-    <file src="custom\**\*.*" exclude="custom\readme.md;custom\**\*.cs" target="custom" />
-    <file src="docs\**\*.md" exclude="docs\readme.md" target="docs" />
+    <file src="internal\**\*.*" exclude="internal\README.md" target="internal" />
+    <file src="custom\**\*.*" exclude="custom\README.md;custom\**\*.cs" target="custom" />
+    <file src="docs\**\*.md" exclude="docs\README.md" target="docs" />
     <file src="exports\**\ProxyCmdletDefinitions.ps1" target="exports" />
     <file src="utils\**\*.*" target="utils" />
   </files>

src/Websites/Websites.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 - Websites")]
+[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/Websites/Websites.Autorest/README.md

@@ -37,13 +37,6 @@ input-file:
 title: Websites
 module-version: 0.1.0
 subject-prefix: $(service-name)
-identity-correction-for-post: true
-resourcegroup-append: true
-nested-object-to-string: true
-
-# For new modules, please avoid setting 3.x using the use-extension method and instead, use 4.x as the default option
-use-extension:
-  "@autorest/powershell": "3.x"
 
 directive:
   #Modify operationId
@@ -206,70 +199,8 @@ directive:
       verb: Unregister
       subject: BuildUserProvidedFunctionApp
 
-# Remove variant
-  # Following is two common directive which are normally required in all the RPs
-  # 1. Remove the unexpanded parameter set
-  # 2. For New-* cmdlets, ViaIdentity is not required, so CreateViaIdentityExpanded is removed as well
-  - where:
-      variant: ^CreateViaIdentityExpanded$|^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: CustomDomain
-
-    remove: true
-  - where:
-      verb: Test
-      variant: ^Validate$|^ValidateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: CustomDomain
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: BuildAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: FunctionAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: Setting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: BuildFunctionAppSetting
-    remove: true
-
-  - where:
-      variant: ^Create$|^CreateViaIdentity$|^Update$|^UpdateViaIdentity$
-      # We got to keep the Create variant of CustomDomain because it's special that it doesn't have a
-      # CreateExpanded variant, because the only parameters are all in URL rather than request body
-      subject: UserRoleInvitationLink
-    remove: true
-
-  - where:
-      verb: New
-      subject: ^$
-      variant: ^Create$|^CreateViaIdentity$|^CreateViaIdentityExpanded$
-    remove: true
-
   - where:
-      verb: Update
-      subject: null
-      variant: ^Update$|^UpdateViaIdentity$
+      variant: ^(Create|Update)(?!.*?(Expanded|JsonFilePath|JsonString))
     remove: true
 
   - where:
@@ -281,7 +212,7 @@ directive:
   - where:
       verb: Register
       subject: UserProvidedFunctionApp
-      variant: ^Register$|^Register1$|^RegisterViaIdentity$|^RegisterViaIdentity1$|^RegisterViaIdentityExpanded$|^RegisterViaIdentityExpanded1$
+      variant: ^Register(?!.*?(JsonFilePath|JsonString))
     remove: true
 
 # Rename parameters

src/Websites/Websites.Autorest/custom/New-AzStaticWebApp.ps1

@@ -28,7 +28,7 @@ PS C:\> {{ Add code here }}
 {{ Add output here }}
 
 .Outputs
-Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.Api20201201.IStaticSiteArmResource
+Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IStaticSiteArmResource
 .Notes
 COMPLEX PARAMETER PROPERTIES
 
@@ -42,7 +42,7 @@ SKUCAPABILITY <ICapability[]>: Capabilities of the SKU, e.g., is traffic manager
 https://learn.microsoft.com/powershell/module/az.websites/new-azstaticwebapp
 #>
 function New-AzStaticWebApp {
-[OutputType([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.Api20201201.IStaticSiteArmResource])]
+[OutputType([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IStaticSiteArmResource])]
 [CmdletBinding(DefaultParameterSetName='CreateExpanded', PositionalBinding=$false, SupportsShouldProcess, ConfirmImpact='Medium')]
 param(
     [Parameter(Mandatory)]
@@ -135,7 +135,7 @@ param(
 
     [Parameter()]
     [Microsoft.Azure.PowerShell.Cmdlets.Websites.Category('Body')]
-    [Microsoft.Azure.PowerShell.Cmdlets.Websites.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.Api20201201.IManagedServiceIdentityUserAssignedIdentities]))]
+    [Microsoft.Azure.PowerShell.Cmdlets.Websites.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IManagedServiceIdentityUserAssignedIdentities]))]
     [System.Collections.Hashtable]
     # The list of user assigned identities associated with the resource.
     # The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}
@@ -187,7 +187,7 @@ param(
 
     [Parameter()]
     [Microsoft.Azure.PowerShell.Cmdlets.Websites.Category('Body')]
-    [Microsoft.Azure.PowerShell.Cmdlets.Websites.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.Api20201201.IResourceTags]))]
+    [Microsoft.Azure.PowerShell.Cmdlets.Websites.Runtime.Info(PossibleTypes=([Microsoft.Azure.PowerShell.Cmdlets.Websites.Models.IResourceTags]))]
     [System.Collections.Hashtable]
     # Resource tags.
     ${Tag},