From 7830aa554c66fb440cd720e587dccf04dccbcc4e Mon Sep 17 00:00:00 2001 From: sima-zhu Date: Wed, 16 Feb 2022 09:29:28 -0800 Subject: [PATCH 1/6] update baseline --- eng/common/pipelines/templates/steps/credscan.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index d2704bce6f22..c39373be1f50 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -3,7 +3,6 @@ parameters: BaselineFilePath: '' SourceDirectory: $(Build.SourcesDirectory) ServiceDirectory: '' - steps: - pwsh: | if ("$(Build.Reason)" -eq 'PullRequest') { @@ -38,8 +37,8 @@ steps: GdnBreakGdnToolCredScanSeverity: Error GdnBreakBaselines: baseline # Used for generating baseline file. - # GdnBreakOutputBaselineFile: dotnet - # GdnBreakOutputBaseline: baseline + GdnBreakOutputBaselineFile: $(Language) + GdnBreakOutputBaseline: baseline condition: succeededOrFailed() - pwsh: | Write-Host "Please check https://aka.ms/azsdk/credscan for more information about the cred scan failure." From 2e47d6a352b4faf3ea5f5a8f312366259f28064f Mon Sep 17 00:00:00 2001 From: sima-zhu Date: Wed, 16 Feb 2022 09:50:39 -0800 Subject: [PATCH 2/6] change version --- eng/common/pipelines/templates/steps/credscan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index c39373be1f50..f40cd390806f 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -26,6 +26,7 @@ steps: - task: securedevelopmentteam.vss-secure-development-tools.build-task-credscan.CredScan@3 displayName: CredScan running inputs: + toolVersion: 2.2.7.8 scanFolder: "${{ parameters.SourceDirectory }}/credscan.tsv" suppressionsFile: ${{ parameters.SuppressionFilePath }} - task: securedevelopmentteam.vss-secure-development-tools.build-task-postanalysis.PostAnalysis@2 From 17bbdc53c09f3989bdc64d8cd114951947f00003 Mon Sep 17 00:00:00 2001 From: sima-zhu Date: Wed, 16 Feb 2022 10:48:21 -0800 Subject: [PATCH 3/6] Update the credscan version --- eng/common/pipelines/templates/steps/credscan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index f40cd390806f..6d7268c1bc8d 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -38,8 +38,8 @@ steps: GdnBreakGdnToolCredScanSeverity: Error GdnBreakBaselines: baseline # Used for generating baseline file. - GdnBreakOutputBaselineFile: $(Language) - GdnBreakOutputBaseline: baseline + # GdnBreakOutputBaselineFile: $(Language) + # GdnBreakOutputBaseline: baseline condition: succeededOrFailed() - pwsh: | Write-Host "Please check https://aka.ms/azsdk/credscan for more information about the cred scan failure." From 98eb8b77a7e86825d37da8b1a45d1428b06463fa Mon Sep 17 00:00:00 2001 From: sima-zhu Date: Wed, 16 Feb 2022 10:50:02 -0800 Subject: [PATCH 4/6] add empty line --- eng/common/pipelines/templates/steps/credscan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index 6d7268c1bc8d..94ab758659e4 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -3,6 +3,7 @@ parameters: BaselineFilePath: '' SourceDirectory: $(Build.SourcesDirectory) ServiceDirectory: '' + steps: - pwsh: | if ("$(Build.Reason)" -eq 'PullRequest') { From c5b914a7d0fe1164f7ff0a7ac68221db996c77a8 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:00:31 -0800 Subject: [PATCH 5/6] Update credscan.yml --- eng/common/pipelines/templates/steps/credscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index 94ab758659e4..33d03f350983 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -39,7 +39,7 @@ steps: GdnBreakGdnToolCredScanSeverity: Error GdnBreakBaselines: baseline # Used for generating baseline file. - # GdnBreakOutputBaselineFile: $(Language) + # GdnBreakOutputBaselineFile: $(baseline) # GdnBreakOutputBaseline: baseline condition: succeededOrFailed() - pwsh: | From 1369110c1b061f7d08e0793144f5cc8e356bd1a6 Mon Sep 17 00:00:00 2001 From: Sima Zhu <48036328+sima-zhu@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:35:24 -0800 Subject: [PATCH 6/6] Update eng/common/pipelines/templates/steps/credscan.yml Co-authored-by: Wes Haggard --- eng/common/pipelines/templates/steps/credscan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/common/pipelines/templates/steps/credscan.yml b/eng/common/pipelines/templates/steps/credscan.yml index 33d03f350983..7c6c90987351 100644 --- a/eng/common/pipelines/templates/steps/credscan.yml +++ b/eng/common/pipelines/templates/steps/credscan.yml @@ -39,7 +39,7 @@ steps: GdnBreakGdnToolCredScanSeverity: Error GdnBreakBaselines: baseline # Used for generating baseline file. - # GdnBreakOutputBaselineFile: $(baseline) + # GdnBreakOutputBaselineFile: baseline # GdnBreakOutputBaseline: baseline condition: succeededOrFailed() - pwsh: |