Revert "Sync eng/common directory with azure-sdk-tools for PR 2673 (#20198)" (#20204)

sima-zhu · web-flow · commit 86d5d1f7b206 · 2022-02-03T14:04:06.000-08:00
This reverts commit 752a736.
diff --git a/eng/common/scripts/Helpers/Metadata-Helpers.ps1 b/eng/common/scripts/Helpers/Metadata-Helpers.ps1
@@ -30,10 +30,10 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)
         $opsAuthToken = Generate-AadToken -TenantId $TenantId -ClientId $ClientId -ClientSecret $ClientSecret
         $Headers["Authorization"] = "Bearer $opsAuthToken"
         Write-Host "Fetching aad identity for github user: $GithubUser"
-        $resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers -MaximumRetryCount 3
+        $resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers
     }
     catch { 
-        Write-Warning $_
+        Write-Error $_
         return $null
     }
 
@@ -43,7 +43,7 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)
         Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser."
         return $resp.aad.alias
     }
-    Write-Warning "Failed to retrieve the aad identity from given github user: $GithubName"
+    Write-Error "Failed to retrieve the aad identity from given github user: $GithubName"
     return $null
 }
 
@@ -54,6 +54,6 @@ function GetPrimaryCodeOwner ($TargetDirectory)
         Write-Host "Code Owners are $codeOwnerArray."
         return $codeOwnerArray[0]
     }
-    Write-Warning "No code owner found in $TargetDirectory."
+    Write-Error "No code owner found in $TargetDirectory."
     return $null
 }
diff --git a/eng/common/scripts/Update-DocsMsMetadata.ps1 b/eng/common/scripts/Update-DocsMsMetadata.ps1
@@ -225,6 +225,10 @@ foreach ($packageInfoLocation in $PackageInfoJsonLocations) {
   if ($ValidateDocsMsPackagesFn -and (Test-Path "Function:$ValidateDocsMsPackagesFn")) {
     Write-Host "Validating the package..."
     &$ValidateDocsMsPackagesFn -PackageInfo $packageInfo -PackageSourceOverride $PackageSourceOverride -DocValidationImageId $DocValidationImageId -DocRepoLocation $DocRepoLocation
+    if ($LASTEXITCODE) {
+      LogError "The package failed Doc.Ms validation. Check https://aka.ms/azsdk/docs/docker for more details on how to diagnose this issue."
+      exit $LASTEXITCODE
+    }
   }
   Write-Host "Updating the package json ..."
   UpdateDocsMsMetadataForPackage $packageInfoLocation $packageInfo

Original file line number	Diff line number	Diff line change
`@@ -30,10 +30,10 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)`
`30`	`30`	`$opsAuthToken = Generate-AadToken -TenantId $TenantId -ClientId $ClientId -ClientSecret $ClientSecret`
`31`	`31`	`$Headers["Authorization"] = "Bearer $opsAuthToken"`
`32`	`32`	`Write-Host "Fetching aad identity for github user: $GithubUser"`
`33`		`- $resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers -MaximumRetryCount 3`
	`33`	`+ $resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers`
`34`	`34`	`}`
`35`	`35`	`catch {`
`36`		`- Write-Warning $_`
	`36`	`+ Write-Error $_`
`37`	`37`	`return $null`
`38`	`38`	`}`
`39`	`39`
`@@ -43,7 +43,7 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)`
`43`	`43`	`Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser."`
`44`	`44`	`return $resp.aad.alias`
`45`	`45`	`}`
`46`		`- Write-Warning "Failed to retrieve the aad identity from given github user: $GithubName"`
	`46`	`+ Write-Error "Failed to retrieve the aad identity from given github user: $GithubName"`
`47`	`47`	`return $null`
`48`	`48`	`}`
`49`	`49`
`@@ -54,6 +54,6 @@ function GetPrimaryCodeOwner ($TargetDirectory)`
`54`	`54`	`Write-Host "Code Owners are $codeOwnerArray."`
`55`	`55`	`return $codeOwnerArray[0]`
`56`	`56`	`}`
`57`		`- Write-Warning "No code owner found in $TargetDirectory."`
	`57`	`+ Write-Error "No code owner found in $TargetDirectory."`
`58`	`58`	`return $null`
`59`	`59`	`}`