Skip to content

Sync eng/common directory with azure-sdk-tools for PR 8152 #35330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimSuplizio merged 2 commits into from
Apr 23, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 8152 #35330

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4b1fee
Only make one call to GetPackageInfoJson
JimSuplizio Apr 23, 2024
8b40da0
fix copy/paste, it should be packageInfoLocation not packageInfoJsonL…
JimSuplizio Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions eng/common/scripts/Update-DocsMsMetadata.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,7 @@ function GetPackageInfoJson ($packageInfoJsonLocation) {
return $packageInfo
}

function UpdateDocsMsMetadataForPackage($packageInfoJsonLocation) {
$packageInfo = GetPackageInfoJson $packageInfoJsonLocation
function UpdateDocsMsMetadataForPackage($packageInfo, $packageMetadataName) {

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

$packageInfo = GetPackageInfoJson $packageInfoLocation

if ($ValidateDocsMsPackagesFn -and (Test-Path "Function:$ValidateDocsMsPackagesFn")) {
Write-Host "Validating the packages..."

$packageInfo = GetPackageInfoJson $packageInfoLocation
# This calls a function named "Validate-${Language}-DocMsPackages"
# declared in common.ps1, implemented in Language-Settings.ps1
$isValid = &$ValidateDocsMsPackagesFn `
Expand All @@ -216,8 +214,9 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
}

Write-Host "Updating metadata for package: $packageInfoLocation"
$packageMetadataName = Split-Path $packageInfoLocation -Leaf
# Convert package metadata json file to metadata json property.
UpdateDocsMsMetadataForPackage $packageInfoLocation
UpdateDocsMsMetadataForPackage $packageInfo $packageMetadataName
}

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