Skip to content

Commit 94df84e

Browse files
Sync eng/common directory with azure-sdk-tools for PR 8152 (#35330)
* Only make one call to GetPackageInfoJson * fix copy/paste, it should be packageInfoLocation not packageInfoJsonLocation --------- Co-authored-by: James Suplizio <[email protected]>
1 parent 5d36ded commit 94df84e

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

eng/common/scripts/Update-DocsMsMetadata.ps1

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ function GetPackageInfoJson ($packageInfoJsonLocation) {
122122
return $packageInfo
123123
}
124124

125-
function UpdateDocsMsMetadataForPackage($packageInfoJsonLocation) {
126-
$packageInfo = GetPackageInfoJson $packageInfoJsonLocation
125+
function UpdateDocsMsMetadataForPackage($packageInfo, $packageMetadataName) {
127126

128127
$originalVersion = [AzureEngSemanticVersion]::ParseVersionString($packageInfo.Version)
129128
$packageMetadataArray = (Get-CSVMetadata).Where({ $_.Package -eq $packageInfo.Name -and $_.Hide -ne 'true' -and $_.New -eq 'true' })
@@ -150,7 +149,6 @@ function UpdateDocsMsMetadataForPackage($packageInfoJsonLocation) {
150149
$metadataMoniker = 'preview'
151150
$readMePath = $docsMsMetadata.PreviewReadMeLocation
152151
}
153-
$packageMetadataName = Split-Path $packageInfoJsonLocation -Leaf
154152
$packageInfoLocation = Join-Path $DocRepoLocation "metadata/$metadataMoniker"
155153
if (Test-Path "$packageInfoLocation/$packageMetadataName") {
156154
Write-Host "The docs metadata json $packageMetadataName exists, updating..."
@@ -193,10 +191,10 @@ function UpdateDocsMsMetadataForPackage($packageInfoJsonLocation) {
193191
$allSucceeded = $true
194192
foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
195193

194+
$packageInfo = GetPackageInfoJson $packageInfoLocation
195+
196196
if ($ValidateDocsMsPackagesFn -and (Test-Path "Function:$ValidateDocsMsPackagesFn")) {
197197
Write-Host "Validating the packages..."
198-
199-
$packageInfo = GetPackageInfoJson $packageInfoLocation
200198
# This calls a function named "Validate-${Language}-DocMsPackages"
201199
# declared in common.ps1, implemented in Language-Settings.ps1
202200
$isValid = &$ValidateDocsMsPackagesFn `
@@ -216,8 +214,9 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
216214
}
217215

218216
Write-Host "Updating metadata for package: $packageInfoLocation"
217+
$packageMetadataName = Split-Path $packageInfoLocation -Leaf
219218
# Convert package metadata json file to metadata json property.
220-
UpdateDocsMsMetadataForPackage $packageInfoLocation
219+
UpdateDocsMsMetadataForPackage $packageInfo $packageMetadataName
221220
}
222221

223222
# Set a variable which will be used by the pipeline later to fail the build if

0 commit comments

Comments
 (0)