From 51b8bdc7821144cad9c3739b8be9bf1079901360 Mon Sep 17 00:00:00 2001
From: SteVen Batten <sbatten@microsoft.com>
Date: Tue, 16 May 2023 09:49:25 -0700
Subject: [PATCH] updating tsa options (#182651)

* updating tsa options

* add template
---
 build/azure-pipelines/.gdntsa                | 21 ----------------
 build/azure-pipelines/config/tsaoptions.json | 25 +++++++++++++-------
 build/azure-pipelines/sdl-scan.yml           |  6 ++---
 3 files changed, 20 insertions(+), 32 deletions(-)
 delete mode 100644 build/azure-pipelines/.gdntsa

diff --git a/build/azure-pipelines/.gdntsa b/build/azure-pipelines/.gdntsa
deleted file mode 100644
index d3b1b7c6d86..00000000000
--- a/build/azure-pipelines/.gdntsa
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "codebaseName": "vscode-client",
-    "ppe": false,
-    "notificationAliases": [
-        "sbatten@microsoft.com"
-    ],
-    "codebaseAdmins": [
-        "REDMOND\\stbatt",
-        "REDMOND\\monacotools"
-    ],
-    "instanceUrl": "https://msazure.visualstudio.com/defaultcollection",
-    "projectName": "One",
-    "areaPath": "One\\VSCode\\Visual Studio Code Client",
-    "iterationPath": "One",
-    "notifyAlways": true,
-    "tools": [
-        "BinSkim",
-        "CredScan",
-        "CodeQL"
-    ]
-}
diff --git a/build/azure-pipelines/config/tsaoptions.json b/build/azure-pipelines/config/tsaoptions.json
index 560d0c2513a..fa8e182d8f3 100644
--- a/build/azure-pipelines/config/tsaoptions.json
+++ b/build/azure-pipelines/config/tsaoptions.json
@@ -1,12 +1,21 @@
 {
-	"instanceUrl": "https://msazure.visualstudio.com/defaultcollection",
-	"projectName": "One",
-	"areaPath": "One\\VSCode\\Client",
-	"iterationPath": "One",
+	"codebaseName": "devdiv_vscode-client",
+	"ppe": false,
 	"notificationAliases": [
-		"sbatten@microsoft.com"
+			"sbatten@microsoft.com"
 	],
-	"ppe": "false",
-	"template": "TFSMSAzure",
-	"codebaseName": "vscode-client"
+	"codebaseAdmins": [
+			"REDMOND\\stbatt",
+			"REDMOND\\monacotools"
+	],
+	"instanceUrl": "https://devdiv.visualstudio.com/defaultcollection",
+	"projectName": "DevDiv",
+	"areaPath": "DevDiv\\VS Code (compliance tracking only)\\Visual Studio Code Client",
+	"notifyAlways": true,
+	"template": "TFSDEVDIV",
+	"tools": [
+			"BinSkim",
+			"CredScan",
+			"CodeQL"
+	]
 }
diff --git a/build/azure-pipelines/sdl-scan.yml b/build/azure-pipelines/sdl-scan.yml
index b3c2a12b02b..8c81ee20401 100644
--- a/build/azure-pipelines/sdl-scan.yml
+++ b/build/azure-pipelines/sdl-scan.yml
@@ -35,7 +35,7 @@ variables:
   - name: Codeql.TSAEnabled
     value: true
   - name: Codeql.TSAOptionsPath
-    value: '$(Build.SourcesDirectory)\build\azure-pipelines\.gdntsa'
+    value: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
 
 stages:
   - stage: Windows
@@ -161,7 +161,7 @@ stages:
           - task: TSAUpload@2
             inputs:
               GdnPublishTsaOnboard: true
-              GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\build\azure-pipelines\.gdntsa'
+              GdnPublishTsaConfigFile: '$(Build.SourcesDirectory)\build\azure-pipelines\config\tsaoptions.json'
 
   - stage: Linux
     dependsOn: []
@@ -280,4 +280,4 @@ stages:
 
           - task: TSAUpload@2
             inputs:
-              GdnPublishTsaConfigFile: '$(Build.SourceDirectory)\build\azure-pipelines\.gdntsa'
+              GdnPublishTsaConfigFile: '$(Build.SourceDirectory)\build\azure-pipelines\config\tsaoptions.json'