Skip to content

Commit

Permalink
fix: logs tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mrednic-1A committed Mar 29, 2024
1 parent e673292 commit 309e8f4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion packages/@o3r/telemetry/src/environment/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function isSupportedPackageManager(name?: any): name is SupportedPackageManagers
*/
function getPackageManager() {
if (isSupportedPackageManager(process.env?.ENFORCED_PACKAGE_MANAGER)) {
return (process.env.ENFORCED_PACKAGE_MANAGE === 'npm') ? 'npm' : 'yarn';
return (process.env.ENFORCED_PACKAGE_MANAGER === 'npm') ? 'npm' : 'yarn';
}
return (process.env?.npm_execpath?.includes('yarn') && 'yarn') || 'npm';
}
Expand Down
9 changes: 8 additions & 1 deletion packages/@o3r/test-helpers/src/utilities/package-manager.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable no-console */
import { execFileSync, ExecSyncOptions } from 'node:child_process';
import { appendFileSync, existsSync, readFileSync, rmSync } from 'node:fs';
import { join, posix, sep } from 'node:path';
Expand Down Expand Up @@ -82,12 +83,15 @@ export function isYarn1Enforced() {
* @param packageManager
*/
export function addDashesForNpmCommand(args?: string[], packageManager = getPackageManager()) {
console.log('in addDashes args - $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$', args);
console.log('in addDashes packageManager - $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$', packageManager);
if (!args) {
return [];
}
if (packageManager !== 'npm') {
return args;
}
console.log('in addDashes should log only for npm - $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$', args, packageManager);
const firstArgIndex = args.findIndex((arg) => arg.startsWith('-'));
if (firstArgIndex < 0) {
return args;
Expand All @@ -99,9 +103,10 @@ function execCmd(args: string[], execOptions: ExecSyncOptions) {
try {
const startTime = performance.now();
const [runner, ...options] = args.filter((arg) => !!arg);
console.log('^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in execcmd', runner, options, execOptions);

Check failure

Code scanning / CodeQL

Clear-text logging of sensitive information High test

This logs sensitive data returned by
process environment
as clear text.
This logs sensitive data returned by
process environment
as clear text.
This logs sensitive data returned by
process environment
as clear text.
const output = execFileSync(runner, options, { ...execOptions, shell: process.platform === 'win32', stdio: 'pipe', encoding: 'utf8'});
// eslint-disable-next-line no-console
console.log(`${args.join(' ')} [${Math.ceil(performance.now() - startTime)}ms]\n${output}`);
console.log(`%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%:${args.join(' ')} [${Math.ceil(performance.now() - startTime)}ms]\n${output}`);
return output;
} catch (err: any) {
// Yarn doesn't log errors on stderr, so we need to get them from stdout to have them in the reports
Expand All @@ -128,6 +133,8 @@ export function packageManagerAdd(packages: string, options: ExecSyncOptions) {
export function packageManagerCreate(command: CommandArguments, options: ExecSyncOptions, packageManagerOverride?: keyof typeof PACKAGE_MANAGERS_CMD) {
const { script, args } = command;
const packageManager = packageManagerOverride || getVersionedPackageManager();
console.log('in package manager create - packageManagerOverride $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$', packageManagerOverride);
console.log('in package manager create - getVersionedPackageManager() $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$', getVersionedPackageManager());
return execCmd([...PACKAGE_MANAGERS_CMD[packageManager].create, script, ...addDashesForNpmCommand(args, packageManager)], options);
}

Expand Down

0 comments on commit 309e8f4

Please sign in to comment.