Skip to content

Commit 9ce6f5c

Browse files
author
Ivan Duplenskikh
committed
Update ssh2 sftp client in node20 handler package
1 parent cf6b34d commit 9ce6f5c

File tree

13 files changed

+43
-32
lines changed

13 files changed

+43
-32
lines changed

‎Tasks/CopyFilesOverSSHV0/_buildConfigs/Node20/package-lock.json

+10-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Tasks/CopyFilesOverSSHV0/_buildConfigs/Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"homepage": "https://github.com/Microsoft.com/vsts-tasks#readme",
1919
"dependencies": {
2020
"ssh2": "^1.15.0",
21-
"ssh2-sftp-client": "^9.1.0",
21+
"ssh2-sftp-client": "^10.0.3",
2222
"minimatch": "^3.0.4",
2323
"azure-pipelines-task-lib": "^5.0.0-preview.0",
2424
"@types/mocha": "^5.2.7",

‎Tasks/CopyFilesOverSSHV0/copyfilesoverssh.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,16 @@ async function newRun() {
154154

155155
const readyTimeout = parseInt(tl.getInput('readyTimeout', true), 10);
156156
const useFastPut = !(process.env['USE_FAST_PUT'] === 'false');
157+
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
157158

158159
// Set up the SSH connection configuration based on endpoint details
159160
let sshConfig: Object = {
160161
host: hostname,
161162
port: port,
162163
username: username,
163164
readyTimeout: readyTimeout,
164-
useFastPut: useFastPut
165+
useFastPut: useFastPut,
166+
promiseLimit: isNaN(concurrentUploads) ? 10 : concurrentUploads
165167
};
166168

167169
if (privateKey) {
@@ -279,7 +281,6 @@ async function newRun() {
279281

280282
console.log(tl.loc("FoldersCreated", folderStructure.length));
281283

282-
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
283284
const delayBetweenUploads = parseInt(tl.getInput('delayBetweenUploads'));
284285

285286
// Upload files to remote machine

‎Tasks/CopyFilesOverSSHV0/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "Number of concurrent uploads when copying files. Default is 10.",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "Delay between queueing uploads (in milliseconds). Default is 50.",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

‎Tasks/CopyFilesOverSSHV0/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "ms-resource:loc.input.help.concurrentUploads",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "ms-resource:loc.input.help.delayBetweenUploads",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

‎_generated/CopyFilesOverSSHV0/copyfilesoverssh.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,16 @@ async function newRun() {
154154

155155
const readyTimeout = parseInt(tl.getInput('readyTimeout', true), 10);
156156
const useFastPut = !(process.env['USE_FAST_PUT'] === 'false');
157+
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
157158

158159
// Set up the SSH connection configuration based on endpoint details
159160
let sshConfig: Object = {
160161
host: hostname,
161162
port: port,
162163
username: username,
163164
readyTimeout: readyTimeout,
164-
useFastPut: useFastPut
165+
useFastPut: useFastPut,
166+
promiseLimit: isNaN(concurrentUploads) ? 10 : concurrentUploads
165167
};
166168

167169
if (privateKey) {
@@ -279,7 +281,6 @@ async function newRun() {
279281

280282
console.log(tl.loc("FoldersCreated", folderStructure.length));
281283

282-
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
283284
const delayBetweenUploads = parseInt(tl.getInput('delayBetweenUploads'));
284285

285286
// Upload files to remote machine

‎_generated/CopyFilesOverSSHV0/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "Number of concurrent uploads when copying files. Default is 10.",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "Delay between queueing uploads (in milliseconds). Default is 50.",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

‎_generated/CopyFilesOverSSHV0/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "ms-resource:loc.input.help.concurrentUploads",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "ms-resource:loc.input.help.delayBetweenUploads",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

‎_generated/CopyFilesOverSSHV0_Node20/copyfilesoverssh.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -154,14 +154,16 @@ async function newRun() {
154154

155155
const readyTimeout = parseInt(tl.getInput('readyTimeout', true), 10);
156156
const useFastPut = !(process.env['USE_FAST_PUT'] === 'false');
157+
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
157158

158159
// Set up the SSH connection configuration based on endpoint details
159160
let sshConfig: Object = {
160161
host: hostname,
161162
port: port,
162163
username: username,
163164
readyTimeout: readyTimeout,
164-
useFastPut: useFastPut
165+
useFastPut: useFastPut,
166+
promiseLimit: isNaN(concurrentUploads) ? 10 : concurrentUploads
165167
};
166168

167169
if (privateKey) {
@@ -279,7 +281,6 @@ async function newRun() {
279281

280282
console.log(tl.loc("FoldersCreated", folderStructure.length));
281283

282-
const concurrentUploads = parseInt(tl.getInput('concurrentUploads'));
283284
const delayBetweenUploads = parseInt(tl.getInput('delayBetweenUploads'));
284285

285286
// Upload files to remote machine

‎_generated/CopyFilesOverSSHV0_Node20/package-lock.json

+10-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎_generated/CopyFilesOverSSHV0_Node20/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"homepage": "https://github.com/Microsoft.com/vsts-tasks#readme",
1919
"dependencies": {
2020
"ssh2": "^1.15.0",
21-
"ssh2-sftp-client": "^9.1.0",
21+
"ssh2-sftp-client": "^10.0.3",
2222
"minimatch": "^3.0.4",
2323
"azure-pipelines-task-lib": "^5.0.0-preview.0",
2424
"@types/mocha": "^5.2.7",

‎_generated/CopyFilesOverSSHV0_Node20/task.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "Number of concurrent uploads when copying files. Default is 10.",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "Delay between queueing uploads (in milliseconds). Default is 50.",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

‎_generated/CopyFilesOverSSHV0_Node20/task.loc.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
"defaultValue": "10",
139139
"required": false,
140140
"helpMarkDown": "ms-resource:loc.input.help.concurrentUploads",
141-
"grouName": "advanced"
141+
"groupName": "advanced"
142142
},
143143
{
144144
"name": "delayBetweenUploads",
@@ -147,7 +147,7 @@
147147
"defaultValue": "50",
148148
"required": false,
149149
"helpMarkDown": "ms-resource:loc.input.help.delayBetweenUploads",
150-
"grouName": "advanced"
150+
"groupName": "advanced"
151151
}
152152
],
153153
"execution": {

0 commit comments

Comments
 (0)