From 165ee2301805cbda1463088ae0dd403a14395a1f Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Thu, 10 Feb 2022 21:58:58 -0800 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 2740 (#17043) * Change credscan to use v3 and enable to scan entire repo * Check string emtpy * add quotes around parameters Co-authored-by: sima-zhu --- eng/common/pipelines/templates/steps/credscan.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index 029b370e0b03..a202961a30e0 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -12,15 +12,17 @@ steps: $changedFiles | ForEach-Object { Add-Content -Path "${{ parameters.SourceDirectory }}/credscan.tsv" -Value "${{ parameters.SourceDirectory }}/$_"} } else { - Set-Content "${{ parameters.SourceDirectory }}/credscan.tsv" -Value "${{ parameters.SourceDirectory }}/sdk/${{ parameters.ServiceDirectory }}" + $scanFolder = "" + if ("${{ parameters.ServiceDirectory }}" -ne '') { + $scanFolder = "sdk/${{ parameters.ServiceDirectory }}" + } + Set-Content "${{ parameters.SourceDirectory }}/credscan.tsv" -Value "${{ parameters.SourceDirectory }}/$scanFolder" } Get-Content "${{ parameters.SourceDirectory }}/credscan.tsv" displayName: CredScan setup -- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@2 +- task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3 displayName: CredScan running inputs: - toolMajorVersion: V2 - toolVersion: latest scanFolder: "${{ parameters.SourceDirectory }}/credscan.tsv" suppressionsFile: ${{ parameters.SuppressionFilePath }} - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2