Skip to content

Commit 298ee40

Browse files
authored
sanitize error message (#20700)
* sanitize error message * sanitize error message for DockerComposeV0
1 parent 9c66fd5 commit 298ee40

File tree

13 files changed

+22
-22
lines changed

13 files changed

+22
-22
lines changed

Diff for: Tasks/DockerComposeV0/dockercompose.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
7373
tl.setVariable("DockerComposeOutput", resultPaths);
7474
tl.setResult(tl.TaskResult.Succeeded, "");
7575
}, function failure(err) {
76-
tl.setResult(tl.TaskResult.Failed, err.message);
76+
tl.setSanitizedResult(tl.TaskResult.Failed, err.message);
7777
})
7878
.done();
7979
});

Diff for: Tasks/DockerComposeV0/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],

Diff for: Tasks/DockerComposeV0/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],

Diff for: Tasks/DockerComposeV1/dockercompose.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
7373
tl.setVariable("DockerComposeOutput", resultPaths);
7474
tl.setResult(tl.TaskResult.Succeeded, "");
7575
}, function failure(err) {
76-
tl.setResult(tl.TaskResult.Failed, err.message);
76+
tl.setSanitizedResult(tl.TaskResult.Failed, err.message);
7777
})
7878
.done();
7979
});

Diff for: Tasks/DockerComposeV1/task.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],

Diff for: Tasks/DockerComposeV1/task.loc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 1,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],

Diff for: _generated/DockerComposeV0.versionmap.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Default|0.247.0
2-
Node20_229_2|0.247.1
1+
Default|0.249.0
2+
Node20_229_2|0.249.1

Diff for: _generated/DockerComposeV0/dockercompose.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
7373
tl.setVariable("DockerComposeOutput", resultPaths);
7474
tl.setResult(tl.TaskResult.Succeeded, "");
7575
}, function failure(err) {
76-
tl.setResult(tl.TaskResult.Failed, err.message);
76+
tl.setSanitizedResult(tl.TaskResult.Failed, err.message);
7777
})
7878
.done();
7979
});

Diff for: _generated/DockerComposeV0/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],
@@ -362,7 +362,7 @@
362362
"MigrateToDockerComposeV2": "The task is using Docker Compose V1, which is end-of-life and will be removed from Microsoft-hosted agents July 24. Pipelines running on Microsoft-hosted agents should be updated for Docker Compose v2 compatibility e.g. use compatible container names. For guidance on required updates, please refer to the official Docker Compose documentation at https://docs.docker.com/compose/migrate/"
363363
},
364364
"_buildConfigMapping": {
365-
"Default": "0.247.0",
366-
"Node20_229_2": "0.247.1"
365+
"Default": "0.249.0",
366+
"Node20_229_2": "0.249.1"
367367
}
368368
}

Diff for: _generated/DockerComposeV0/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 0
1818
},
1919
"demands": [],
@@ -362,7 +362,7 @@
362362
"MigrateToDockerComposeV2": "ms-resource:loc.messages.MigrateToDockerComposeV2"
363363
},
364364
"_buildConfigMapping": {
365-
"Default": "0.247.0",
366-
"Node20_229_2": "0.247.1"
365+
"Default": "0.249.0",
366+
"Node20_229_2": "0.249.1"
367367
}
368368
}

Diff for: _generated/DockerComposeV0_Node20/dockercompose.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ if (nopIfNoDockerComposeFile && !tl.exist(dockerFile)) {
7373
tl.setVariable("DockerComposeOutput", resultPaths);
7474
tl.setResult(tl.TaskResult.Succeeded, "");
7575
}, function failure(err) {
76-
tl.setResult(tl.TaskResult.Failed, err.message);
76+
tl.setSanitizedResult(tl.TaskResult.Failed, err.message);
7777
})
7878
.done();
7979
});

Diff for: _generated/DockerComposeV0_Node20/task.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 1
1818
},
1919
"demands": [],
@@ -366,7 +366,7 @@
366366
"MigrateToDockerComposeV2": "The task is using Docker Compose V1, which is end-of-life and will be removed from Microsoft-hosted agents July 24. Pipelines running on Microsoft-hosted agents should be updated for Docker Compose v2 compatibility e.g. use compatible container names. For guidance on required updates, please refer to the official Docker Compose documentation at https://docs.docker.com/compose/migrate/"
367367
},
368368
"_buildConfigMapping": {
369-
"Default": "0.247.0",
370-
"Node20_229_2": "0.247.1"
369+
"Default": "0.249.0",
370+
"Node20_229_2": "0.249.1"
371371
}
372372
}

Diff for: _generated/DockerComposeV0_Node20/task.loc.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"author": "Microsoft Corporation",
1414
"version": {
1515
"Major": 0,
16-
"Minor": 247,
16+
"Minor": 249,
1717
"Patch": 1
1818
},
1919
"demands": [],
@@ -366,7 +366,7 @@
366366
"MigrateToDockerComposeV2": "ms-resource:loc.messages.MigrateToDockerComposeV2"
367367
},
368368
"_buildConfigMapping": {
369-
"Default": "0.247.0",
370-
"Node20_229_2": "0.247.1"
369+
"Default": "0.249.0",
370+
"Node20_229_2": "0.249.1"
371371
}
372372
}

0 commit comments

Comments
 (0)