Adding connected service input in MavevV4 task (#20402)

Co-authored-by: Bhavesh Bhati <bhatibhavesh@microsoft.com>
microsoft · Sep 11, 2024 · d7d1b94 · d7d1b94
1 parent ada25f7
commit d7d1b94
Show file tree

Hide file tree

Showing 12 changed files with 143 additions and 16 deletions.
diff --git a/Tasks/MavenV4/maventask.ts b/Tasks/MavenV4/maventask.ts
@@ -140,6 +140,8 @@ async function execBuild() {
  // 5. Always publish test results even if tests fail, causing this task to fail.
  // 6. If #3 or #4 above failed, exit with an error code to mark the entire step as failed.
 
+ setUpConnectedServiceEnvironmentVariables();
+
  ccReportDir = await execEnableCodeCoverage();
  var userRunFailed: boolean = false;
  var codeAnalysisFailed: boolean = false;
@@ -653,4 +655,23 @@ function replaceImageSourceToBase64(dir: string): void {
  }
 }
 
+function setUpConnectedServiceEnvironmentVariables() {
+ var connectedService = tl.getInput('ConnectedServiceName');
+ if(connectedService) {
+ var authScheme: string = tl.getEndpointAuthorizationScheme(connectedService, false);
+ if (authScheme && authScheme.toLowerCase() == "workloadidentityfederation") {
+ process.env.AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = connectedService;
+ process.env.AZURESUBSCRIPTION_CLIENT_ID = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalid", false);
+ process.env.AZURESUBSCRIPTION_TENANT_ID = tl.getEndpointAuthorizationParameter(connectedService, "tenantid", false);
+ tl.debug('Environment variables AZURESUBSCRIPTION_SERVICE_CONNECTION_ID,AZURESUBSCRIPTION_CLIENT_ID and AZURESUBSCRIPTION_TENANT_ID are set');
+ }
+ else {
+ tl.warning('Connected service is not of type Workload Identity Federation');
+ }
+ }
+ else {
+ tl.debug('No connected service set');
+ }
+}
+
 execBuildWithRestore();
diff --git a/Tasks/MavenV4/task.json b/Tasks/MavenV4/task.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "Azure Resource Manager connection",
+ "defaultValue": "",
+ "helpMarkDown": "Select an Azure Resource Manager service connection"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [

diff --git a/Tasks/MavenV4/task.loc.json b/Tasks/MavenV4/task.loc.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "ms-resource:loc.releaseNotes",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "ms-resource:loc.input.label.ConnectedServiceName",
+ "defaultValue": "",
+ "helpMarkDown": "ms-resource:loc.input.help.ConnectedServiceName"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [

diff --git a/_generated/MavenV4.versionmap.txt b/_generated/MavenV4.versionmap.txt
@@ -1,2 +1,2 @@
-Default|4.245.0
-Node20-225|4.245.1
+Default|4.245.2
+Node20-225|4.245.3
diff --git a/_generated/MavenV4/Strings/resources.resjson/en-US/resources.resjson b/_generated/MavenV4/Strings/resources.resjson/en-US/resources.resjson
@@ -8,6 +8,8 @@
  "loc.group.displayName.codeCoverage": "Code Coverage",
  "loc.group.displayName.advanced": "Advanced",
  "loc.group.displayName.CodeAnalysis": "Code Analysis",
+ "loc.input.label.ConnectedServiceName": "Azure Resource Manager connection",
+ "loc.input.help.ConnectedServiceName": "Select an Azure Resource Manager service connection",
  "loc.input.label.mavenPOMFile": "Maven POM file",
  "loc.input.help.mavenPOMFile": "Relative path from the repository root to the Maven POM file.",
  "loc.input.label.goals": "Goal(s)",

diff --git a/_generated/MavenV4/maventask.ts b/_generated/MavenV4/maventask.ts
@@ -140,6 +140,8 @@ async function execBuild() {
  // 5. Always publish test results even if tests fail, causing this task to fail.
  // 6. If #3 or #4 above failed, exit with an error code to mark the entire step as failed.
 
+ setUpConnectedServiceEnvironmentVariables();
+
  ccReportDir = await execEnableCodeCoverage();
  var userRunFailed: boolean = false;
  var codeAnalysisFailed: boolean = false;
@@ -653,4 +655,23 @@ function replaceImageSourceToBase64(dir: string): void {
  }
 }
 
+function setUpConnectedServiceEnvironmentVariables() {
+ var connectedService = tl.getInput('ConnectedServiceName');
+ if(connectedService) {
+ var authScheme: string = tl.getEndpointAuthorizationScheme(connectedService, false);
+ if (authScheme && authScheme.toLowerCase() == "workloadidentityfederation") {
+ process.env.AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = connectedService;
+ process.env.AZURESUBSCRIPTION_CLIENT_ID = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalid", false);
+ process.env.AZURESUBSCRIPTION_TENANT_ID = tl.getEndpointAuthorizationParameter(connectedService, "tenantid", false);
+ tl.debug('Environment variables AZURESUBSCRIPTION_SERVICE_CONNECTION_ID,AZURESUBSCRIPTION_CLIENT_ID and AZURESUBSCRIPTION_TENANT_ID are set');
+ }
+ else {
+ tl.warning('Connected service is not of type Workload Identity Federation');
+ }
+ }
+ else {
+ tl.debug('No connected service set');
+ }
+}
+
 execBuildWithRestore();
diff --git a/_generated/MavenV4/task.json b/_generated/MavenV4/task.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "Azure Resource Manager connection",
+ "defaultValue": "",
+ "helpMarkDown": "Select an Azure Resource Manager service connection"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [
@@ -517,7 +527,7 @@
  "NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
  },
  "_buildConfigMapping": {
- "Default": "4.245.0",
- "Node20-225": "4.245.1"
+ "Default": "4.245.2",
+ "Node20-225": "4.245.3"
  }
 }
diff --git a/_generated/MavenV4/task.loc.json b/_generated/MavenV4/task.loc.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 0
+ "Patch": 2
  },
  "releaseNotes": "ms-resource:loc.releaseNotes",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "ms-resource:loc.input.label.ConnectedServiceName",
+ "defaultValue": "",
+ "helpMarkDown": "ms-resource:loc.input.help.ConnectedServiceName"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [
@@ -517,7 +527,7 @@
  "NoTestResults": "ms-resource:loc.messages.NoTestResults"
  },
  "_buildConfigMapping": {
- "Default": "4.245.0",
- "Node20-225": "4.245.1"
+ "Default": "4.245.2",
+ "Node20-225": "4.245.3"
  }
 }
diff --git a/_generated/MavenV4_Node20/Strings/resources.resjson/en-US/resources.resjson b/_generated/MavenV4_Node20/Strings/resources.resjson/en-US/resources.resjson
@@ -8,6 +8,8 @@
  "loc.group.displayName.codeCoverage": "Code Coverage",
  "loc.group.displayName.advanced": "Advanced",
  "loc.group.displayName.CodeAnalysis": "Code Analysis",
+ "loc.input.label.ConnectedServiceName": "Azure Resource Manager connection",
+ "loc.input.help.ConnectedServiceName": "Select an Azure Resource Manager service connection",
  "loc.input.label.mavenPOMFile": "Maven POM file",
  "loc.input.help.mavenPOMFile": "Relative path from the repository root to the Maven POM file.",
  "loc.input.label.goals": "Goal(s)",

diff --git a/_generated/MavenV4_Node20/maventask.ts b/_generated/MavenV4_Node20/maventask.ts
@@ -140,6 +140,8 @@ async function execBuild() {
  // 5. Always publish test results even if tests fail, causing this task to fail.
  // 6. If #3 or #4 above failed, exit with an error code to mark the entire step as failed.
 
+ setUpConnectedServiceEnvironmentVariables();
+
  ccReportDir = await execEnableCodeCoverage();
  var userRunFailed: boolean = false;
  var codeAnalysisFailed: boolean = false;
@@ -653,4 +655,23 @@ function replaceImageSourceToBase64(dir: string): void {
  }
 }
 
+function setUpConnectedServiceEnvironmentVariables() {
+ var connectedService = tl.getInput('ConnectedServiceName');
+ if(connectedService) {
+ var authScheme: string = tl.getEndpointAuthorizationScheme(connectedService, false);
+ if (authScheme && authScheme.toLowerCase() == "workloadidentityfederation") {
+ process.env.AZURESUBSCRIPTION_SERVICE_CONNECTION_ID = connectedService;
+ process.env.AZURESUBSCRIPTION_CLIENT_ID = tl.getEndpointAuthorizationParameter(connectedService, "serviceprincipalid", false);
+ process.env.AZURESUBSCRIPTION_TENANT_ID = tl.getEndpointAuthorizationParameter(connectedService, "tenantid", false);
+ tl.debug('Environment variables AZURESUBSCRIPTION_SERVICE_CONNECTION_ID,AZURESUBSCRIPTION_CLIENT_ID and AZURESUBSCRIPTION_TENANT_ID are set');
+ }
+ else {
+ tl.warning('Connected service is not of type Workload Identity Federation');
+ }
+ }
+ else {
+ tl.debug('No connected service set');
+ }
+}
+
 execBuildWithRestore();
diff --git a/_generated/MavenV4_Node20/task.json b/_generated/MavenV4_Node20/task.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 1
+ "Patch": 3
  },
  "releaseNotes": "Configuration of the SonarQube analysis was moved to the [SonarQube](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarqube) or [SonarCloud](https://marketplace.visualstudio.com/items?itemName=SonarSource.sonarcloud) extensions, in task `Prepare Analysis Configuration`",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "Azure Resource Manager connection",
+ "defaultValue": "",
+ "helpMarkDown": "Select an Azure Resource Manager service connection"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [
@@ -521,7 +531,7 @@
  "NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
  },
  "_buildConfigMapping": {
- "Default": "4.245.0",
- "Node20-225": "4.245.1"
+ "Default": "4.245.2",
+ "Node20-225": "4.245.3"
  }
 }
diff --git a/_generated/MavenV4_Node20/task.loc.json b/_generated/MavenV4_Node20/task.loc.json
@@ -18,7 +18,7 @@
  "version": {
  "Major": 4,
  "Minor": 245,
- "Patch": 1
+ "Patch": 3
  },
  "releaseNotes": "ms-resource:loc.releaseNotes",
  "demands": [
@@ -49,6 +49,16 @@
  }
  ],
  "inputs": [
+ {
+ "name": "ConnectedServiceName",
+ "aliases": [
+ "azureSubscription"
+ ],
+ "type": "connectedService:AzureRM",
+ "label": "ms-resource:loc.input.label.ConnectedServiceName",
+ "defaultValue": "",
+ "helpMarkDown": "ms-resource:loc.input.help.ConnectedServiceName"
+ },
  {
  "name": "mavenPOMFile",
  "aliases": [
@@ -521,7 +531,7 @@
  "NoTestResults": "ms-resource:loc.messages.NoTestResults"
  },
  "_buildConfigMapping": {
- "Default": "4.245.0",
- "Node20-225": "4.245.1"
+ "Default": "4.245.2",
+ "Node20-225": "4.245.3"
  }
 }