Modify the SshV0 task to direct the output to process.stdout instead …

…of the console.log (#20507) * Trim SshV0 task output newlines * Change trimming to direct writing to process stdout
microsoft · Oct 8, 2024 · e606f44 · e606f44
1 parent 76ccc08
commit e606f44
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 22 deletions.
diff --git a/Tasks/SshV0/ssh2helpers.ts b/Tasks/SshV0/ssh2helpers.ts
@@ -147,7 +147,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  if (!passwordSent) {
  passwordSent = handlePasswordInput(data, stream, password, dataBuffer);
  if (passwordSent) {
@@ -174,7 +178,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  }
  }).stderr.on('data', (data) => {
  stdErrWritten = true;

diff --git a/Tasks/SshV0/task.json b/Tasks/SshV0/task.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 0
  },
  "demands": [],

diff --git a/Tasks/SshV0/task.loc.json b/Tasks/SshV0/task.loc.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 0
  },
  "demands": [],

diff --git a/_generated/SshV0.versionmap.txt b/_generated/SshV0.versionmap.txt
@@ -1,2 +1,2 @@
-Default|0.245.0
-Node20-225|0.245.1
+Default|0.247.0
+Node20-225|0.247.1
diff --git a/_generated/SshV0/ssh2helpers.ts b/_generated/SshV0/ssh2helpers.ts
@@ -147,7 +147,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  if (!passwordSent) {
  passwordSent = handlePasswordInput(data, stream, password, dataBuffer);
  if (passwordSent) {
@@ -174,7 +178,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  }
  }).stderr.on('data', (data) => {
  stdErrWritten = true;

diff --git a/_generated/SshV0/task.json b/_generated/SshV0/task.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 0
  },
  "demands": [],
@@ -165,7 +165,7 @@
  "ScriptArgsSanitized": "Detected characters in arguments that may not be executed correctly by the shell. Please escape special characters using backslash (\\). More information is available here: https://aka.ms/ado/75787"
  },
  "_buildConfigMapping": {
- "Default": "0.245.0",
- "Node20-225": "0.245.1"
+ "Default": "0.247.0",
+ "Node20-225": "0.247.1"
  }
 }
diff --git a/_generated/SshV0/task.loc.json b/_generated/SshV0/task.loc.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 0
  },
  "demands": [],
@@ -165,7 +165,7 @@
  "ScriptArgsSanitized": "ms-resource:loc.messages.ScriptArgsSanitized"
  },
  "_buildConfigMapping": {
- "Default": "0.245.0",
- "Node20-225": "0.245.1"
+ "Default": "0.247.0",
+ "Node20-225": "0.247.1"
  }
 }
diff --git a/_generated/SshV0_Node20/ssh2helpers.ts b/_generated/SshV0_Node20/ssh2helpers.ts
@@ -147,7 +147,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  if (!passwordSent) {
  passwordSent = handlePasswordInput(data, stream, password, dataBuffer);
  if (passwordSent) {
@@ -174,7 +178,11 @@ export function runCommandOnRemoteMachine(
  }).on('data', (data) => {
  if (data) {
  // "data" can be a buffer. Format it here so it outputs as a string
- console.log(data.toString('utf8'));
+ if (tl.getPipelineFeature("redirectTaskOutputToProcessStdout")) {
+ process.stdout.write(data);
+ } else {
+ console.log(data.toString('utf8'));
+ }
  }
  }).stderr.on('data', (data) => {
  stdErrWritten = true;

diff --git a/_generated/SshV0_Node20/task.json b/_generated/SshV0_Node20/task.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 1
  },
  "demands": [],
@@ -169,7 +169,7 @@
  "ScriptArgsSanitized": "Detected characters in arguments that may not be executed correctly by the shell. Please escape special characters using backslash (\\). More information is available here: https://aka.ms/ado/75787"
  },
  "_buildConfigMapping": {
- "Default": "0.245.0",
- "Node20-225": "0.245.1"
+ "Default": "0.247.0",
+ "Node20-225": "0.247.1"
  }
 }
diff --git a/_generated/SshV0_Node20/task.loc.json b/_generated/SshV0_Node20/task.loc.json
@@ -17,7 +17,7 @@
  "author": "Microsoft Corporation",
  "version": {
  "Major": 0,
- "Minor": 245,
+ "Minor": 247,
  "Patch": 1
  },
  "demands": [],
@@ -169,7 +169,7 @@
  "ScriptArgsSanitized": "ms-resource:loc.messages.ScriptArgsSanitized"
  },
  "_buildConfigMapping": {
- "Default": "0.245.0",
- "Node20-225": "0.245.1"
+ "Default": "0.247.0",
+ "Node20-225": "0.247.1"
  }
 }