Skip to content

Commit 77f58d2

Browse files
[FtpUploadV2] Fail on exception when reading FTP options (#14742)
* fail on exceptions * bump task version * revert FtpUploadV1 changes * fix automatic string conversion
1 parent e8abe8b commit 77f58d2

File tree

4 files changed

+13
-4
lines changed

4 files changed

+13
-4
lines changed

Tasks/FtpUploadV2/Strings/resources.resjson/en-US/resources.resjson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"loc.messages.Disconnected": "disconnected",
3737
"loc.messages.DisconnectHost": "disconnecting from: %s",
3838
"loc.messages.FTPConnected": "connected: %s",
39+
"loc.messages.InvalidFTPOptions": "There was an error when reading FTP options: %s",
3940
"loc.messages.FTPNoHostSpecified": "The FTP server URL must include a host name",
4041
"loc.messages.FTPNoProtocolSpecified": "The FTP server URL must begin with ftp:// or ftps://",
4142
"loc.messages.NoFilesFound": "Could not find any files to upload",

Tasks/FtpUploadV2/ftpuploadtask.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,13 @@ async function run() {
261261
tl.setResourcePath(path.join(__dirname, "task.json"));
262262

263263
const tries = 3;
264-
const ftpOptions: FtpOptions = getFtpOptions();
264+
let ftpOptions: FtpOptions;
265+
try {
266+
ftpOptions = getFtpOptions();
267+
} catch (err) {
268+
tl.setResult(tl.TaskResult.Failed, tl.loc('InvalidFTPOptions', err));
269+
return;
270+
}
265271

266272
if (!ftpOptions.serverEndpointUrl.protocol) {
267273
tl.setResult(tl.TaskResult.Failed, tl.loc("FTPNoProtocolSpecified"));

Tasks/FtpUploadV2/task.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"version": {
2020
"Major": 2,
2121
"Minor": 186,
22-
"Patch": 0
22+
"Patch": 1
2323
},
2424
"minimumAgentVersion": "2.182.1",
2525
"instanceNameFormat": "FTP Upload: $(rootFolder)",
@@ -195,6 +195,7 @@
195195
"Disconnected": "disconnected",
196196
"DisconnectHost": "disconnecting from: %s",
197197
"FTPConnected": "connected: %s",
198+
"InvalidFTPOptions": "There was an error when reading FTP options: %s",
198199
"FTPNoHostSpecified": "The FTP server URL must include a host name",
199200
"FTPNoProtocolSpecified": "The FTP server URL must begin with ftp:// or ftps://",
200201
"NoFilesFound": "Could not find any files to upload",
@@ -203,4 +204,4 @@
203204
"UploadSucceedRes": "FTP upload successful",
204205
"UploadFailed": "Ftp Upload failed"
205206
}
206-
}
207+
}

Tasks/FtpUploadV2/task.loc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"version": {
2020
"Major": 2,
2121
"Minor": 186,
22-
"Patch": 0
22+
"Patch": 1
2323
},
2424
"minimumAgentVersion": "2.182.1",
2525
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
@@ -195,6 +195,7 @@
195195
"Disconnected": "ms-resource:loc.messages.Disconnected",
196196
"DisconnectHost": "ms-resource:loc.messages.DisconnectHost",
197197
"FTPConnected": "ms-resource:loc.messages.FTPConnected",
198+
"InvalidFTPOptions": "ms-resource:loc.messages.InvalidFTPOptions",
198199
"FTPNoHostSpecified": "ms-resource:loc.messages.FTPNoHostSpecified",
199200
"FTPNoProtocolSpecified": "ms-resource:loc.messages.FTPNoProtocolSpecified",
200201
"NoFilesFound": "ms-resource:loc.messages.NoFilesFound",

0 commit comments

Comments
 (0)