Skip to content

Commit 22b9edc

Browse files
Zane/guardian fix (#1482)
* guardian fix
1 parent 7f8161b commit 22b9edc

3 files changed

Lines changed: 66 additions & 38 deletions

File tree

.gdn/.gdnsuppress

Lines changed: 0 additions & 25 deletions
This file was deleted.

.pipelines/azure_pipeline_mergedbranches.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ extends:
3939
name: Azure-Pipelines-CI-Test-EO
4040
image: ci-1es-managed-windows-2022
4141
os: windows
42+
suppression:
43+
suppressionFile: $(Build.SourcesDirectory)\guardian\SDL\.gdnsuppress
4244
customBuildTags:
4345
- ES365AIMigrationTooling
4446
stages:
@@ -58,19 +60,6 @@ extends:
5860
targetPath: '$(Build.ArtifactStagingDirectory)'
5961
artifactName: drop
6062
steps:
61-
- bash: |
62-
echo "Current directory: $(pwd)"
63-
echo "Contents of .gdn directory:"
64-
find . -name ".gdnsuppress" -type f
65-
ls -la .gdn/ || echo ".gdn directory not found"
66-
echo "Build.SourcesDirectory: $(Build.SourcesDirectory)"
67-
echo "System.DefaultWorkingDirectory: $(System.DefaultWorkingDirectory)"
68-
echo "Copying Guardian suppression file to workspace root..."
69-
mkdir -p /mnt/vss/_work/1/.gdn
70-
cp .gdn/.gdnsuppress /mnt/vss/_work/1/.gdn/.gdnsuppress
71-
echo "Verification - suppression file copied:"
72-
ls -la /mnt/vss/_work/1/.gdn/
73-
displayName: 'copy over Guardian suppression file'
7463
- task: ComponentGovernanceComponentDetection@0
7564
- bash: |
7665
commit=$(git describe)

guardian/SDL/gdnsuppress

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"hydrated": true,
3+
"properties": {
4+
"helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/suppressions"
5+
},
6+
"version": "1.0.0",
7+
"suppressionSets": {
8+
"default": {
9+
"name": "default",
10+
"createdDate": "2025-06-11 21:49:35Z",
11+
"lastUpdatedDate": "2025-06-11 21:49:35Z"
12+
}
13+
},
14+
"results": {
15+
"d7b5848a2ae854218463e08d9f4a5f1af219efd2318303f0e2809a19c32ce23f": {
16+
"signature": "d7b5848a2ae854218463e08d9f4a5f1af219efd2318303f0e2809a19c32ce23f",
17+
"alternativeSignatures": [],
18+
"target": "scripts/troubleshoot/TroubleshootError.ps1",
19+
"line": 935,
20+
"memberOf": [
21+
"default"
22+
],
23+
"tool": "credscan",
24+
"ruleId": "CSCAN-GENERAL0060",
25+
"createdDate": "2025-06-11 21:49:35Z"
26+
},
27+
"64ea9fed7769d951c48c06c4e7b75263a9524b1c201368536a7a0e3a414aa4ab": {
28+
"signature": "64ea9fed7769d951c48c06c4e7b75263a9524b1c201368536a7a0e3a414aa4ab",
29+
"alternativeSignatures": [],
30+
"target": "scripts/troubleshoot/TroubleshootError_nonAzureK8s.ps1",
31+
"line": 452,
32+
"memberOf": [
33+
"default"
34+
],
35+
"tool": "credscan",
36+
"ruleId": "CSCAN-GENERAL0060",
37+
"createdDate": "2025-06-11 21:49:35Z"
38+
},
39+
"8be214bf6f5d10a2ef39860ea5377f78c060e33eccbd4772982e373aec36f16a": {
40+
"signature": "8be214bf6f5d10a2ef39860ea5377f78c060e33eccbd4772982e373aec36f16a",
41+
"alternativeSignatures": [],
42+
"target": "test/testkube/helm-testkube-values.yaml",
43+
"line": 506,
44+
"memberOf": [
45+
"default"
46+
],
47+
"tool": "credscan",
48+
"ruleId": "CSCAN-GENERAL0060",
49+
"createdDate": "2025-06-11 21:49:35Z"
50+
},
51+
"c0fca0f0214bc1300d3f3754bc97b4da3a2abd024179334879dd93c7b3d208a1": {
52+
"signature": "c0fca0f0214bc1300d3f3754bc97b4da3a2abd024179334879dd93c7b3d208a1",
53+
"alternativeSignatures": [],
54+
"target": "test/testkube/helm-testkube-values.yaml",
55+
"line": 687,
56+
"memberOf": [
57+
"default"
58+
],
59+
"tool": "credscan",
60+
"ruleId": "CSCAN-GENERAL0060",
61+
"createdDate": "2025-06-11 21:49:35Z"
62+
}
63+
}
64+
}

0 commit comments

Comments
 (0)