Skip to content

Commit 04d380d

Browse files
authored
adding condition when visibleazlogin value is false (#20570)
1 parent 78c4531 commit 04d380d

File tree

10 files changed

+28
-19
lines changed

10 files changed

+28
-19
lines changed

Tasks/AzureCLIV2/azureclitask.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,11 @@ export class azureclitask {
204204

205205
const federatedToken = await this.getIdToken(connectedService);
206206
tl.setSecret(federatedToken);
207-
const args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
207+
let args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
208208

209+
if(!visibleAzLogin ){
210+
args += ` --output none`;
211+
}
209212
//login using OpenID Connect federation
210213
Utility.throwIfError(tl.execSync("az", args), tl.loc("LoginFailed"));
211214

Tasks/AzureCLIV2/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",

Tasks/AzureCLIV2/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",

_generated/AzureCLIV2.versionmap.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|2.247.0
2-
Node20_229_2|2.247.1
1+
Default|2.247.2
2+
Node20_229_2|2.247.3

_generated/AzureCLIV2/azureclitask.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,11 @@ export class azureclitask {
192192

193193
const federatedToken = await this.getIdToken(connectedService);
194194
tl.setSecret(federatedToken);
195-
const args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
195+
let args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
196196

197+
if(!visibleAzLogin ){
198+
args += ` --output none`;
199+
}
197200
//login using OpenID Connect federation
198201
Utility.throwIfError(tl.execSync("az", args), tl.loc("LoginFailed"));
199202

_generated/AzureCLIV2/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -226,7 +226,7 @@
226226
"KeepingAzSessionActiveUnsupportedScheme": "The 'keepAzSessionActive' input might be used only for workload identity federation ARM service connection. The referenced service endpoint auth scheme was unexpected: %s. Change the scheme or remove 'keepAzSessionActive' input."
227227
},
228228
"_buildConfigMapping": {
229-
"Default": "2.247.0",
230-
"Node20_229_2": "2.247.1"
229+
"Default": "2.247.2",
230+
"Node20_229_2": "2.247.3"
231231
}
232232
}

_generated/AzureCLIV2/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 0
23+
"Patch": 2
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -226,7 +226,7 @@
226226
"KeepingAzSessionActiveUnsupportedScheme": "ms-resource:loc.messages.KeepingAzSessionActiveUnsupportedScheme"
227227
},
228228
"_buildConfigMapping": {
229-
"Default": "2.247.0",
230-
"Node20_229_2": "2.247.1"
229+
"Default": "2.247.2",
230+
"Node20_229_2": "2.247.3"
231231
}
232232
}

_generated/AzureCLIV2_Node20/azureclitask.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,11 @@ export class azureclitask {
202202

203203
const federatedToken = await this.getIdToken(connectedService);
204204
tl.setSecret(federatedToken);
205-
const args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
205+
let args = `login --service-principal -u "${servicePrincipalId}" --tenant "${tenantId}" --allow-no-subscriptions --federated-token "${federatedToken}"`;
206206

207+
if(!visibleAzLogin ){
208+
args += ` --output none`;
209+
}
207210
//login using OpenID Connect federation
208211
Utility.throwIfError(tl.execSync("az", args), tl.loc("LoginFailed"));
209212

_generated/AzureCLIV2_Node20/task.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 1
23+
"Patch": 3
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "Azure CLI $(scriptPath)",
@@ -230,7 +230,7 @@
230230
"KeepingAzSessionActiveUnsupportedScheme": "The 'keepAzSessionActive' input might be used only for workload identity federation ARM service connection. The referenced service endpoint auth scheme was unexpected: %s. Change the scheme or remove 'keepAzSessionActive' input."
231231
},
232232
"_buildConfigMapping": {
233-
"Default": "2.247.0",
234-
"Node20_229_2": "2.247.1"
233+
"Default": "2.247.2",
234+
"Node20_229_2": "2.247.3"
235235
}
236236
}

_generated/AzureCLIV2_Node20/task.loc.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"version": {
2121
"Major": 2,
2222
"Minor": 247,
23-
"Patch": 1
23+
"Patch": 3
2424
},
2525
"minimumAgentVersion": "2.0.0",
2626
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -230,7 +230,7 @@
230230
"KeepingAzSessionActiveUnsupportedScheme": "ms-resource:loc.messages.KeepingAzSessionActiveUnsupportedScheme"
231231
},
232232
"_buildConfigMapping": {
233-
"Default": "2.247.0",
234-
"Node20_229_2": "2.247.1"
233+
"Default": "2.247.2",
234+
"Node20_229_2": "2.247.3"
235235
}
236236
}

0 commit comments

Comments
 (0)