Skip to content

Commit 8e629a0

Browse files
authored
correcting implicit set to incremental mode (#12360) (#12391)
1 parent f44b32d commit 8e629a0

File tree

6 files changed

+16
-8
lines changed

6 files changed

+16
-8
lines changed

Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,10 @@ export class ResourceGroup {
508508
private validateDeployment(armClient: armResource.ResourceManagementClient, deployment: Deployment): Promise<void> {
509509
return new Promise<void>((resolve, reject) => {
510510
console.log(tl.loc("StartingValidation"));
511-
deployment.properties["mode"] = "Incremental";
511+
if(!(!!deployment.properties["mode"] && (deployment.properties["mode"] === "Complete" || deployment.properties["mode"] === "Incremental")))
512+
{
513+
deployment.properties["mode"] = "Incremental";
514+
}
512515
this.taskParameters.deploymentName = this.taskParameters.deploymentName || this.createDeploymentName();
513516
console.log(tl.loc("LogDeploymentName", this.taskParameters.deploymentName));
514517
armClient.deployments.validate(this.taskParameters.deploymentName, deployment, (error, result, request, response) => {
@@ -532,6 +535,7 @@ export class ResourceGroup {
532535
}
533536

534537
if (deployment.properties["mode"] === "Validation") {
538+
deployment.properties["mode"] = "Incremental";
535539
return this.validateDeployment(armClient, deployment);
536540
} else {
537541
try {

Tasks/AzureResourceGroupDeploymentV2/task.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 2,
17-
"Minor": 163,
18-
"Patch": 8
17+
"Minor": 165,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"minimumAgentVersion": "2.119.1",

Tasks/AzureResourceGroupDeploymentV2/task.loc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"author": "Microsoft Corporation",
1515
"version": {
1616
"Major": 2,
17-
"Minor": 163,
18-
"Patch": 8
17+
"Minor": 165,
18+
"Patch": 0
1919
},
2020
"demands": [],
2121
"minimumAgentVersion": "2.119.1",

Tasks/AzureResourceManagerTemplateDeploymentV3/operations/DeploymentScopeBase.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ export class DeploymentScopeBase {
4848
}
4949

5050
if (this.deploymentParameters.properties["mode"] === "Validation") {
51+
this.deploymentParameters.properties["mode"] = "Incremental";
5152
return this.validateDeployment();
5253
} else {
5354
try {
@@ -139,7 +140,10 @@ export class DeploymentScopeBase {
139140
protected validateDeployment(): Promise<void> {
140141
return new Promise<void>((resolve, reject) => {
141142
console.log(tl.loc("StartingValidation"));
142-
this.deploymentParameters.properties["mode"] = "Incremental";
143+
if(!(!!this.deploymentParameters.properties["mode"] && (this.deploymentParameters.properties["mode"] === "Complete" || this.deploymentParameters.properties["mode"] === "Incremental")))
144+
{
145+
this.deploymentParameters.properties["mode"] = "Incremental";
146+
}
143147
this.taskParameters.deploymentName = this.taskParameters.deploymentName || utils.createDeploymentName(this.taskParameters);
144148
console.log(tl.loc("LogDeploymentName", this.taskParameters.deploymentName));
145149
this.armClient.deployments.validate(this.taskParameters.deploymentName, this.deploymentParameters, (error, result, request, response) => {

Tasks/AzureResourceManagerTemplateDeploymentV3/task.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"version": {
1616
"Major": 3,
1717
"Minor": 1,
18-
"Patch": 18
18+
"Patch": 19
1919
},
2020
"preview": "true",
2121
"demands": [],

Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"version": {
1616
"Major": 3,
1717
"Minor": 1,
18-
"Patch": 18
18+
"Patch": 19
1919
},
2020
"preview": "true",
2121
"demands": [],

0 commit comments

Comments
 (0)