Skip to content

Commit ea296f2

Browse files
authored
Merge pull request #1298 from microsoftgraph/andrueastman/excludeTcpApis
feat: exclude TCP APIs from language generation.
2 parents 6da8da5 + 9fb69b9 commit ea296f2

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

.azure-pipelines/generation-templates/language-generation-kiota.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ parameters:
4848
type: boolean
4949
default: true
5050

51+
- name: pathExclusionArguments
52+
type: string
53+
default: "-e '/copilot' -e '/copilot/**'"
54+
5155
steps:
5256
- template: set-up-for-generation-kiota.yml
5357
parameters:
@@ -82,7 +86,7 @@ steps:
8286
BranchName: ${{ parameters.branchName }}
8387
workingDirectory: ${{ parameters.repoName }}
8488

85-
- bash: '$(kiotaDirectory)/kiota generate --openapi $(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml --language ${{ parameters.language }} -o $(kiotaDirectory)/output -n ${{ parameters.targetNamespace }} -c ${{ parameters.targetClassName }} ${{ parameters.customArguments }}'
89+
- bash: '$(kiotaDirectory)/kiota generate --openapi $(Build.SourcesDirectory)/msgraph-metadata/${{ parameters.cleanMetadataFolder }}/openapi.yaml --language ${{ parameters.language }} -o $(kiotaDirectory)/output -n ${{ parameters.targetNamespace }} -c ${{ parameters.targetClassName }} ${{ parameters.customArguments }} ${{ parameters.pathExclusionArguments }}'
8690
displayName: 'Run Kiota for ${{ parameters.language }} ${{ parameters.version }}'
8791
env:
8892
KIOTA_GENERATION:EXPORTPUBLICAPI: ${{ parameters.exportDom }}

scripts/copy-typescript-sdk-models.ps1

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,14 @@ Invoke-Expression "$PSScriptRoot\remove-typescript-fluent-api-from-main-package.
1818
$packagesDirectories = Get-ChildItem $targetDirectory -Directory -Exclude $mainPackageDirectoryName | Where-Object { -not($_.Name.EndsWith("-tests")) }
1919
foreach ($directory in $packagesDirectories) {
2020
$fluentAPISegmentName = $directory.Name.Replace("$mainPackageDirectoryName-", "")
21-
Copy-Item (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName) -Destination $directory.FullName -Recurse -Force
22-
Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $($directory.FullName) -packageName $packageName"
21+
if (Test-Path -Path (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName)) {
22+
Copy-Item (Join-Path $sourceDirectory -ChildPath $fluentAPISegmentName) -Destination $directory.FullName -Recurse -Force
23+
Invoke-Expression "$PSScriptRoot\fix-typescript-fluent-packages-imports.ps1 -targetDirectory $($directory.FullName) -packageName $packageName"
24+
}
25+
else {
26+
Remove-Item $directory.FullName -Force -Recurse -ErrorAction SilentlyContinue
27+
Write-Host "Removing folder for the fluent API segment: $fluentAPISegmentName as it does not exist in the generated models" -ForegroundColor Yellow
28+
}
2329
}
2430

2531
Write-Host "Copied the generated files into the repo. From: $sourceDirectory to: $targetDirectory" -ForegroundColor Green

0 commit comments

Comments
 (0)