From ab68436d2cd7feaa83639a2040b946a95207a429 Mon Sep 17 00:00:00 2001
From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com>
Date: Wed, 28 Aug 2024 18:11:21 -0700
Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 8878
 (#5949)

* Apply a few changes to Get-PRPackageProperties to make it more customizable for our users. Remove wonky gap + extra spacing that should pass the patch application process now that we've manually aligned common.ps1

* account for feedback -- rename CanaryPackages to AdditionalValidationPackages

* dependentPackagesforInclusion -> additionalValidationPackages

---------

Co-authored-by: Scott Beddall <scbedd@microsoft.com>
---
 eng/common/scripts/Package-Properties.ps1 | 21 ++++++++++++++-------
 eng/common/scripts/common.ps1             |  3 ++-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/eng/common/scripts/Package-Properties.ps1 b/eng/common/scripts/Package-Properties.ps1
index 2250b4f80..6a70070be 100644
--- a/eng/common/scripts/Package-Properties.ps1
+++ b/eng/common/scripts/Package-Properties.ps1
@@ -15,7 +15,7 @@ class PackageProps
     [boolean]$IsNewSdk
     [string]$ArtifactName
     [string]$ReleaseStatus
-    [string[]]$DependentPackages
+    [string[]]$AdditionalValidationPackages
 
     PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)
     {
@@ -113,7 +113,7 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
     $diff = Get-Content $InputDiffJson | ConvertFrom-Json
     $targetedFiles = $diff.ChangedFiles
 
-    $dependentPackagesForInclusion = @()
+    $additionalValidationPackages = @()
     $lookup = @{}
 
     foreach ($pkg in $allPackageProperties)
@@ -129,19 +129,26 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
             if ($shouldInclude) {
                 $packagesWithChanges += $pkg
 
-                if ($pkg.DependentPackages) {
-                    $dependentPackagesForInclusion += $pkg.DependentPackages
+                if ($pkg.AdditionalValidationPackages) {
+                    $additionalValidationPackages += $pkg.AdditionalValidationPackages
                 }
             }
         }
     }
 
-    foreach ($addition in $dependentPackagesForInclusion) {
-        if ($lookup[$addition]) {
-            $packagesWithChanges += $lookup[$addition]
+    foreach ($addition in $additionalValidationPackages) {
+        $key = $addition.Replace($RepoRoot, "").SubString(1)
+
+        if ($lookup[$key]) {
+            $packagesWithChanges += $lookup[$key]
         }
     }
 
+    if ($AdditionalValidationPackagesFromPackageSetFn -and (Test-Path "Function:$AdditionalValidationPackagesFromPackageSetFn"))
+    {
+        $packagesWithChanges += &$AdditionalValidationPackagesFromPackageSetFn $packagesWithChanges $diff
+    }
+
     return $packagesWithChanges
 }
 
diff --git a/eng/common/scripts/common.ps1 b/eng/common/scripts/common.ps1
index 0025d1c6f..831b4719f 100644
--- a/eng/common/scripts/common.ps1
+++ b/eng/common/scripts/common.ps1
@@ -62,7 +62,8 @@ $GetEmitterAdditionalOptionsFn = "Get-${Language}-EmitterAdditionalOptions"
 $GetEmitterNameFn = "Get-${Language}-EmitterName"
 $GetDirectoriesForGenerationFn = "Get-${Language}-DirectoriesForGeneration"
 $UpdateGeneratedSdksFn = "Update-${Language}-GeneratedSdks"
-$IsApiviewStatusCheckRequiredFn = "Get-${Language}-ApiviewStatusCheckRequirement" 
+$IsApiviewStatusCheckRequiredFn = "Get-${Language}-ApiviewStatusCheckRequirement"
+$AdditionalValidationPackagesFromPackageSetFn = "Get-${Language}-AdditionalValidationPackagesFromPackageSet"
 
 # Expected to be set in eng/scripts/docs/Docs-Onboarding.ps1
 $SetDocsPackageOnboarding = "Set-${Language}-DocsPackageOnboarding"