Skip to content

Updated automation script used in docker scenario #37447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raych1 merged 6 commits into from
Jul 13, 2023
Merged

Updated automation script used in docker scenario #37447

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3613f96
Updated automation script used in docker scenario
raych1 Jul 7, 2023
19e05d4
Pass in spec root dir to dotnet build
raych1 Jul 10, 2023
b52357d
Merge branch 'main' into user/raych1/update-scripts-used-in-docker
raych1 Jul 10, 2023
c33bd16
Merge branch 'main' into user/raych1/update-scripts-used-in-docker
raych1 Jul 12, 2023
fadd25e
Revert analyzer version change
raych1 Jul 12, 2023
32a5007
Ignore removing specification for pipeline scenario
raych1 Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 38 additions & 42 deletions eng/scripts/automation/Invoke-GenerateAndBuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ $readmeFile = $inputJson.relatedReadmeMdFile
$readmeFile = $readmeFile -replace "\\", "/"
$commitid = $inputJson.headSha
$repoHttpsUrl = $inputJson.repoHttpsUrl
$serviceType = $inputJson.serviceType
$downloadUrlPrefix = $inputJson.installInstructionInput.downloadUrlPrefix
$autorestConfig = $inputJson.autorestConfig

Expand Down Expand Up @@ -69,53 +68,50 @@ if ($readmeFile) {
Invoke-GenerateAndBuildSDK -readmeAbsolutePath $readme -sdkRootPath $sdkPath -autorestConfigYaml "$autorestConfigYaml" -downloadUrlPrefix "$downloadUrlPrefix" -generatedSDKPackages $generatedSDKPackages
}

# generate sdk from typespec file
if ($relatedTypeSpecProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $relatedTypeSpecProjectFolder)
$newPackageOutput = "newPackageOutput.json"
foreach ($typespecRelativeFolder in $relatedTypeSpecProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $typespecRelativeFolder)
$processScript = Resolve-Path (Join-Path $sdkPath "eng/common/scripts" "TypeSpec-Project-Process.ps1")
$sdkProjectFolders = Get-ChildItem -Path (Join-Path $sdkPath "sdk") -Depth 1 -Directory | Select-Object -ExpandProperty FullName

$tspConfigYaml = Get-Content -Path (Join-Path "$typespecFolder" "tspconfig.yaml") -Raw

Install-ModuleIfNotInstalled "powershell-yaml" "0.4.1" | Import-Module
$yml = ConvertFrom-YAML $tspConfigYaml
$service = ""
$namespace = ""
if ($yml) {
if ($yml["parameters"] -And $yml["parameters"]["service-directory-name"]) {
$service = $yml["parameters"]["service-directory-name"]["default"];
}
if ($yml["options"] -And $yml["options"]["@azure-tools/typespec-csharp"] -And $yml["options"]["@azure-tools/typespec-csharp"]["namespace"]) {
$namespace = $yml["options"]["@azure-tools/typespec-csharp"]["namespace"]
# Invoke Process script. SkipSyncAndGenerate only when it's not a new SDK project
$sdkProjectFolder = & $processScript $typespecFolder $commitid $repoHttpsUrl -SkipSyncAndGenerate
if ($LASTEXITCODE) {
# If Process script call fails, then return with failure to CI and don't need to call GeneratePackage
$generatedSDKPackages.Add(@{
result = "failed";
path=@("");
})
} else {
$relativeSdkPath = Resolve-Path $sdkProjectFolder -Relative
$specRepoRoot = $swaggerDir -replace "/specification", ""
if ($sdkProjectFolders -contains $sdkProjectFolder) {
# Existed SDK project case, needs to generate code
GeneratePackage `
-projectFolder $sdkProjectFolder `
-sdkRootPath $sdkPath `
-path $relativeSdkPath `
-downloadUrlPrefix $downloadUrlPrefix `
-serviceType "data-plane" `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $specRepoRoot
} else {
# New SDK project case, code is already generated by emitter. So, skip code generation
GeneratePackage `
-projectFolder $sdkProjectFolder `
-sdkRootPath $sdkPath `
-path $relativeSdkPath `
-downloadUrlPrefix $downloadUrlPrefix `
-serviceType "data-plane" `
-skipGenerate `
-generatedSDKPackages $generatedSDKPackages `
-specRepoRoot $specRepoRoot
}
}
}
if (!$service || !$namespace) {
throw "Not provide service name or namespace."
}
$projectFolder = (Join-Path $sdkPath "sdk" $service $namespace)
$specRoot = $swaggerDir
if ((-Not $relatedTypeSpecProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
{
$relatedTypeSpecProjectFolder = "specification/$relatedTypeSpecProjectFolder"
$specRoot = Split-Path $specRoot
}
New-TypeSpecPackageFolder `
-service $service `
-namespace $namespace `
-sdkPath $sdkPath `
-relatedTypeSpecProjectFolder $relatedTypeSpecProjectFolder `
-specRoot $specRoot `
-outputJsonFile $newpackageoutput
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json
$relativeSdkPath = $newPackageOutputJson.path
GeneratePackage `
-projectFolder $projectFolder `
-sdkRootPath $sdkPath `
-path $relativeSdkPath `
-downloadUrlPrefix $downloadUrlPrefix `
-serviceType "data-plane" `
-generatedSDKPackages $generatedSDKPackages
}
$outputJson = [PSCustomObject]@{
packages = $generatedSDKPackages
}
$outputJson
$outputJson | ConvertTo-Json -depth 100 | Out-File $outputJsonFile