Skip to content

typespec renaming for unified pipeline #35123

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
chunyu3 merged 2 commits into from
Mar 27, 2023
Merged

typespec renaming for unified pipeline #35123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9714d9
typespec renaming for unified pipeline
chunyu3 Mar 24, 2023
cd6da06
update gitignore
chunyu3 Mar 24, 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
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,5 +174,5 @@ BenchmarkDotNet.Artifacts
artifacts
.assets

# Temporary cadl folders for cadl generation
TempCadlFiles/
# Temporary typespec folders for typespec generation
TempTypeSpecFiles/
12 changes: 6 additions & 6 deletions eng/scripts/Invoke-GenerateAndBuildV2.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ $commitid = $inputJson.headSha
$repoHttpsUrl = $inputJson.repoHttpsUrl
$downloadUrlPrefix = $inputJson.installInstructionInput.downloadUrlPrefix
$autorestConfig = $inputJson.autorestConfig
$relatedCadlProjectFolder = $inputJson.relatedCadlProjectFolder
$relatedTypeSpecProjectFolder = $inputJson.relatedTypeSpecProjectFolder

$autorestConfigYaml = ""
if ($autorestConfig) {
Expand Down Expand Up @@ -109,10 +109,10 @@ if ($inputFileToGen) {
UpdateExistingSDKByInputFiles -inputFilePaths $inputFileToGen -sdkRootPath $sdkPath -headSha $commitid -repoHttpsUrl $repoHttpsUrl -downloadUrlPrefix "$downloadUrlPrefix" -generatedSDKPackages $generatedSDKPackages
}

# generate sdk from cadl file
if ($relatedCadlProjectFolder) {
foreach ($cadlRelativeFolder in $relatedCadlProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $cadlRelativeFolder)
# generate sdk from typespec file
if ($relatedTypeSpecProjectFolder) {
foreach ($typespecRelativeFolder in $relatedTypeSpecProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $typespecRelativeFolder)
$newPackageOutput = "newPackageOutput.json"

$tspConfigYaml = Get-Content -Path (Join-Path "$typespecFolder" "tspconfig.yaml") -Raw
Expand All @@ -137,7 +137,7 @@ if ($relatedCadlProjectFolder) {
-service $service `
-namespace $namespace `
-sdkPath $sdkPath `
-relatedTypeSpecProjectFolder $cadlRelativeFolder `
-relatedTypeSpecProjectFolder $typespecRelativeFolder `
-specRoot $swaggerDir `
-outputJsonFile $newpackageoutput
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json
Expand Down
12 changes: 6 additions & 6 deletions eng/scripts/automation/Invoke-GenerateAndBuild.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $downloadUrlPrefix = $inputJson.installInstructionInput.downloadUrlPrefix
$autorestConfig = $inputJson.autorestConfig

$autorestConfig = $inputJson.autorestConfig
$relatedCadlProjectFolder = $inputJson.relatedCadlProjectFolder
$relatedTypeSpecProjectFolder = $inputJson.relatedTypeSpecProjectFolder

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

if ($relatedCadlProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $relatedCadlProjectFolder)
if ($relatedTypeSpecProjectFolder) {
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $relatedTypeSpecProjectFolder)
$newPackageOutput = "newPackageOutput.json"

$tspConfigYaml = Get-Content -Path (Join-Path "$typespecFolder" "tspconfig.yaml") -Raw
Expand All @@ -92,16 +92,16 @@ if ($relatedCadlProjectFolder) {
}
$projectFolder = (Join-Path $sdkPath "sdk" $service $namespace)
$specRoot = $swaggerDir
if ((-Not $relatedCadlProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
if ((-Not $relatedTypeSpecProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
{
$relatedCadlProjectFolder = "specification/$relatedCadlProjectFolder"
$relatedTypeSpecProjectFolder = "specification/$relatedTypeSpecProjectFolder"
$specRoot = Split-Path $specRoot
}
New-TypeSpecPackageFolder `
-service $service `
-namespace $namespace `
-sdkPath $sdkPath `
-relatedTypeSpecProjectFolder $relatedCadlProjectFolder `
-relatedTypeSpecProjectFolder $relatedTypeSpecProjectFolder `
-specRoot $specRoot `
-outputJsonFile $newpackageoutput
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json
Expand Down