cherry-pick 586719f from generation

Author: yuc-Li

generated/HdInsightOnAks/HdInsightOnAks.Autorest/Az.HdInsightOnAks.psd1

@@ -11,7 +11,7 @@
   DotNetFrameworkVersion = '4.7.2'
   RequiredAssemblies = './bin/Az.HdInsightOnAks.private.dll'
   FormatsToProcess = './Az.HdInsightOnAks.format.ps1xml'
-  FunctionsToExport = 'Get-AzHdInsightOnAksAvailableClusterPoolVersion', 'Get-AzHdInsightOnAksAvailableClusterVersion', 'Get-AzHdInsightOnAksCluster', 'Get-AzHdInsightOnAksClusterAvailableUpgrade', 'Get-AzHdInsightOnAksClusterInstanceView', 'Get-AzHdInsightOnAksClusterJob', 'Get-AzHdInsightOnAksClusterPool', 'Get-AzHdInsightOnAksClusterPoolAvailableUpgrade', 'Get-AzHdInsightOnAksClusterServiceConfig', 'New-AzHdInsightOnAksCluster', 'New-AzHdInsightOnAksClusterConfigFileObject', 'New-AzHdInsightOnAksClusterHotfixUpgradeObject', 'New-AzHdInsightOnAksClusterPool', 'New-AzHdInsightOnAksClusterPoolAKSUpgradeObject', 'New-AzHdInsightOnAksClusterServiceConfigObject', 'New-AzHdInsightOnAksClusterServiceConfigsProfileObject', 'New-AzHdInsightOnAksFlinkJobObject', 'New-AzHdInsightOnAksNodeProfileObject', 'New-AzHdInsightOnAksSecretReferenceObject', 'New-AzHdInsightOnAksTrinoHiveCatalogObject', 'Remove-AzHdInsightOnAksCluster', 'Remove-AzHdInsightOnAksClusterPool', 'Resize-AzHdInsightOnAksCluster', 'Set-AzHdInsightOnAksClusterPool', 'Start-AzHdInsightOnAksClusterJob', 'Test-AzHdInsightOnAksLocationNameAvailability', 'Update-AzHdInsightOnAksCluster', 'Update-AzHdInsightOnAksClusterPool', 'Update-AzHdInsightOnAksClusterPoolTag'
+  FunctionsToExport = 'Get-AzHdInsightOnAksAvailableClusterPoolVersion', 'Get-AzHdInsightOnAksAvailableClusterVersion', 'Get-AzHdInsightOnAksCluster', 'Get-AzHdInsightOnAksClusterAvailableUpgrade', 'Get-AzHdInsightOnAksClusterInstanceView', 'Get-AzHdInsightOnAksClusterJob', 'Get-AzHdInsightOnAksClusterLibrary', 'Get-AzHdInsightOnAksClusterPool', 'Get-AzHdInsightOnAksClusterPoolAvailableUpgrade', 'Get-AzHdInsightOnAksClusterPoolUpgradeHistory', 'Get-AzHdInsightOnAksClusterServiceConfig', 'Get-AzHdInsightOnAksClusterUpgradeHistory', 'Invoke-AzHdInsightOnAksManageClusterLibrary', 'New-AzHdInsightOnAksCluster', 'New-AzHdInsightOnAksClusterConfigFileObject', 'New-AzHdInsightOnAksClusterHotfixUpgradeObject', 'New-AzHdInsightOnAksClusterMavenLibraryObject', 'New-AzHdInsightOnAksClusterPool', 'New-AzHdInsightOnAksClusterPoolAksPatchVersionUpgradeObject', 'New-AzHdInsightOnAksClusterPyPiLibraryObject', 'New-AzHdInsightOnAksClusterServiceConfigObject', 'New-AzHdInsightOnAksClusterServiceConfigsProfileObject', 'New-AzHdInsightOnAksFlinkJobObject', 'New-AzHdInsightOnAksManagedIdentityObject', 'New-AzHdInsightOnAksNodeProfileObject', 'New-AzHdInsightOnAksSecretReferenceObject', 'New-AzHdInsightOnAksTrinoHiveCatalogObject', 'Remove-AzHdInsightOnAksCluster', 'Remove-AzHdInsightOnAksClusterPool', 'Resize-AzHdInsightOnAksCluster', 'Set-AzHdInsightOnAksClusterPool', 'Start-AzHdInsightOnAksClusterJob', 'Test-AzHdInsightOnAksLocationNameAvailability', 'Update-AzHdInsightOnAksCluster', 'Update-AzHdInsightOnAksClusterPoolTag', 'Upgrade-AzHdInsightOnAksCluster', 'Upgrade-AzHdInsightOnAksClusterManualRollback', 'Upgrade-AzHdInsightOnAksClusterPool'
   PrivateData = @{
     PSData = @{
       Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'HdInsightOnAks'

src/HdInsightOnAks/HdInsightOnAks.Autorest/.gitattributes

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

src/HdInsightOnAks/HdInsightOnAks.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/HdInsightOnAks/HdInsightOnAks.Autorest/Az.HdInsightOnAks.psd1

@@ -0,0 +1,23 @@
+@{
+  GUID = '40af02af-b9a4-40ef-9dc5-5ea4d5e5e3be'
+  RootModule = './Az.HdInsightOnAks.psm1'
+  ModuleVersion = '0.1.0'
+  CompatiblePSEditions = 'Core', 'Desktop'
+  Author = 'Microsoft Corporation'
+  CompanyName = 'Microsoft Corporation'
+  Copyright = 'Microsoft Corporation. All rights reserved.'
+  Description = 'Microsoft Azure PowerShell: HdInsightOnAks cmdlets'
+  PowerShellVersion = '5.1'
+  DotNetFrameworkVersion = '4.7.2'
+  RequiredAssemblies = './bin/Az.HdInsightOnAks.private.dll'
+  FormatsToProcess = './Az.HdInsightOnAks.format.ps1xml'
+  FunctionsToExport = 'Get-AzHdInsightOnAksAvailableClusterPoolVersion', 'Get-AzHdInsightOnAksAvailableClusterVersion', 'Get-AzHdInsightOnAksCluster', 'Get-AzHdInsightOnAksClusterAvailableUpgrade', 'Get-AzHdInsightOnAksClusterInstanceView', 'Get-AzHdInsightOnAksClusterJob', 'Get-AzHdInsightOnAksClusterLibrary', 'Get-AzHdInsightOnAksClusterPool', 'Get-AzHdInsightOnAksClusterPoolAvailableUpgrade', 'Get-AzHdInsightOnAksClusterPoolUpgradeHistory', 'Get-AzHdInsightOnAksClusterServiceConfig', 'Get-AzHdInsightOnAksClusterUpgradeHistory', 'Invoke-AzHdInsightOnAksManageClusterLibrary', 'New-AzHdInsightOnAksCluster', 'New-AzHdInsightOnAksClusterConfigFileObject', 'New-AzHdInsightOnAksClusterHotfixUpgradeObject', 'New-AzHdInsightOnAksClusterMavenLibraryObject', 'New-AzHdInsightOnAksClusterPool', 'New-AzHdInsightOnAksClusterPoolAksPatchVersionUpgradeObject', 'New-AzHdInsightOnAksClusterPyPiLibraryObject', 'New-AzHdInsightOnAksClusterServiceConfigObject', 'New-AzHdInsightOnAksClusterServiceConfigsProfileObject', 'New-AzHdInsightOnAksFlinkJobObject', 'New-AzHdInsightOnAksManagedIdentityObject', 'New-AzHdInsightOnAksNodeProfileObject', 'New-AzHdInsightOnAksSecretReferenceObject', 'New-AzHdInsightOnAksTrinoHiveCatalogObject', 'Remove-AzHdInsightOnAksCluster', 'Remove-AzHdInsightOnAksClusterPool', 'Resize-AzHdInsightOnAksCluster', 'Set-AzHdInsightOnAksClusterPool', 'Start-AzHdInsightOnAksClusterJob', 'Test-AzHdInsightOnAksLocationNameAvailability', 'Update-AzHdInsightOnAksCluster', 'Update-AzHdInsightOnAksClusterPoolTag', 'Upgrade-AzHdInsightOnAksCluster', 'Upgrade-AzHdInsightOnAksClusterManualRollback', 'Upgrade-AzHdInsightOnAksClusterPool'
+  PrivateData = @{
+    PSData = @{
+      Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'HdInsightOnAks'
+      LicenseUri = 'https://aka.ms/azps-license'
+      ProjectUri = 'https://github.com/Azure/azure-powershell'
+      ReleaseNotes = ''
+    }
+  }
+}

src/HdInsightOnAks/HdInsightOnAks.Autorest/Properties/AssemblyInfo.cs

@@ -46,8 +46,8 @@ In this directory, run AutoRest:
 ### General settings
 > Values
 ``` yaml
-tag: package-preview-2023-11
-commit: 754d31188c080f20b8155acdf8b8fbd77dace467
+tag: package-preview-2024-05
+commit: c766bb559e93067acf5a852e63f7edcee75a2f5b
 require:
   - $(this-folder)/../../readme.azure.noprofile.md
   - $(repo)/specification/hdinsight/resource-manager/Microsoft.HDInsight/HDInsightOnAks/readme.md
@@ -71,6 +71,25 @@ default-exclude-tableview-properties: true
 ``` yaml
 identity-correction-for-post: true
 directive:
+  - model-cmdlet:
+    - model-name: ManagedIdentitySpec
+      cmdlet-name: New-AzHdInsightOnAksManagedIdentityObject
+    - model-name: ClusterHotfixUpgradeProperties
+      cmdlet-name: New-AzHdInsightOnAksClusterHotfixUpgradeObject
+    - model-name: ClusterPoolAksPatchVersionUpgradeProperties
+      cmdlet-name: New-AzHdInsightOnAksClusterPoolAksPatchVersionUpgradeObject
+    - model-name: NodeProfile
+      cmdlet-name: New-AzHdInsightOnAksNodeProfileObject
+    - model-name: SecretReference
+      cmdlet-name: New-AzHdInsightOnAksSecretReferenceObject
+    - model-name: HiveCatalogOption
+      cmdlet-name: New-AzHdInsightOnAksTrinoHiveCatalogObject
+    - model-name: ClusterConfigFile
+      cmdlet-name: New-AzHdInsightOnAksClusterConfigFileObject
+    - model-name: ClusterServiceConfig
+      cmdlet-name: New-AzHdInsightOnAksClusterServiceConfigObject
+    - model-name: ClusterServiceConfigsProfile
+      cmdlet-name: New-AzHdInsightOnAksClusterServiceConfigsProfileObject
   - from: swagger-document
     where: $.paths..responses.202
     transform: delete $.headers
@@ -122,7 +141,17 @@ directive:
       model-name: ClusterVersion
       property-name: PropertiesClusterVersion
     set:
-      property-name: ClusterVersionValue      
+      property-name: ClusterVersionValue
+  - where:
+      model-name: SecretReference
+      property-name: KeyVaultObjectName
+    set:
+      property-name: SecretName   
+  - where:
+      model-name: ClusterServiceConfig
+      property-name: Component
+    set:
+      property-name: ComponentName  
 # the below is cmdlet part      
   - where:
       verb: New|Set
@@ -309,5 +338,11 @@ directive:
     set:
       parameter-name: FlinkHiveCatalogDbUserName
 # The below customize the output model   
+  - where:
+      verb: Update
+      subject: [Cluster|ClusterPool] 
+      variant: [Upgrade|UpgradeExpanded|UpgradeViaIdentity|UpgradeViaIdentityExpanded|UpgradeViaJsonFilePath|UpgradeViaJsonString]
+    set:
+      verb: Upgrade
 
 ```

src/HdInsightOnAks/HdInsightOnAks.Autorest/README.md

@@ -1,6 +1,6 @@
 {
   "resourceType": "clusterpools/clusters",
-  "apiVersion": "2023-11-01-preview",
+  "apiVersion": "2024-05-01-preview",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.hdinsightonaks"
   },

src/HdInsightOnAks/HdInsightOnAks.Autorest/UX/Microsoft.HDInsight/clusterpools-clusters.json

@@ -1,6 +1,6 @@
 {
   "resourceType": "clusterpools",
-  "apiVersion": "2023-11-01-preview",
+  "apiVersion": "2024-05-01-preview",
   "learnMore": {
     "url": "https://learn.microsoft.com/powershell/module/az.hdinsightonaks"
   },

src/HdInsightOnAks/HdInsightOnAks.Autorest/UX/Microsoft.HDInsight/clusterpools.json

@@ -12,7 +12,7 @@
 # Code generated by Microsoft (R) AutoRest Code Generator.Changes may cause incorrect behavior and will be lost if the code
 # is regenerated.
 # ----------------------------------------------------------------------------------
-param([switch]$NotIsolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [switch]$UX)
+param([switch]$NotIsolated, [switch]$Run, [switch]$Test, [switch]$Docs, [switch]$Pack, [switch]$Code, [switch]$Release, [switch]$Debugger, [switch]$NoDocs, [switch]$UX, [Switch]$DisableAfterBuildTasks)
 $ErrorActionPreference = 'Stop'
 
 if($PSEdition -ne 'Core') {
@@ -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.HdInsightOnAks.private.dll'
+$dll = Join-Path $PSScriptRoot 'bin/Az.HdInsightOnAks.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.HdInsightOnAks.custom.psm1'
+$customPsm1 = Join-Path $PSScriptRoot 'custom/Az.HdInsightOnAks.custom.psm1'
 if(Test-Path $customPsm1) {
   $modulePaths = @($dll, $customPsm1)
 }
@@ -130,7 +130,7 @@ $examplesFolder = Join-Path $PSScriptRoot 'examples'
 $null = New-Item -ItemType Directory -Force -Path $examplesFolder
 
 Write-Host -ForegroundColor Green 'Creating cmdlets for specified models...'
-$modelCmdlets = @()
+$modelCmdlets = @(@{modelName="ManagedIdentitySpec"; cmdletName="New-AzHdInsightOnAksManagedIdentityObject"}, @{modelName="ClusterHotfixUpgradeProperties"; cmdletName="New-AzHdInsightOnAksClusterHotfixUpgradeObject"}, @{modelName="ClusterPoolAksPatchVersionUpgradeProperties"; cmdletName="New-AzHdInsightOnAksClusterPoolAksPatchVersionUpgradeObject"}, @{modelName="NodeProfile"; cmdletName="New-AzHdInsightOnAksNodeProfileObject"}, @{modelName="SecretReference"; cmdletName="New-AzHdInsightOnAksSecretReferenceObject"}, @{modelName="HiveCatalogOption"; cmdletName="New-AzHdInsightOnAksTrinoHiveCatalogObject"}, @{modelName="ClusterConfigFile"; cmdletName="New-AzHdInsightOnAksClusterConfigFileObject"}, @{modelName="ClusterServiceConfig"; cmdletName="New-AzHdInsightOnAksClusterServiceConfigObject"}, @{modelName="ClusterServiceConfigsProfile"; cmdletName="New-AzHdInsightOnAksClusterServiceConfigsProfileObject"})
 $modelCmdletFolder = Join-Path (Join-Path $PSScriptRoot './custom') 'autogen-model-cmdlets'
 if (Test-Path $modelCmdletFolder) {
   $null = Remove-Item -Force -Recurse -Path $modelCmdletFolder
@@ -177,4 +177,14 @@ if (Test-Path (Join-Path $PSScriptRoot 'generate-portal-ux.ps1'))
   . (Join-Path $PSScriptRoot 'generate-portal-ux.ps1')
 }
 
+if (-not $DisableAfterBuildTasks){
+  $afterBuildTasksPath = Join-Path $PSScriptRoot '../../../tools/BuildScripts/AdaptAutorestModule.ps1'
+  $afterBuildTasksArgs = ConvertFrom-Json '{"SubModuleName":"HdInsightOnAks","ModuleRootName":"$(root-module-name)"}' -AsHashtable
+  if(Test-Path -Path $afterBuildTasksPath -PathType leaf){
+    Write-Host -ForegroundColor Green 'Running after build tasks...'
+    . $afterBuildTasksPath @afterBuildTasksArgs
+  }
+}
+
+
 Write-Host -ForegroundColor Green '-------------Done-------------'

src/HdInsightOnAks/HdInsightOnAks.Autorest/build-module.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/HdInsightOnAks/HdInsightOnAks.Autorest/create-model-cmdlets.ps1

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