From 770fc8cb5778d051d296e9e0cfcbebf8c9994c82 Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Tue, 23 Apr 2024 14:52:58 -0700
Subject: [PATCH 1/2] Only make one call to GetPackageInfoJson

---
 eng/common/scripts/Update-DocsMsMetadata.ps1 | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1
index 8b7b777d503c..4a464896b50f 100644
--- a/eng/common/scripts/Update-DocsMsMetadata.ps1
+++ b/eng/common/scripts/Update-DocsMsMetadata.ps1
@@ -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' })
@@ -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..."
@@ -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 `
@@ -216,8 +214,9 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
   }
 
   Write-Host "Updating metadata for package: $packageInfoLocation"
+  $packageMetadataName = Split-Path $packageInfoJsonLocation -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

From 1fef3ae95297bd7681eebbfc6f9b925c7b424367 Mon Sep 17 00:00:00 2001
From: James Suplizio <jasupliz@microsoft.com>
Date: Tue, 23 Apr 2024 15:20:11 -0700
Subject: [PATCH 2/2] fix copy/paste, it should be packageInfoLocation not
 packageInfoJsonLocation

---
 eng/common/scripts/Update-DocsMsMetadata.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1
index 4a464896b50f..d9c254a2f637 100644
--- a/eng/common/scripts/Update-DocsMsMetadata.ps1
+++ b/eng/common/scripts/Update-DocsMsMetadata.ps1
@@ -214,7 +214,7 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
   }
 
   Write-Host "Updating metadata for package: $packageInfoLocation"
-  $packageMetadataName = Split-Path $packageInfoJsonLocation -Leaf
+  $packageMetadataName = Split-Path $packageInfoLocation -Leaf
   # Convert package metadata json file to metadata json property.
   UpdateDocsMsMetadataForPackage $packageInfo $packageMetadataName
 }