Skip to content

Commit 76ff148

Browse files
authored
typespec renaming for unified pipeline (Azure#35123)
* typespec renaming for unified pipeline * update gitignore
1 parent 81add1a commit 76ff148

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,5 +174,5 @@ BenchmarkDotNet.Artifacts
174174
artifacts
175175
.assets
176176

177-
# Temporary cadl folders for cadl generation
178-
TempCadlFiles/
177+
# Temporary typespec folders for typespec generation
178+
TempTypeSpecFiles/

eng/scripts/Invoke-GenerateAndBuildV2.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $commitid = $inputJson.headSha
4141
$repoHttpsUrl = $inputJson.repoHttpsUrl
4242
$downloadUrlPrefix = $inputJson.installInstructionInput.downloadUrlPrefix
4343
$autorestConfig = $inputJson.autorestConfig
44-
$relatedCadlProjectFolder = $inputJson.relatedCadlProjectFolder
44+
$relatedTypeSpecProjectFolder = $inputJson.relatedTypeSpecProjectFolder
4545

4646
$autorestConfigYaml = ""
4747
if ($autorestConfig) {
@@ -109,10 +109,10 @@ if ($inputFileToGen) {
109109
UpdateExistingSDKByInputFiles -inputFilePaths $inputFileToGen -sdkRootPath $sdkPath -headSha $commitid -repoHttpsUrl $repoHttpsUrl -downloadUrlPrefix "$downloadUrlPrefix" -generatedSDKPackages $generatedSDKPackages
110110
}
111111

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

118118
$tspConfigYaml = Get-Content -Path (Join-Path "$typespecFolder" "tspconfig.yaml") -Raw
@@ -137,7 +137,7 @@ if ($relatedCadlProjectFolder) {
137137
-service $service `
138138
-namespace $namespace `
139139
-sdkPath $sdkPath `
140-
-relatedTypeSpecProjectFolder $cadlRelativeFolder `
140+
-relatedTypeSpecProjectFolder $typespecRelativeFolder `
141141
-specRoot $swaggerDir `
142142
-outputJsonFile $newpackageoutput
143143
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json

eng/scripts/automation/Invoke-GenerateAndBuild.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $downloadUrlPrefix = $inputJson.installInstructionInput.downloadUrlPrefix
2222
$autorestConfig = $inputJson.autorestConfig
2323

2424
$autorestConfig = $inputJson.autorestConfig
25-
$relatedCadlProjectFolder = $inputJson.relatedCadlProjectFolder
25+
$relatedTypeSpecProjectFolder = $inputJson.relatedTypeSpecProjectFolder
2626

2727
$autorestConfigYaml = ""
2828
if ($autorestConfig) {
@@ -69,8 +69,8 @@ if ($readmeFile) {
6969
Invoke-GenerateAndBuildSDK -readmeAbsolutePath $readme -sdkRootPath $sdkPath -autorestConfigYaml "$autorestConfigYaml" -downloadUrlPrefix "$downloadUrlPrefix" -generatedSDKPackages $generatedSDKPackages
7070
}
7171

72-
if ($relatedCadlProjectFolder) {
73-
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $relatedCadlProjectFolder)
72+
if ($relatedTypeSpecProjectFolder) {
73+
$typespecFolder = Resolve-Path (Join-Path $swaggerDir $relatedTypeSpecProjectFolder)
7474
$newPackageOutput = "newPackageOutput.json"
7575

7676
$tspConfigYaml = Get-Content -Path (Join-Path "$typespecFolder" "tspconfig.yaml") -Raw
@@ -92,16 +92,16 @@ if ($relatedCadlProjectFolder) {
9292
}
9393
$projectFolder = (Join-Path $sdkPath "sdk" $service $namespace)
9494
$specRoot = $swaggerDir
95-
if ((-Not $relatedCadlProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
95+
if ((-Not $relatedTypeSpecProjectFolder.Contains("specification")) -And $swaggerDir.Contains("specification"))
9696
{
97-
$relatedCadlProjectFolder = "specification/$relatedCadlProjectFolder"
97+
$relatedTypeSpecProjectFolder = "specification/$relatedTypeSpecProjectFolder"
9898
$specRoot = Split-Path $specRoot
9999
}
100100
New-TypeSpecPackageFolder `
101101
-service $service `
102102
-namespace $namespace `
103103
-sdkPath $sdkPath `
104-
-relatedTypeSpecProjectFolder $relatedCadlProjectFolder `
104+
-relatedTypeSpecProjectFolder $relatedTypeSpecProjectFolder `
105105
-specRoot $specRoot `
106106
-outputJsonFile $newpackageoutput
107107
$newPackageOutputJson = Get-Content $newPackageOutput -Raw | ConvertFrom-Json

0 commit comments

Comments
 (0)