Skip to content

Commit

Permalink
differentiate on language and languageDisplayName var
Browse files Browse the repository at this point in the history
  • Loading branch information
sima-zhu committed Jun 15, 2022
1 parent c8a08f6 commit a158c02
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
8 changes: 4 additions & 4 deletions eng/common/scripts/Helpers/Metadata-Helpers.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,12 @@ function GetDocsMsService($packageInfo, $serviceName)
return $service
}

function GenerateDocsMsMetadata($language, $langTitle = "", $serviceName, $tenantId, $clientId, $clientSecret, $msService)
function GenerateDocsMsMetadata($lang, $languageDisplayName, $langTitle = "", $serviceName, $tenantId, $clientId, $clientSecret, $msService)
{
if (!$langTitle) {
$langTitle = "Azure $serviceName SDK for $language"
$langTitle = "Azure $serviceName SDK for $languageDisplayName"
}
$langDescription = "Reference for Azure $serviceName SDK for $language"
$langDescription = "Reference for Azure $serviceName SDK for $languageDisplayName"
# Github url for source code: e.g. https://github.com/Azure/azure-sdk-for-js
$serviceBaseName = $serviceName.ToLower().Replace(' ', '').Replace('/', '-')
$author = GetPrimaryCodeOwner -TargetDirectory "/sdk/$serviceBaseName/"
Expand All @@ -123,7 +123,7 @@ author: $author
ms.author: $msauthor
ms.date: $date
ms.topic: reference
ms.devlang: $language
ms.devlang: $lang
ms.service: $msService
---
"@
Expand Down
13 changes: 6 additions & 7 deletions eng/common/scripts/Service-Level-Readme-Automation.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function update-metadata-table($readmeFolder, $readmeName, $serviceName, $msServ
$restContent = $Matches["content"]
$lang = $LanguageDisplayName
$orignalMetadata = $Matches["metadata"]
$metadataString = GenerateDocsMsMetadata -language $lang -serviceName $serviceName `
$metadataString = GenerateDocsMsMetadata -lang $Language -languageDisplayName $LanguageDisplayName -serviceName $serviceName `
-tenantId $TenantId -clientId $ClientId -clientSecret $ClientSecret `
-msService $msService
$null = $metadataString -match "---`n*(?<metadata>(.*`n)*)---"
Expand Down Expand Up @@ -144,12 +144,11 @@ function generate-service-level-readme($readmeBaseName, $pathPrefix, $packageInf
if ($clientPackageInfo) {
generate-markdown-table -readmeFolder $readmeFolder -readmeName "$clientIndexReadme" -packageInfo $clientPackageInfo -moniker $moniker
}
# TODO: we currently do not have the right decision on how we display mgmt packages. Will track the mgmt work in issue.
# https://github.com/Azure/azure-sdk-tools/issues/3422
# $mgmtPackageInfo = $packageInfos.Where({ 'mgmt' -eq $_.Type }) | Sort-Object -Property Package
# if ($mgmtPackageInfo) {
# generate-markdown-table -readmeFolder $readmeFolder -readmeName "$mgmtIndexReadme" -packageInfo $mgmtPackageInfo -moniker $moniker
# }

$mgmtPackageInfo = $packageInfos.Where({ 'mgmt' -eq $_.Type }) | Sort-Object -Property Package
if ($mgmtPackageInfo) {
generate-markdown-table -readmeFolder $readmeFolder -readmeName "$mgmtIndexReadme" -packageInfo $mgmtPackageInfo -moniker $moniker
}
if (!(Test-Path (Join-Path $readmeFolder -ChildPath $serviceReadme))) {
create-metadata-table -readmeFolder $readmeFolder -readmeName $serviceReadme -moniker $moniker -msService $msService `
-clientTableLink $clientIndexReadme -mgmtTableLink $mgmtIndexReadme `
Expand Down

0 comments on commit a158c02

Please sign in to comment.