cherry-pick 3ca5ebc from generation

Author: azure-powershell-bot

src/AksArc/AksArc.Autorest/.gitattributes

@@ -0,0 +1 @@
+* text=auto

src/AksArc/AksArc.Autorest/.gitignore

@@ -0,0 +1,16 @@
+bin
+obj
+.vs
+generated
+internal
+exports
+tools
+custom/*.psm1
+custom/autogen-model-cmdlets
+test/*-TestResults.xml
+/*.ps1
+/*.ps1xml
+/*.psm1
+/*.snk
+/*.csproj
+/*.nuspec

src/AksArc/AksArc.Autorest/Az.AksArc.psd1

@@ -0,0 +1,23 @@
+@{
+  GUID = 'b12bc6f4-a4bf-4e80-89e4-f13e640b7f12'
+  RootModule = './Az.AksArc.psm1'
+  ModuleVersion = '0.1.0'
+  CompatiblePSEditions = 'Core', 'Desktop'
+  Author = 'Microsoft Corporation'
+  CompanyName = 'Microsoft Corporation'
+  Copyright = 'Microsoft Corporation. All rights reserved.'
+  Description = 'Microsoft Azure PowerShell: AksArc cmdlets'
+  PowerShellVersion = '5.1'
+  DotNetFrameworkVersion = '4.7.2'
+  RequiredAssemblies = './bin/Az.AksArc.private.dll'
+  FormatsToProcess = './Az.AksArc.format.ps1xml'
+  FunctionsToExport = 'Get-AzAksArcCluster', 'Get-AzAksArcClusterAdminKubeconfig', 'Get-AzAksArcClusterUpgrade', 'Get-AzAksArcClusterUserKubeconfig', 'Get-AzAksArcKubernetesVersion', 'Get-AzAksArcLog', 'Get-AzAksArcNodepool', 'Get-AzAksArcVirtualNetwork', 'Get-AzAksArcVMSku', 'Invoke-AzAksArcClusterUpgrade', 'New-AzAksArcCluster', 'New-AzAksArcNodepool', 'New-AzAksArcVirtualNetwork', 'Remove-AzAksArcCluster', 'Remove-AzAksArcNodepool', 'Remove-AzAksArcVirtualNetwork', 'Update-AzAksArcCluster', 'Update-AzAksArcNodepool'
+  PrivateData = @{
+    PSData = @{
+      Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'AksArc'
+      LicenseUri = 'https://aka.ms/azps-license'
+      ProjectUri = 'https://github.com/Azure/azure-powershell'
+      ReleaseNotes = ''
+    }
+  }
+}

src/AksArc/AksArc.Autorest/build-module.ps1

@@ -97,7 +97,7 @@ if(-not $Debugger) {
   $null = Remove-Item -Recurse -ErrorAction SilentlyContinue -Path (Join-Path $binFolder 'Debug'), (Join-Path $binFolder 'Release')
 }
 
-$dll = Join-Path $PSScriptRoot 'bin\Az.AksArc.private.dll'
+$dll = Join-Path $PSScriptRoot 'bin/Az.AksArc.private.dll'
 if(-not (Test-Path $dll)) {
   Write-Error "Unable to find output assembly in '$binFolder'."
 }
@@ -106,7 +106,7 @@ if(-not (Test-Path $dll)) {
 $null = Import-Module -Name $dll
 
 $modulePaths = $dll
-$customPsm1 = Join-Path $PSScriptRoot 'custom\Az.AksArc.custom.psm1'
+$customPsm1 = Join-Path $PSScriptRoot 'custom/Az.AksArc.custom.psm1'
 if(Test-Path $customPsm1) {
   $modulePaths = @($dll, $customPsm1)
 }
@@ -178,8 +178,8 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
 }
 
 if (-not $DisableAfterBuildTasks){
-  $afterBuildTasksPath = Join-Path $PSScriptRoot ''
-  $afterBuildTasksArgs = ConvertFrom-Json 'true' -AsHashtable
+  $afterBuildTasksPath = Join-Path $PSScriptRoot '../../../tools/BuildScripts/AdaptAutorestModule.ps1'
+  $afterBuildTasksArgs = ConvertFrom-Json '{"SubModuleName":"AksArc","ModuleRootName":"$(root-module-name)"}' -AsHashtable
   if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
     Write-Host -ForegroundColor Green 'Running after build tasks...'
     . $afterBuildTasksPath @afterBuildTasksArgs

src/AksArc/AksArc.Autorest/create-model-cmdlets.ps1

@@ -22,8 +22,8 @@ function CreateModelCmdlet {
         return
     }
 
-    $ModelCsPath = Join-Path (Join-Path $PSScriptRoot 'generated\api') 'Models'
-    $OutputDir = Join-Path $PSScriptRoot 'custom\autogen-model-cmdlets'
+    $ModelCsPath = Join-Path (Join-Path $PSScriptRoot 'generated/api') 'Models'
+    $OutputDir = Join-Path $PSScriptRoot 'custom/autogen-model-cmdlets'
     $null = New-Item -ItemType Directory -Force -Path $OutputDir
     if (''.length -gt 0) {
         $ModuleName = ''

src/AksArc/AksArc.Autorest/custom/Az.AksArc.custom.psm1

@@ -1,9 +1,9 @@
 # region Generated 
   # Load the private module dll
-  $null = Import-Module -PassThru -Name (Join-Path $PSScriptRoot '..\bin\Az.AksArc.private.dll')
+  $null = Import-Module -PassThru -Name (Join-Path $PSScriptRoot '../bin/Az.AksArc.private.dll')
 
   # Load the internal module
-  $internalModulePath = Join-Path $PSScriptRoot '..\internal\Az.AksArc.internal.psm1'
+  $internalModulePath = Join-Path $PSScriptRoot '../internal/Az.AksArc.internal.psm1'
   if(Test-Path $internalModulePath) {
     $null = Import-Module -Name $internalModulePath
   }

src/AksArc/AksArc.Autorest/custom/Invoke-AzAksArcClusterUpgrade.ps1

@@ -121,11 +121,9 @@ function Invoke-AzAksArcClusterUpgrade {
         if ($PSBoundParameters.ContainsKey("KubernetesVersion"))
         {   
             $Upgrades = Get-AzAksArcClusterUpgrade -ClusterName $ClusterName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
-            if ($upgrades.ControlPlaneProfileUpgrade.KubernetesVersion -contains $KubernetesVersion) {
-                continue
-            } else {
+            if (!($upgrades.ControlPlaneProfileUpgrade.KubernetesVersion -contains $KubernetesVersion)) {
                 throw "Kubernetes Version $KubernetesVersion is not a valid upgradable version."
-            }
+            } 
         } else {
             $Upgrades = Get-AzAksArcClusterUpgrade -ClusterName $ClusterName -ResourceGroupName $ResourceGroupName -SubscriptionId $SubscriptionId
             $UpgradeListLength = $upgrades.ControlPlaneProfileUpgrade.KubernetesVersion.Length
@@ -137,8 +135,7 @@ function Invoke-AzAksArcClusterUpgrade {
 
             $null = $PSBoundParameters.Add("KubernetesVersion", $LatestUpgrade)
         }
-    
+        
         Az.AksArc.internal\Update-AzAksArcCluster @PSBoundParameters
     }
-    }
-    
+    }

src/AksArc/AksArc.Autorest/custom/New-AzAksArcCluster.ps1

@@ -475,6 +475,8 @@ function New-AzAksArcCluster {
             $null = $PSBoundParameters.Add("LicenseProfileAzureHybridBenefit", $false)
         }
         $null = $PSBoundParameters.Remove("EnableAzureHybridBenefit")
+        $null = $PSBoundParameters.Remove("NodeTaint")
+        $null = $PSBoundParameters.Remove("NodeLabel")
         Az.AksArc.internal\New-AzAksArcCluster @PSBoundParameters
     }
     }

src/AksArc/AksArc.Autorest/custom/README.md

@@ -1,5 +1,5 @@
 # Custom
-This directory contains custom implementation for non-generated cmdlets for the `Az.AksArc` module. Both scripts (`.ps1`) and C# files (`.cs`) can be implemented here. They will be used during the build process in `build-module.ps1`, and create cmdlets into the `..\exports` folder. The only generated file into this folder is the `Az.AksArc.custom.psm1`. This file should not be modified.
+This directory contains custom implementation for non-generated cmdlets for the `Az.AksArc` module. Both scripts (`.ps1`) and C# files (`.cs`) can be implemented here. They will be used during the build process in `build-module.ps1`, and create cmdlets into the `../exports` folder. The only generated file into this folder is the `Az.AksArc.custom.psm1`. This file should not be modified.
 
 ## Info
 - Modifiable: yes
@@ -15,10 +15,10 @@ For C# cmdlets, they are compiled with the rest of the generated low-level cmdle
 For script cmdlets, these are loaded via the `Az.AksArc.custom.psm1`. Then, during the build process, this module is loaded and processed in the same manner as the C# cmdlets. The fundamental difference is the script cmdlets use the `ParameterSetName` attribute and C# cmdlets do not. To create a script cmdlet variant of a generated cmdlet, simply decorate all parameters in the script with the new `ParameterSetName` in the `Parameter` attribute. This will appropriately treat each parameter set as a separate variant when processed to be exported during the build.
 
 ## Purpose
-This allows the modules to have cmdlets that were not defined in the REST specification. It also allows combining logic using generated cmdlets. This is a level of customization beyond what can be done using the [readme configuration options](https://github.com/Azure/autorest/blob/master/docs/powershell/options.md) that are currently available. These custom cmdlets are then referenced by the cmdlets created at build-time in the `..\exports` folder.
+This allows the modules to have cmdlets that were not defined in the REST specification. It also allows combining logic using generated cmdlets. This is a level of customization beyond what can be done using the [readme configuration options](https://github.com/Azure/autorest/blob/master/docs/powershell/options.md) that are currently available. These custom cmdlets are then referenced by the cmdlets created at build-time in the `../exports` folder.
 
 ## Usage
-The easiest way currently to start developing custom cmdlets is to copy an existing cmdlet. For C# cmdlets, copy one from the `generated/cmdlets` folder. For script cmdlets, build the project using `build-module.ps1` and copy one of the scripts from the `..\exports` folder. After that, if you want to add new parameter sets, follow the guidelines in the `Details` section above. For implementing a new cmdlets, at minimum, please keep these parameters:
+The easiest way currently to start developing custom cmdlets is to copy an existing cmdlet. For C# cmdlets, copy one from the `generated/cmdlets` folder. For script cmdlets, build the project using `build-module.ps1` and copy one of the scripts from the `../exports` folder. After that, if you want to add new parameter sets, follow the guidelines in the `Details` section above. For implementing a new cmdlets, at minimum, please keep these parameters:
 - Break
 - DefaultProfile
 - HttpPipelineAppend
@@ -36,6 +36,6 @@ For processing the cmdlets, we've created some additional attributes:
 - `Microsoft.Azure.PowerShell.Cmdlets.AksArc.DoNotExportAttribute`
   - Used in C# and script cmdlets to suppress creating an exported cmdlet at build-time. These cmdlets will *not be exposed* by `Az.AksArc`.
 - `Microsoft.Azure.PowerShell.Cmdlets.AksArc.InternalExportAttribute`
-  - Used in C# cmdlets to route exported cmdlets to the `..\internal`, which are *not exposed* by `Az.AksArc`. For more information, see [README.md](..\internal/README.md) in the `..\internal` folder.
+  - Used in C# cmdlets to route exported cmdlets to the `../internal`, which are *not exposed* by `Az.AksArc`. For more information, see [README.md](../internal/README.md) in the `../internal` folder.
 - `Microsoft.Azure.PowerShell.Cmdlets.AksArc.ProfileAttribute`
   - Used in C# and script cmdlets to define which Azure profiles the cmdlet supports. This is only supported for Azure (`--azure`) modules.

src/AksArc/AksArc.Autorest/help/Az.AksArc.md renamed to src/AksArc/AksArc.Autorest/docs/Az.AksArc.md

@@ -1,6 +1,6 @@
 ---
 Module Name: Az.AksArc
-Module Guid: 0e2f96c9-10b2-4c68-b181-d29e3bdfdeed
+Module Guid: b12bc6f4-a4bf-4e80-89e4-f13e640b7f12
 Download Help Link: https://learn.microsoft.com/powershell/module/az.aksarc
 Help Version: 1.0.0.0
 Locale: en-US

src/AksArc/AksArc.Autorest/help/Get-AzAksArcCluster.md renamed to src/AksArc/AksArc.Autorest/docs/Get-AzAksArcCluster.md

@@ -1,5 +1,5 @@
 # Docs
-This directory contains the documentation of the cmdlets for the `Az.AksArc` module. To run documentation generation, use the `generate-help.ps1` script at the root module folder. Files in this folder will *always be overridden on regeneration*. To update documentation examples, please use the `..\examples` folder.
+This directory contains the documentation of the cmdlets for the `Az.AksArc` module. To run documentation generation, use the `generate-help.ps1` script at the root module folder. Files in this folder will *always be overridden on regeneration*. To update documentation examples, please use the `../examples` folder.
 
 ## Info
 - Modifiable: no
@@ -8,4 +8,4 @@ This directory contains the documentation of the cmdlets for the `Az.AksArc` mod
 - Packaged: yes
 
 ## Details
-The process of documentation generation loads `Az.AksArc` and analyzes the exported cmdlets from the module. It recognizes the [help comments](https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comment_based_help) that are generated into the scripts in the `..\exports` folder. Additionally, when writing custom cmdlets in the `..\custom` folder, you can use the help comments syntax, which decorate the exported scripts at build-time. The documentation examples are taken from the `..\examples` folder.
+The process of documentation generation loads `Az.AksArc` and analyzes the exported cmdlets from the module. It recognizes the [help comments](https://learn.microsoft.com/powershell/module/microsoft.powershell.core/about/about_comment_based_help) that are generated into the scripts in the `../exports` folder. Additionally, when writing custom cmdlets in the `../custom` folder, you can use the help comments syntax, which decorate the exported scripts at build-time. The documentation examples are taken from the `../examples` folder.

src/AksArc/AksArc.Autorest/help/Get-AzAksArcClusterAdminKubeconfig.md renamed to src/AksArc/AksArc.Autorest/docs/Get-AzAksArcClusterAdminKubeconfig.md

@@ -22,7 +22,7 @@ if(-not $NotIsolated) {
   return
 }
 
-$dll = Join-Path $PSScriptRoot 'bin\Az.AksArc.private.dll'
+$dll = Join-Path $PSScriptRoot 'bin/Az.AksArc.private.dll'
 if(-not (Test-Path $dll)) {
   Write-Error "Unable to find output assembly in '$binFolder'."
 }

src/AksArc/AksArc.Autorest/help/Get-AzAksArcClusterUpgrade.md renamed to src/AksArc/AksArc.Autorest/docs/Get-AzAksArcClusterUpgrade.md

@@ -1,3 +1,3 @@
 {
-  "generate_Id": "8592e13b-4bcc-4035-bad8-60abdadadc3a"
+  "generate_Id": "dfc356f4-00c0-4645-b4dd-6819bb3a7773"
 }