Merge Swagger and TypeSpec code generation into one script

eng/pipelines/templates/jobs/ci.yml

@@ -349,21 +349,13 @@ jobs:
           JdkVersion: ${{ parameters.JavaBuildVersion }}
 
       - task: PowerShell@2
-        displayName: Verify Code Generation
+        displayName: Verify Autorest and TypeSpec Code Generation
         inputs:
           pwsh: true
           filePath: $(Build.SourcesDirectory)/eng/scripts/Compare-CurrentToCodegeneration.ps1
           arguments: >
             -Directory sdk/${{ parameters.ServiceDirectory }}
-
-      - task: PowerShell@2
-        displayName: Verify TypeSpec Code Generation
-        continueOnError: ${{ eq(parameters.IgnoreVerifyTypeSpecCodeGenerationError, 'true') }}
-        inputs:
-          pwsh: true
-          filePath: $(Build.SourcesDirectory)/eng/scripts/TypeSpec-Compare-CurrentToCodegeneration.ps1
-          arguments: >
-            -Directory sdk/${{ parameters.ServiceDirectory }}
+            -IgnoreVerifyTypeSpecCodeGenerationError $${{ parameters.IgnoreVerifyTypeSpecCodeGenerationError }}
 
       - template: /eng/pipelines/templates/steps/run-and-validate-linting.yml
         parameters:

eng/scripts/Compare-CurrentToCodegeneration.ps1

@@ -1,53 +1,127 @@
 <#
 .SYNOPSIS
 Invokes all 'Update-Codegeneration.ps1' scripts found within the specified directory and compares it against current
-code.
+code and syncs TypeSpec defintion and generates SDK for RPs under the input directory and have 'tsp-location.yaml'.
 
 .DESCRIPTION
 Invokes all 'Update-Codegeneration.ps1' scripts found within the specified directory and compares it against current
-code.
+code and syncs TypeSpec defintion and generates SDK for RPs under the input directory and have 'tsp-location.yaml'.
 
 If the regenerated code is different than the current code this will tell the differences, the files the differences
 are in, and exit with a failure status.
 
 .PARAMETER Directory
-The directory that will be searched for 'Update-Codegeneration.ps1' scripts. The default is the root directory of the
-Azure SDK for Java repository. CI jobs should use the 'ServiceDirectory', such as /sdk/storage.
+The directory that will be searched for 'Update-Codegeneration.ps1' scripts and 'tsp-location.yaml'. The default is
+the root directory of the Azure SDK for Java repository. One can also input service directory like:
+'-Directory /sdk/storage' or '-Directory sdk/anomalydetector/azure-ai-anomalydetector'.
+
+.PARAMETER IgnoreVerifyTypeSpecCodeGenerationError
+Determines if the script should exit with an error if the TypeSpec code generation fails. The default is false.
+The script will exit with an error if the Swagger code generation fails.
+
+.PARAMETER UpdateOnly
+Determines if the script should only update the code generation and not verify the changes. The default is false.
 #>
 
 param(
-  [Parameter(Mandatory = $false)]
-  [string]$Directory
+    [Parameter(Mandatory = $false)]
+    [string]$Directory,
+
+    [Parameter(Mandatory = $false)]
+    [boolean]$IgnoreVerifyTypeSpecCodeGenerationError = $false,
+
+    [Parameter(Mandatory = $false)]
+    [boolean]$UpdateOnly = $false
 )
 
+function Reset-Repository {
+    # Clean up generated code, so that next step will not be affected.
+    git reset --hard
+    git clean -fd .
+}
+
 $path = ""
 if ($Directory) {
-  $path = $Directory
+    $path = $Directory
 }
 
 $swaggers = Get-ChildItem -Path $path -Filter "Update-Codegeneration.ps1" -Recurse
-if ($swaggers.Count -eq 0) {
-  Write-Host "
+$tspYamls = Get-ChildItem -Path $path -Filter "tsp-location.yaml" -Recurse
+if ($swaggers.Count -eq 0 -and $tspYamls.Count -eq 0) {
+    Write-Host "
 
-  ===========================================
-  No Swagger files to regenerate
-  ===========================================
+===========================================
+No Swagger or TypeSpec files to regenerate
+===========================================
 
-  "
-  exit 0
+"
+    exit 0
 }
 
-
-Write-Host "
+# Stores SDKs that failed to regenerate code successfully
+$swaggerFailedSdk = $null
+$swaggerDiff = $null
+$typespecFailedSdk = $null
+$typespecDiff = $null
+if ($swaggers.Count -gt 0) {
+    Write-Host "
 
 ===================================
 Invoking Autorest code regeneration
 ===================================
 
 "
 
-foreach ($script in $swaggers) {
-  Invoke-Expression $script.FullName
+    foreach ($script in $swaggers) {
+        Invoke-Expression $script.FullName
+        if ($LastExitCode -ne 0) {
+            $swaggerFailedSdk += $script.Directory.FullName
+        }
+    }
+
+    # prevent warning related to EOL differences which triggers an exception for some reason
+    $swaggerDiff = git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code -- "*.java"
+}
+
+if ($tspYamls.Count -gt 0) {
+    Write-Host "
+
+===========================================
+Installing typespec-client-generator-cli
+===========================================
+
+"
+
+    npm install -g @azure-tools/typespec-client-generator-cli
+
+    Write-Host "
+
+===========================================
+Invoking tsp-client update
+===========================================
+
+"
+    foreach ($tspLocationPath in $tspYamls) {
+        $sdkPath = (get-item $tspLocationPath).Directory.FullName
+        Write-Host "Generate SDK for $sdkPath"
+        Push-Location
+        Set-Location -Path $sdkPath
+        tsp-client update
+        if ($LastExitCode -ne 0) {
+            $typespecFailedSdk += $sdkPath
+        }
+        Pop-Location
+    }
+
+    # prevent warning related to EOL differences which triggers an exception for some reason
+    $typespecDiff = git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code -- "*.java" ":(exclude)**/src/test/**" ":(exclude)**/src/samples/**" ":(exclude)**/src/main/**/implementation/**"
+}
+
+if ($swaggerFailedSdk.Length -gt 0 -or $typespecFailedSdk.Length -gt 0) {
+    Write-Host "Code generation failed for following modules: $swaggerFailedSdk $typespecFailedSdk"
+    Reset-Repository
+    # Only exit with an error if Swagger had a failure or TypeSpec had a failure and IgnoreVerifyTypeSpecCodeGenerationError is false
+    exit ($swaggerFailedSdk.Length -gt 0 -or ($typespecFailedSdk.Length -gt 0 -and -not $IgnoreVerifyTypeSpecCodeGenerationError)) ? 1 : 0
 }
 
 Write-Host "
@@ -58,14 +132,30 @@ Verify no diff
 
 "
 
-# prevent warning related to EOL differences which triggers an exception for some reason
-& git -c core.safecrlf=false diff --ignore-space-at-eol --exit-code -- "*.java"
+if ($swaggerDiff.Length -gt 0 -or $typespecDiff.Length -gt 0) {
+    if ($swaggerDiff.Length -gt 0) {
+        Write-Host "Swagger code generation failed. The following files are out of date:"
+        Write-Host $swaggerDiff
+    }
+
+    if ($typespecDiff.Length -gt 0) {
+        Write-Host "TypeSpec code generation failed. The following files are out of date:"
+        Write-Host $typespecDiff
+    }
 
-if ($LastExitCode -ne 0) {
-  $status = git status -s | Out-String
-  Write-Host "
+    $status = git status -s | Out-String
+    Write-Host "
 The following files are out of date:
 $status
 "
-  exit 1
+    Reset-Repository
+    # Only exit with an error if Swagger had a diff or TypeSpec had a diff and IgnoreVerifyTypeSpecCodeGenerationError is false
+    exit ($swaggerDiff.Length -gt 0 -or ($typespectypespecDiffFailedSdk.Length -gt 0 -and -not $IgnoreVerifyTypeSpecCodeGenerationError)) ? 1 : 0
 }
+
+# Delete out TypeSpec temporary folders if they still exist.
+Get-ChildItem -Path $path -Filter TempTypeSpecFiles -Recurse -Directory | ForEach-Object {
+    Remove-Item -Path $_.FullName -Recurse -Force
+}
+
+Reset-Repository