Sync eng/common directory with azure-sdk-tools for PR 2673 (#20206)

azure-sdk · sima-zhu · web-flow · commit 8f1d6ac9174e · 2022-02-03T16:45:03.000-08:00
* Fixed the failures from strict mode.

* Update Metadata-Helpers.ps1

Co-authored-by: sima-zhu &lt;sizhu@microsoft.com&gt;
Co-authored-by: Sima Zhu &lt;48036328+sima-zhu@users.noreply.github.com&gt;
diff --git a/eng/common/scripts/Helpers/Metadata-Helpers.ps1 b/eng/common/scripts/Helpers/Metadata-Helpers.ps1
@@ -33,17 +33,17 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)
         $resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers
     }
     catch { 
-        Write-Error $_
+        Write-Warning $_
         return $null
     }
 
     $resp | Write-Verbose
 
     if ($resp.aad) {
-        Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser."
+        Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser. "
         return $resp.aad.alias
     }
-    Write-Error "Failed to retrieve the aad identity from given github user: $GithubName"
+    Write-Warning "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-Error "No code owner found in $TargetDirectory."
+    Write-Warning "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,10 +225,6 @@ 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
`@@ -33,17 +33,17 @@ function GetMsAliasFromGithub ($TenantId, $ClientId, $ClientSecret, $GithubUser)`
`33`	`33`	`$resp = Invoke-RestMethod $OpensourceAPIBaseURI -Method 'GET' -Headers $Headers`
`34`	`34`	`}`
`35`	`35`	`catch {`
`36`		`- Write-Error $_`
	`36`	`+ Write-Warning $_`
`37`	`37`	`return $null`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`$resp \| Write-Verbose`
`41`	`41`
`42`	`42`	`if ($resp.aad) {`
`43`		`- Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser."`
	`43`	`+ Write-Host "Fetched aad identity $($resp.aad.alias) for github user $GithubUser. "`
`44`	`44`	`return $resp.aad.alias`
`45`	`45`	`}`
`46`		`- Write-Error "Failed to retrieve the aad identity from given github user: $GithubName"`
	`46`	`+ Write-Warning "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-Error "No code owner found in $TargetDirectory."`
	`57`	`+ Write-Warning "No code owner found in $TargetDirectory."`
`58`	`58`	`return $null`
`59`		`-}`
	`59`	`+}`