Merge branch 'refactor/nx-plugin/fix-verbose-handling' into fix/nx-plugin/add-env-vars-to-executor

Author: John Doe

e2e/nx-plugin-e2e/tests/plugin-create-nodes.e2e.test.ts

@@ -173,13 +173,14 @@ describe('nx-plugin', () => {
     });
 
     const cleanStdout = removeColorCodes(stdout);
+
     // Nx command
-    expect(cleanStdout).toContain('nx run my-lib:code-pushup');
+    expect(cleanStdout).toContain('nx run my-lib:code-pushup --dryRun');
     // Run CLI executor
-    expect(cleanStdout).toContain('Command:');
+    expect(cleanStdout).toContain('DryRun execution of:');
     expect(cleanStdout).toContain('npx @code-pushup/cli');
-    expect(cleanStdout).toContain('--verbose');
-    expect(cleanStdout).toContain('--dryRun ');
+    expect(cleanStdout).not.toContain('--verbose');
+    expect(cleanStdout).toContain('CP_VERBOSE="true"');
   });
 
   it('should consider plugin option bin in executor target', async () => {

packages/nx-plugin/src/executors/cli/executor.int.test.ts

@@ -47,6 +47,9 @@ describe('runAutorunExecutor', () => {
       command: 'npx',
       args: expect.arrayContaining(['@code-pushup/cli']),
       cwd: process.cwd(),
+      env: expect.objectContaining({
+        CP_VERBOSE: 'true',
+      }),
     });
   });
 });

packages/nx-plugin/src/executors/cli/executor.ts

@@ -1,4 +1,4 @@
-import { type ExecutorContext, logger } from '@nx/devkit';
+import type { ExecutorContext } from '@nx/devkit';
 import { executeProcess } from '../../internal/execute-process.js';
 import { normalizeContext } from '../internal/context.js';
 import type { AutorunCommandExecutorOptions } from './schema.js';
@@ -15,44 +15,49 @@ export default async function runAutorunExecutor(
   terminalAndExecutorOptions: AutorunCommandExecutorOptions,
   context: ExecutorContext,
 ): Promise<ExecutorOutput> {
-  const { objectToCliArgs, formatCommandStatus } = await import(
-    '@code-pushup/utils'
-  );
+  const { objectToCliArgs, formatCommandStatus, logger, stringifyError } =
+    await import('@code-pushup/utils');
   const normalizedContext = normalizeContext(context);
   const cliArgumentObject = parseAutorunExecutorOptions(
     terminalAndExecutorOptions,
     normalizedContext,
   );
-  const {
-    dryRun,
-    verbose,
-    command: cliCommand,
-    bin,
-  } = terminalAndExecutorOptions;
+  const { command: cliCommand } = terminalAndExecutorOptions;
+  const { dryRun, verbose, bin, ...restArgs } = cliArgumentObject;
   const command = bin ? `node` : 'npx';
   const positionals = [
     bin ?? '@code-pushup/cli',
     ...(cliCommand ? [cliCommand] : []),
   ];
-  const args = [...positionals, ...objectToCliArgs(cliArgumentObject)];
+  const args = [...positionals, ...objectToCliArgs(restArgs)];
+  const executorEnvVariables = {
+    ...(verbose && { CP_VERBOSE: 'true' }),
+  };
   const commandString = formatCommandStatus([command, ...args].join(' '), {
     cwd: context.cwd,
+    env: executorEnvVariables,
   });
-  if (verbose) {
-    logger.info(`Run CLI executor ${command ?? ''}`);
-    logger.info(`Command: ${commandString}`);
-  }
+
   if (dryRun) {
     logger.warn(`DryRun execution of: ${commandString}`);
   } else {
     try {
+      logger.debug(`With env vars: ${executorEnvVariables}`);
       await executeProcess({
         command,
         args,
         ...(context.cwd ? { cwd: context.cwd } : {}),
+        ...(verbose
+          ? {
+              env: {
+                ...process.env,
+                ...executorEnvVariables,
+              },
+            }
+          : {}),
       });
     } catch (error) {
-      logger.error(error);
+      logger.error(stringifyError(error));
       return {
         success: false,
         command: commandString,

packages/nx-plugin/src/executors/cli/executor.unit.test.ts

@@ -1,4 +1,3 @@
-import { logger } from '@nx/devkit';
 import { afterAll, afterEach, beforeEach, expect, vi } from 'vitest';
 import { executorContext } from '@code-pushup/test-nx-utils';
 import { MEMFS_VOLUME } from '@code-pushup/test-utils';
@@ -9,9 +8,8 @@ describe('runAutorunExecutor', () => {
   const processEnvCP = Object.fromEntries(
     Object.entries(process.env).filter(([k]) => k.startsWith('CP_')),
   );
-  const loggerInfoSpy = vi.spyOn(logger, 'info');
-  const loggerWarnSpy = vi.spyOn(logger, 'warn');
   const executeProcessSpy = vi.spyOn(executeProcessModule, 'executeProcess');
+  let loggerSpy: Awaited<typeof import('@code-pushup/utils')>['logger'];
 
   beforeAll(() => {
     Object.entries(process.env)
@@ -25,7 +23,9 @@ describe('runAutorunExecutor', () => {
     );
   });
 
-  beforeEach(() => {
+  beforeEach(async () => {
+    const { logger } = await import('@code-pushup/utils');
+    loggerSpy = logger;
     vi.unstubAllEnvs();
     executeProcessSpy.mockResolvedValue({
       bin: 'npx ...',
@@ -37,8 +37,6 @@ describe('runAutorunExecutor', () => {
   });
 
   afterEach(() => {
-    loggerWarnSpy.mockReset();
-    loggerInfoSpy.mockReset();
     executeProcessSpy.mockReset();
   });
 
@@ -113,30 +111,30 @@ describe('runAutorunExecutor', () => {
     expect(output.command).toMatch('--upload.project="CLI"');
   });
 
-  it('should log information if verbose is set', async () => {
+  it('should set env var information if verbose is set', async () => {
     const output = await runAutorunExecutor(
-      { verbose: true },
+      {
+        dryRun: true, // here to produce log
+        verbose: true,
+      },
       { ...executorContext('github-action'), cwd: '<CWD>' },
     );
-    expect(executeProcessSpy).toHaveBeenCalledTimes(1);
 
-    expect(output.command).toMatch('--verbose');
-    expect(loggerWarnSpy).toHaveBeenCalledTimes(0);
-    expect(loggerInfoSpy).toHaveBeenCalledTimes(2);
-    expect(loggerInfoSpy).toHaveBeenCalledWith(
-      expect.stringContaining(`Run CLI executor`),
-    );
-    expect(loggerInfoSpy).toHaveBeenCalledWith(
-      expect.stringContaining('Command:'),
+    expect(executeProcessSpy).toHaveBeenCalledTimes(0);
+
+    expect(output.command).not.toContain('--verbose');
+    expect(loggerSpy.warn).toHaveBeenCalledTimes(1);
+    expect(loggerSpy.warn).toHaveBeenCalledWith(
+      expect.stringContaining('CP_VERBOSE="true"'),
     );
   });
 
   it('should log command if dryRun is set', async () => {
     await runAutorunExecutor({ dryRun: true }, executorContext('utils'));
 
-    expect(loggerInfoSpy).toHaveBeenCalledTimes(0);
-    expect(loggerWarnSpy).toHaveBeenCalledTimes(1);
-    expect(loggerWarnSpy).toHaveBeenCalledWith(
+    expect(loggerSpy.command).toHaveBeenCalledTimes(0);
+    expect(loggerSpy.warn).toHaveBeenCalledTimes(1);
+    expect(loggerSpy.warn).toHaveBeenCalledWith(
       expect.stringContaining('DryRun execution of'),
     );
   });