Updated checks to new PAT format (#20436)

* Update AzureTestPlanV0 Co-authored-by: Jan Kolarik jankolarik@microsoft.com * Update AppCenterTestV1
microsoft · Sep 20, 2024 · e37b9a7 · e37b9a7
1 parent 4ab3b20
commit e37b9a7
Show file tree

Hide file tree

Showing 22 changed files with 128 additions and 119 deletions.
diff --git a/Tasks/AppCenterTestV1/appcentertest.ts b/Tasks/AppCenterTestV1/appcentertest.ts
@@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner';
 var utils = require('./utils.js');
 
 const testRunIdLineRegexp = /Test run id: "([^"]+)"/;
+const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;
 
 function getEndpointAPIToken(endpointInputFieldName) {
  var errorMessage = tl.loc("CannotDecodeEndpoint");
@@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) {
  let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
  let projectId = tl.getVariable('System.TeamProjectId');
  let buildId = tl.getVariable('Build.BuildId');
- let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
+ let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
  let vsts: apim.WebApi = new apim.WebApi(url, auth);
  let conn: lim.ConnectionData = await vsts.connect();
  let buildApi = await vsts.getBuildApi();

diff --git a/Tasks/AppCenterTestV1/task.json b/Tasks/AppCenterTestV1/task.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [

diff --git a/Tasks/AppCenterTestV1/task.loc.json b/Tasks/AppCenterTestV1/task.loc.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [

diff --git a/Tasks/AzureTestPlanV0/package-lock.json b/Tasks/AzureTestPlanV0/package-lock.json
diff --git a/Tasks/AzureTestPlanV0/task.json b/Tasks/AzureTestPlanV0/task.json
@@ -13,7 +13,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 246,
  "Patch": 0
  },
  "preview": true,

diff --git a/Tasks/AzureTestPlanV0/task.loc.json b/Tasks/AzureTestPlanV0/task.loc.json
@@ -13,7 +13,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 246,
  "Patch": 0
  },
  "preview": true,

diff --git a/Tasks/AzureTestPlanV0/testPlanData.ts b/Tasks/AzureTestPlanV0/testPlanData.ts
@@ -9,6 +9,8 @@ import VSSInterfaces = require('azure-devops-node-api/interfaces/common/VSSInter
 import constants = require('./constants');
 import { ITestResultsApi } from "azure-devops-node-api/TestResultsApi";
 
+const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;
+
 export interface TestPlanData {
  listOfFQNOfTestCases: string[];
  testPlanId: number;
@@ -186,7 +188,7 @@ export async function getTestCaseListAsync(testPlanId: number, testSuiteId: numb
  let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false);
  let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
  let projectId = tl.getVariable('System.TeamProjectId');
- let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
+ let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
  let vsts: apim.WebApi = new apim.WebApi(url, auth);
  let testPlanApi = await vsts.getTestPlanApi();
 
@@ -278,7 +280,7 @@ export async function getTestResultApiClient(){
  let url = tl.getEndpointUrl('SYSTEMVSSCONNECTION', false);
  let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
 
- let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
+ let auth = (token.length == 52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
  let vsts: apim.WebApi = new apim.WebApi(url, auth);
  let testResultsApi = await vsts.getTestResultsApi();
 

diff --git a/_generated/AppCenterTestV1.versionmap.txt b/_generated/AppCenterTestV1.versionmap.txt
@@ -1,2 +1,2 @@
-Default|1.246.0
-Node20_229_7|1.246.1
+Default|1.246.2
+Node20_229_7|1.246.3
diff --git a/_generated/AppCenterTestV1/appcentertest.ts b/_generated/AppCenterTestV1/appcentertest.ts
@@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner';
 var utils = require('./utils.js');
 
 const testRunIdLineRegexp = /Test run id: "([^"]+)"/;
+const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;
 
 function getEndpointAPIToken(endpointInputFieldName) {
  var errorMessage = tl.loc("CannotDecodeEndpoint");
@@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) {
  let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
  let projectId = tl.getVariable('System.TeamProjectId');
  let buildId = tl.getVariable('Build.BuildId');
- let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
+ let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
  let vsts: apim.WebApi = new apim.WebApi(url, auth);
  let conn: lim.ConnectionData = await vsts.connect();
  let buildApi = await vsts.getBuildApi();

diff --git a/_generated/AppCenterTestV1/task.json b/_generated/AppCenterTestV1/task.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [
@@ -499,7 +499,7 @@
  "FoundMultipleFiles": "Found multiple files matching %s."
  },
  "_buildConfigMapping": {
- "Default": "1.246.0",
- "Node20_229_7": "1.246.1"
+ "Default": "1.246.2",
+ "Node20_229_7": "1.246.3"
  }
 }
diff --git a/_generated/AppCenterTestV1/task.loc.json b/_generated/AppCenterTestV1/task.loc.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 0
+ "Patch": 2
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [
@@ -499,7 +499,7 @@
  "FoundMultipleFiles": "ms-resource:loc.messages.FoundMultipleFiles"
  },
  "_buildConfigMapping": {
- "Default": "1.246.0",
- "Node20_229_7": "1.246.1"
+ "Default": "1.246.2",
+ "Node20_229_7": "1.246.3"
  }
 }
diff --git a/_generated/AppCenterTestV1_Node20/appcentertest.ts b/_generated/AppCenterTestV1_Node20/appcentertest.ts
@@ -9,6 +9,7 @@ import { ToolRunner } from 'azure-pipelines-task-lib/toolrunner';
 var utils = require('./utils.js');
 
 const testRunIdLineRegexp = /Test run id: "([^"]+)"/;
+const personalAccessTokenRegexp = /^.{76}AZDO.{4}$/;
 
 function getEndpointAPIToken(endpointInputFieldName) {
  var errorMessage = tl.loc("CannotDecodeEndpoint");
@@ -206,7 +207,7 @@ async function setTestRunIdBuildPropertyAsync(testRunId: string) {
  let token = tl.getEndpointAuthorizationParameter('SYSTEMVSSCONNECTION', 'ACCESSTOKEN', false);
  let projectId = tl.getVariable('System.TeamProjectId');
  let buildId = tl.getVariable('Build.BuildId');
- let auth = token.length == 52 ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
+ let auth = token.length == (52 || personalAccessTokenRegexp.test(token)) ? apim.getPersonalAccessTokenHandler(token) : apim.getBearerHandler(token);
  let vsts: apim.WebApi = new apim.WebApi(url, auth);
  let conn: lim.ConnectionData = await vsts.connect();
  let buildApi = await vsts.getBuildApi();

diff --git a/_generated/AppCenterTestV1_Node20/task.json b/_generated/AppCenterTestV1_Node20/task.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 1
+ "Patch": 3
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [
@@ -503,7 +503,7 @@
  "FoundMultipleFiles": "Found multiple files matching %s."
  },
  "_buildConfigMapping": {
- "Default": "1.246.0",
- "Node20_229_7": "1.246.1"
+ "Default": "1.246.2",
+ "Node20_229_7": "1.246.3"
  }
 }
diff --git a/_generated/AppCenterTestV1_Node20/task.loc.json b/_generated/AppCenterTestV1_Node20/task.loc.json
@@ -13,7 +13,7 @@
  "version": {
  "Major": 1,
  "Minor": 246,
- "Patch": 1
+ "Patch": 3
  },
  "minimumAgentVersion": "2.206.1",
  "groups": [
@@ -503,7 +503,7 @@
  "FoundMultipleFiles": "ms-resource:loc.messages.FoundMultipleFiles"
  },
  "_buildConfigMapping": {
- "Default": "1.246.0",
- "Node20_229_7": "1.246.1"
+ "Default": "1.246.2",
+ "Node20_229_7": "1.246.3"
  }
 }
diff --git a/_generated/AzureTestPlanV0.versionmap.txt b/_generated/AzureTestPlanV0.versionmap.txt
@@ -1,2 +1,2 @@
-Default|0.245.0
-Node20-225|0.245.1
+Default|0.246.0
+Node20-225|0.246.1
diff --git a/_generated/AzureTestPlanV0/package-lock.json b/_generated/AzureTestPlanV0/package-lock.json