Fixed bug of deleting more than expected. (#3250)

https://dev.azure.com/azure-sdk/internal/_build/results?buildId=1535947&view=results
Azure · Apr 28, 2022 · b263b16 · b263b16
1 parent 5d6272e
commit b263b16
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/eng/common/scripts/Delete-RemoteBranches.ps1 b/eng/common/scripts/Delete-RemoteBranches.ps1
@@ -33,8 +33,8 @@ foreach ($res in $responses)
     continue
   }
   $branch = $res.ref
+  $branchName = $branch.Replace("refs/heads/","")
   try {
-    $branchName = $branch.Replace("refs/heads/","")
     $head = "${RepoId}:${branchName}"
     LogDebug "Operating on branch [ $branchName ]"
     $pullRequests = Get-GitHubPullRequests -RepoId $RepoId -State "all" -Head $head -AuthToken $AuthToken
@@ -53,26 +53,34 @@ foreach ($res in $responses)
     continue
   }
 
+  LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has no associated open Pull Request. "
   if ($LastCommitOlderThan) {
     if (!$res.object -or !$res.object.url) {
       LogWarning "No commit url returned from response. Skipping... "
       continue
     }
     try {
       $commitDate = Get-GithubReferenceCommitDate -commitUrl $res.object.url -AuthToken $AuthToken
-      if ($commitDate -and ($commitDate -gt $LastCommitOlderThan)) {
-        LogDebug "The branch $branch last commit date $commitDate is newer than the date $LastCommitOlderThan. Skipping."
+      if (!$commitDate) 
+      {
+        LogDebug "No last commit date found. Skipping."
+        continue
+      }
+      if ($commitDate -gt $LastCommitOlderThan) {
+        LogDebug "The branch $branch last commit date [ $commitDate ] is newer than the date $LastCommitOlderThan. Skipping."
         continue
       }
+
+      LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has a last commit date [ $commitDate ] that is older than $LastCommitOlderThan. "
     }
     catch {
       LogError "Get-GithubReferenceCommitDate failed with exception:`n$_"
       exit 1
     }
   } 
-  LogDebug "Branch [ $branchName ] in repo [ $RepoId ] has no associated open Pull Request. "
   try {
     Remove-GitHubSourceReferences -RepoId $RepoId -Ref $branch -AuthToken $AuthToken
+    LogDebug "The branch [ $branchName ] in [ $RepoId ] has been deleted."
   }
   catch {
     LogError "Remove-GitHubSourceReferences failed with exception:`n$_"

diff --git a/eng/common/scripts/Invoke-GitHubAPI.ps1 b/eng/common/scripts/Invoke-GitHubAPI.ps1
@@ -429,5 +429,5 @@ function Get-GithubReferenceCommitDate($commitUrl, $AuthToken) {
     LogDebug "No date returned from the commit sha. "
     return $null
   }
-  return $commitData.committer.date
+  return $commitResponse.committer.date
 }