Migrate AksArc from generation to main (#26343)

* Move AksArc to main

* Update ChangeLog.md

---------

Co-authored-by: azure-powershell-bot <[email protected]>
Co-authored-by: NanxiangLiu <[email protected]>

Author: 3 people

src/AksArc/AksArc.Autorest/README.md

@@ -89,6 +89,20 @@ directive:
     transform: >-
       $["operationId"] = "KubernetesVersions_Create"
 
+# Fix fields in Get-KubernetesVersion
+  - from: swagger-document
+    where: $.definitions.KubernetesVersionReadiness.properties.osType
+    transform: >-
+      delete $.readOnly
+  - from: swagger-document
+    where: $.definitions.KubernetesVersionReadiness.properties.ready
+    transform: >-
+      delete $.readOnly
+  - from: swagger-document
+    where: $.definitions.KubernetesVersionReadiness.properties.errorMessage
+    transform: >-
+      delete $.readOnly
+
 # Rename Subjects
   - where:
       subject: AgentPool

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

@@ -75,6 +75,8 @@ if(-not $NotIsolated -and -not $Debugger) {
 $binFolder = Join-Path $PSScriptRoot 'bin'
 $objFolder = Join-Path $PSScriptRoot 'obj'
 
+$isAzure = [System.Convert]::ToBoolean('true')
+
 if(-not $Debugger) {
   Write-Host -ForegroundColor Green 'Cleaning build folders...'
   $null = Remove-Item -Recurse -ErrorAction SilentlyContinue -Path $binFolder, $objFolder
@@ -151,7 +153,7 @@ if($NoDocs) {
     $null = Get-ChildItem -Path $docsFolder -Recurse -Exclude 'README.md' | Remove-Item -Recurse -ErrorAction SilentlyContinue
   }
   $null = New-Item -ItemType Directory -Force -Path $docsFolder
-  $addComplexInterfaceInfo = ![System.Convert]::ToBoolean('true')
+  $addComplexInterfaceInfo = !$isAzure
   Export-ProxyCmdlet -ModuleName $moduleName -ModulePath $modulePaths -ExportsFolder $exportsFolder -InternalFolder $internalFolder -ModuleDescription $moduleDescription -DocsFolder $docsFolder -ExamplesFolder $examplesFolder -ModuleGuid $guid -AddComplexInterfaceInfo:$addComplexInterfaceInfo
 }
 
@@ -186,5 +188,4 @@ if (-not $DisableAfterBuildTasks){
   }
 }
 
-
-Write-Host -ForegroundColor Green '-------------Done-------------'
+Write-Host -ForegroundColor Green '-------------Done-------------'

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

@@ -83,7 +83,7 @@ function New-AzAksArcCluster {
         # /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureStackHCI/logicalNetworks/{logicalNetworkName}
         ${VnetId},
 
-        [Parameter(Mandatory)]
+        [Parameter()]
         [Microsoft.Azure.PowerShell.Cmdlets.AksArc.Category('Body')]
         [System.String]
         # IP address of the Kubernetes API server
@@ -418,7 +418,7 @@ function New-AzAksArcCluster {
 
         # Network Validations
         # Logical Network
-        if ($VnetId -match $logicalNetworkArmIDRegex) {
+        if (($PSBoundParameters.ContainsKey('ControlPlaneIP')) -And ($VnetId -match $logicalNetworkArmIDRegex)) {
             $response = Invoke-AzRestMethod -Path "$VnetId/?api-version=2024-01-01" -Method GET
             if ($response.StatusCode -eq 200) {
                 $lnet = ($response.Content | ConvertFrom-Json)
@@ -467,16 +467,38 @@ function New-AzAksArcCluster {
         # Configure Agent Pool
         $AgentPoolProfile = CreateAgentPoolProfile -EnableAutoScaling:$EnableAutoScaling -MinCount $MinCount -MaxCount $MaxCount -MaxPod $MaxPod -NodeTaint $NodeTaint -NodeLabel $NodeLabel
         $null = $PSBoundParameters.Add("AgentPoolProfile", $AgentPoolProfile)
+        
+        if ($PSBoundParameters.ContainsKey('EnableAzureHybridBenefit')) {
+            $null = $PSBoundParameters.Remove("EnableAzureHybridBenefit")
+        }
+
+        if ($PSBoundParameters.ContainsKey('NodeTaint')) {
+            $null = $PSBoundParameters.Remove("NodeTaint")
+        }
+
+        if ($PSBoundParameters.ContainsKey('NodeLabel')) {
+            $null = $PSBoundParameters.Remove("NodeLabel")
+        }
+
+        if ($PSBoundParameters.ContainsKey('MinCount')) {
+            $null = $PSBoundParameters.Remove("MinCount")
+        }
+
+        if ($PSBoundParameters.ContainsKey('MaxCount')) {
+            $null = $PSBoundParameters.Remove("MaxCount")
+        }
+
+        if ($PSBoundParameters.ContainsKey('MaxPod')) {
+            $null = $PSBoundParameters.Remove("MaxPod")
+        }
 
         # Create Provisioned Cluster
         if ($EnableAzureHybridBenefit) {
             $null = $PSBoundParameters.Add("LicenseProfileAzureHybridBenefit", $true)
         } else {
             $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/Remove-AzAksArcCluster.ps1

@@ -110,18 +110,20 @@ param(
 )
 
 process {
-    $APIVersion = "2024-01-01"
-    $null = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$APIVersion" -Method DELETE
-
     # Query status until delete is complete
     $stopLoop = $false
     do 
     {
-        $response = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$APIVersion" -Method GET
-
-        if ($response.StatusCode -eq 404) {
-            $stopLoop = $true
-            return
+        try {
+            $null = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$ConnectedClusterAPIVersion" -Method DELETE
+            $response = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$ConnectedClusterAPIVersion" -Method GET
+            if (!$response -or ($response.StatusCode -eq 404)) {
+                $stopLoop = $true
+                return
+            }
+        }
+        catch {
+            Write-Error $_
         }
 
         Start-Sleep -Seconds 30

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

@@ -309,6 +309,7 @@ process {
 
     if ($ShouldUpdateConnectedCluster) {
         UpdateConnectedCluster -SubscriptionId $SubscriptionId -ResourceGroupName $ResourceGroupName -ClusterName $ClusterName -AdminGroupObjectID $AdminGroupObjectID
+        $null = $PSBoundParameters.Remove("AdminGroupObjectID")
     }
 
     # Update Default Nodepool

src/AksArc/AksArc.Autorest/custom/helpers/Helpers.ps1

@@ -53,7 +53,6 @@ function CreateConnectedCluster {
         $EnableAzureRbacStr = "true"
     } 
 
-    $APIVersion = "2024-01-01"
     $json = 
 @"
 {
@@ -75,7 +74,7 @@ function CreateConnectedCluster {
     }
 }
 "@  
-    $null = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$APIVersion" -Method PUT -payload $json
+    $null = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$ConnectedClusterAPIVersion" -Method PUT -payload $json
 }
 
 function UpdateConnectedCluster {
@@ -87,9 +86,7 @@ function UpdateConnectedCluster {
         [System.String[]] ${AdminGroupObjectID}
     )
 
-
-    $APIVersion = "2024-01-01"
-    $ConnectedClusterResource = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$APIVersion" -Method GET
+    $ConnectedClusterResource = Invoke-AzRestMethod -Path "/subscriptions/$SubscriptionId/resourceGroups/$ResourceGroupName/providers/Microsoft.Kubernetes/connectedClusters/$ClusterName/?api-version=$ConnectedClusterAPIVersion" -Method GET
 
     $Location = ($ConnectedClusterResource.Content | ConvertFrom-Json).location
     $EnableAzureRbac = ($ConnectedClusterResource.Content | ConvertFrom-Json).properties.aadProfile.enableAzureRBAC

src/AksArc/AksArc.Autorest/custom/helpers/Variables.ps1

@@ -0,0 +1,2 @@
+#Connected Cluster API Version to use
+$ConnectedClusterAPIVersion = "2024-01-01"

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

@@ -100,7 +100,7 @@ param(
     # /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureStackHCI/logicalNetworks/{logicalNetworkName}
     ${VnetId},
 
-    [Parameter(Mandatory)]
+    [Parameter()]
     [Microsoft.Azure.PowerShell.Cmdlets.AksArc.Category('Body')]
     [System.String]
     # IP address of the Kubernetes API server

src/AksArc/AksArc.Autorest/exports/ProxyCmdletDefinitions.ps1

@@ -2112,7 +2112,7 @@ param(
     # /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.AzureStackHCI/logicalNetworks/{logicalNetworkName}
     ${VnetId},
 
-    [Parameter(Mandatory)]
+    [Parameter()]
     [Microsoft.Azure.PowerShell.Cmdlets.AksArc.Category('Body')]
     [System.String]
     # IP address of the Kubernetes API server