Azure · azure-sdk · Aug 24, 2020
diff --git a/eng/common/pipelines/templates/steps/create-pull-request.yml b/eng/common/pipelines/templates/steps/create-pull-request.yml
@@ -71,6 +71,7 @@ steps:
 - task: PowerShell@2
   displayName: Tag a Reviewer on PR
   condition: and(succeeded(), eq(variables['HasChanges'], 'true'))
+  continueOnError: true
   inputs:
     pwsh: true
     workingDirectory: ${{ parameters.WorkingDirectory }}

diff --git a/eng/common/pipelines/templates/steps/get-pr-owners.yml b/eng/common/pipelines/templates/steps/get-pr-owners.yml
@@ -18,12 +18,20 @@ steps:
         --kusto-database-var KUSTO_DB `
         --kusto-table-var KUSTO_TABLE `
         --identity "$(Build.QueuedBy)"
-      $resolvedIdentity = $result[-1] | ConvertFrom-Json
 
-      Write-Host $resolvedIdentity
+      $resolvedIdentity = ""
+      try { $resolvedIdentity = $result[-1] | ConvertFrom-Json } catch {}
 
-      Write-Output "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$($resolvedIdentity.GithubUserName)"
+      if($resolvedIdentity) {
+        Write-Host $resolvedIdentity
+
+        Write-Host "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$($resolvedIdentity.GithubUserName)"
+      }
+      else {
+        Write-Host "Unable to locate a github user for identity $(Build.QueuedBy)"
+      }
     displayName: 'Resolving Queuing User'
+    continueOnError: true
     workingDirectory: $(Build.SourcesDirectory)/tools_repo/tools/notification-configuration/identity-resolver
     env:
       APP_ID: $(notification-aad-app-id)
@@ -41,6 +49,6 @@ steps:
       $originalValue = "$(${{ parameters.TargetVariable }})"
       $result = $(Build.SourcesDirectory)/eng/common/scripts/get-codeowners.ps1 -TargetDirectory /sdk/${{ parameters.ServiceDirectory }}/ -RootDirectory $(Build.SourcesDirectory)
       if ($result) {
-        Write-Output "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$originalValue,$result"
+        Write-Host "##vso[task.setvariable variable=${{ parameters.TargetVariable }}]$originalValue,$result"
       }
     displayName: Add CodeOwners if Present
diff --git a/eng/common/pipelines/templates/steps/verify-links.yml b/eng/common/pipelines/templates/steps/verify-links.yml
@@ -14,6 +14,5 @@ steps:
       -rootUrl "file://$(Build.SourcesDirectory)/${{ parameters.Directory }}" 
       -recursive: $false 
       -ignoreLinksFile ${{ parameters.IgnoreLinksFile }}
-      -branchReplaceRegex "^($env:SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI.*/(?:blob|tree)/)master(/.*)$"
+      -branchReplaceRegex "($env:SYSTEM_PULLREQUEST_SOURCEREPOSITORYURI.*/blob/)master(/.*)"
       -branchReplacementName $env:SYSTEM_PULLREQUEST_SOURCECOMMITID
-      -devOpsLogging: $true
diff --git a/eng/common/scripts/Verify-Links.ps1 b/eng/common/scripts/Verify-Links.ps1
@@ -14,7 +14,7 @@ param (
   # list of http status codes count as broken links. Defaults to 400, 401, 404, SocketError.HostNotFound = 11001, SocketError.NoData = 11004
   [array] $errorStatusCodes = @(400, 401, 404, 11001, 11004),
   # regex to check if the link needs to be replaced
-  [string] $branchReplaceRegex = "^(https://github.com/.*/(?:blob|tree)/)master(/.*)$",
+  [string] $branchReplaceRegex = "(https://github.com/.*/blob/)master(/.*)",
   # the substitute branch name or SHA commit
   [string] $branchReplacementName = "",
   # flag to allow checking against azure sdk link guidance.
@@ -62,18 +62,6 @@ function LogWarning
   }
 }
 
-function LogError
-{
-  if ($devOpsLogging)
-  {
-    Write-Host "##vso[task.logissue type=error]$args"
-  }
-  else
-  {
-    Write-Error "$args"
-  }
-}
-
 function ResolveUri ([System.Uri]$referralUri, [string]$link)
 {
   # If the link is mailto, skip it.
@@ -135,9 +123,6 @@ function ParseLinks([string]$baseUri, [string]$htmlContent)
 function CheckLink ([System.Uri]$linkUri)
 {
   if ($checkedLinks.ContainsKey($linkUri)) { 
-    if (!$checkedLinks[$linkUri]) {
-      LogWarning "broken link $linkUri"
-    }
     return $checkedLinks[$linkUri] 
   }
 
@@ -260,6 +245,7 @@ if ($PSVersionTable.PSVersion.Major -lt 6)
 {
   LogWarning "Some web requests will not work in versions of PS earlier then 6. You are running version $($PSVersionTable.PSVersion)."
 }
+$badLinks = @();
 $ignoreLinks = @();
 if (Test-Path $ignoreLinksFile)
 {
@@ -268,7 +254,6 @@ if (Test-Path $ignoreLinksFile)
 
 $checkedPages = @{};
 $checkedLinks = @{};
-$badLinks = @{};
 $pageUrisToCheck = new-object System.Collections.Queue
 
 foreach ($url in $urls) {
@@ -284,38 +269,23 @@ while ($pageUrisToCheck.Count -ne 0)
 
   $linkUris = GetLinks $pageUri
   Write-Host "Found $($linkUris.Count) links on page $pageUri";
-  $badLinksPerPage = @();
+
   foreach ($linkUri in $linkUris) {
     $linkUri = ReplaceGithubLink $linkUri
+
     $isLinkValid = CheckLink $linkUri
-    if (!$isLinkValid -and !$badLinksPerPage.Contains($linkUri)) {
-      $badLinksPerPage += $linkUri
+    if (!$isLinkValid) {
+      $script:badLinks += $linkUri
     }
     if ($recursive -and $isLinkValid) {
       if ($linkUri.ToString().StartsWith($baseUrl) -and !$checkedPages.ContainsKey($linkUri)) {
         $pageUrisToCheck.Enqueue($linkUri);
       }
     }
   }
-  if ($badLinksPerPage.Count -gt 0) {
-    $badLinks[$pageUri] = $badLinksPerPage
-  }
 }
 
-if ($badLinks.Count -gt 0) {
-  Write-Host "Summary of broken links:"
-}
-foreach ($pageLink in $badLinks.Keys) {
-  Write-Host "'$pageLink' has $($badLinks[$pageLink].Count) broken link(s):"
-  foreach ($brokenLink in $badLinks[$pageLink]) {
-    Write-Host "  $brokenLink"
-  }
-}
+Write-Host "Found $($checkedLinks.Count) links with $($badLinks.Count) broken"
+$badLinks | ForEach-Object { Write-Host "  $_" }
 
-if ($badLinks.Count -gt 0) {
-  LogError "Found $($checkedLinks.Count) links with $($badLinks.Count) page(s) broken."
-} 
-else {
-  Write-Host "Found $($checkedLinks.Count) links. No broken links found."
-}
 exit $badLinks.Count
diff --git a/eng/common/scripts/add-pullrequest-reviewers.ps1 b/eng/common/scripts/add-pullrequest-reviewers.ps1
@@ -18,6 +18,32 @@ param(
     $AuthToken
 )
 
+function AddMembers($memberName, $additionSet) {
+  $headers = @{
+    Authorization = "bearer $AuthToken"
+  }
+  $uri = "https://api.github.com/repos/$RepoOwner/$RepoName/pulls/$PRNumber/requested_reviewers"
+  $errorOccurred = $false
+
+  foreach ($id in $additionSet) {
+    try {
+      $postResp = @{}
+      $postResp[$memberName] = @($id)
+      $postResp = $postResp | ConvertTo-Json
+
+      Write-Host $postResp
+      $resp = Invoke-RestMethod -Method Post -Headers $headers -Body $postResp -Uri $uri -MaximumRetryCount 3
+      $resp | Write-Verbose
+    }
+    catch {
+      Write-Host "Error attempting to add $user `n$_"
+      $errorOccurred = $true
+    }
+  }
+
+  return $errorOccurred
+}
+
 # at least one of these needs to be populated
 if (-not $GitHubUsers -and -not $GitHubTeams) {
   Write-Host "No user provided for addition, exiting."
@@ -27,54 +53,9 @@ if (-not $GitHubUsers -and -not $GitHubTeams) {
 $userAdditions = @($GitHubUsers.Split(",") | % { $_.Trim() } | ? { return $_ })
 $teamAdditions = @($GitHubTeams.Split(",") | % { $_.Trim() } | ? { return $_ })
 
-$headers = @{
-  Authorization = "bearer $AuthToken"
-}
-$uri = "https://api.github.com/repos/$RepoOwner/$RepoName/pulls/$PRNumber/requested_reviewers"
+$errorsOccurredAddingUsers = AddMembers -memberName "reviewers" -additionSet $userAdditions
+$errorsOccurredAddingTeams = AddMembers -memberName "team_reviewers" -additionSet $teamAdditions
 
-try {
-  $resp = Invoke-RestMethod -Headers $headers $uri -MaximumRetryCount 3
-}
-catch {
-  Write-Error "Invoke-RestMethod [$uri] failed with exception:`n$_"
+if ($errorsOccurredAddingUsers -or $errorsOccurredAddingTeams) {
   exit 1
 }
-
-# the response object takes this form: https://developer.github.com/v3/pulls/review_requests/#response-1
-# before we can push a new reviewer, we need to pull the simple Ids out of the complex objects that came back in the response
-$userReviewers = @($resp.users | % { return $_.login })
-$teamReviewers = @($resp.teams | % { return $_.slug })
-
-if (!$userReviewers) { $modifiedUserReviewers = @() } else { $modifiedUserReviewers = $userReviewers.Clone() }
-$modifiedUserReviewers += ($userAdditions | ? { !$modifiedUserReviewers.Contains($_) })
-
-if ($teamReviewers) { $modifiedTeamReviewers = @() } else { $modifiedTeamReviewers = $teamReviewers.Clone() }
-$modifiedTeamReviewers += ($teamAdditions | ? { !$modifiedTeamReviewers.Contains($_) })
-
-$detectedUserDiffs = Compare-Object -ReferenceObject $userReviewers -DifferenceObject $modifiedUserReviewers
-$detectedTeamDiffs = Compare-Object -ReferenceObject $teamReviewers -DifferenceObject $modifiedTeamReviewers
-
-# Compare-Object returns values when there is a difference between the comparied objects.
-# we only want to run the update if there IS a difference.
-if ($detectedUserDiffs -or $detectedTeamDiffs) {
-  $postResp = @{}
-
-  if ($modifiedUserReviewers) { $postResp["reviewers"] = $modifiedUserReviewers }
-  if ($modifiedTeamReviewers) { $postResp["team_reviewers"] = $modifiedTeamReviewers }
-
-  $postResp = $postResp | ConvertTo-Json
-
-  try {
-    Write-Host $postResp
-    $resp = Invoke-RestMethod -Method Post -Headers $headers -Body $postResp -Uri $uri -MaximumRetryCount 3
-    $resp | Write-Verbose
-  }
-  catch {
-    Write-Error "Unable to update PR reviewers. `n$_"
-  }
-}
-else {
-  $results = $GitHubUsers + $GitHubTeams
-  Write-Host "Reviewers $results already added. Exiting."
-  exit(0)
-}