Skip to content

Commit 5a00a79

Browse files
committed
ci: fixes endpoint sanitation
Signed-off-by: Vincent Biret <[email protected]>
1 parent 3432d83 commit 5a00a79

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.azure-pipelines/generation-templates/capture-metadata.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ parameters:
3131
- name: metadataAnnotationsCopyScriptPath
3232
type: string
3333
default: '/../scripts/copy-annotations-to-csdl.ps1'
34-
- name: sanitizedEndpoint
35-
type: string
36-
default: $[replace(parameters['endpoint'], '/', ''))]
3734

3835
steps:
3936

@@ -99,9 +96,11 @@ steps:
9996
endpointVersion: ${{ parameters.endpoint }}
10097
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata'
10198

102-
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_${{ parameters.sanitizedEndpoint }}_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
99+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$($Env:Endpoint.Replace(''.'', ''''))_metadata/cleanMetadataWithDescriptions${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
103100
env:
104101
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
102+
Endpoint: ${{ parameters.endpoint }}
103+
displayName: 'copy TypeSpec annotations to cleaned metadata'
105104

106105
## Only run if the previous step was successful
107106
- pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -118,9 +117,11 @@ steps:
118117
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotations'
119118
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations'
120119

121-
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
120+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$($Env:Endpoint.Replace(''.'', ''''))_metadata/cleanMetadataWithDescriptionsAndAnnotations${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
122121
env:
123122
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
123+
Endpoint: ${{ parameters.endpoint }}
124+
displayName: 'copy TypeSpec annotations to cleaned metadata'
124125

125126
## Only run if the previous step was successful
126127
- pwsh: '$(scriptsDirectory)/run-typewriter-clean-metadata.ps1'
@@ -138,9 +139,11 @@ steps:
138139
OutputMetadataFileName: 'cleanMetadataWithDescriptionsAndAnnotationsAndErrors'
139140
displayName: 'run Typewriter to clean ${{ parameters.endpoint }} metadata and keep capability annotations and include error information'
140141

141-
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$(sanitizedEndpoint)_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
142+
- pwsh: '. $(metadataTypeSpecAnnotationsSource)/$Env:ScriptPath -targetCsdlPath "$(Build.SourcesDirectory)/msgraph-metadata/clean_$($Env:Endpoint.Replace(''.'', ''''))_metadata/cleanMetadataWithDescriptionsAndAnnotationsAndErrors${{ parameters.endpoint }}.xml" -sourceCsdlDirectoryPath "$(metadataTypeSpecAnnotationsSource)/${{ parameters.metadataTypeSpecAnnotationsOutputDir }}"'
142143
env:
143144
ScriptPath: ${{ parameters.metadataAnnotationsCopyScriptPath }}
145+
Endpoint: ${{ parameters.endpoint }}
146+
displayName: 'copy TypeSpec annotations to cleaned metadata'
144147

145148

146149
# publish metadata as an artifact

0 commit comments

Comments
 (0)