fix(nx-plugin): adjust upload config handling

Author: BioPhoton

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

@@ -69,8 +69,8 @@ describe('runAutorunExecutor', () => {
     expect(output.command).toMatch('--persist.filename="REPORT"');
   });
 
-  it('should create command from context, options and arguments', async () => {
-    envSpy.mockReturnValue({ CP_PROJECT: 'CLI' });
+  it('should create command from context, options and arguments if APIkey is set', async () => {
+    envSpy.mockReturnValue({ CP_PROJECT: 'CLI', CP_API_KEY: '123456789' });
     const output = await runAutorunExecutor(
       { persist: { filename: 'REPORT', format: ['md', 'json'] } },
       executorContext('core'),
@@ -80,6 +80,20 @@ describe('runAutorunExecutor', () => {
       '--persist.format="md" --persist.format="json"',
     );
     expect(output.command).toMatch('--upload.project="CLI"');
+    expect(output.command).toMatch('--upload.apiKey="123456789"');
+  });
+
+  it('should create command from context, options and arguments without upload if APIkey is not set', async () => {
+    envSpy.mockReturnValue({ CP_PROJECT: 'CLI' });
+    const output = await runAutorunExecutor(
+      { persist: { filename: 'REPORT', format: ['md', 'json'] } },
+      executorContext('core'),
+    );
+    expect(output.command).toMatch('--persist.filename="REPORT"');
+    expect(output.command).toMatch(
+      '--persist.format="md" --persist.format="json"',
+    );
+    expect(output.command).not.toMatch('--upload.project="CLI"');
   });
 
   it('should log information if verbose is set', async () => {

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

@@ -27,16 +27,19 @@ export function parseAutorunExecutorOptions(
   const { projectPrefix, persist, upload, command } = options;
   const needsUploadParams =
     command === 'upload' || command === 'autorun' || command === undefined;
+  const uploadCfg = uploadConfig(
+    { projectPrefix, ...upload },
+    normalizedContext,
+  );
+  const hasApiToken = uploadCfg?.apiKey != null;
   return {
     ...parseAutorunExecutorOnlyOptions(options),
     ...globalConfig(options, normalizedContext),
     persist: persistConfig({ projectPrefix, ...persist }, normalizedContext),
     // @TODO This is a hack to avoid validation errors of upload config for commands that dont need it.
     // Fix: use utils and execute the core logic directly
     // Blocked by Nx plugins can't compile to es6
-    upload: needsUploadParams
-      ? uploadConfig({ projectPrefix, ...upload }, normalizedContext)
-      : undefined,
+    ...(needsUploadParams && hasApiToken ? { upload: uploadCfg } : {}),
   };
 }
 

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

@@ -80,7 +80,6 @@ describe('parseAutorunExecutorOptions', () => {
       expect.objectContaining({
         progress: false,
         verbose: false,
-        upload: { project: projectName },
       }),
     );
 
@@ -98,14 +97,14 @@ describe('parseAutorunExecutorOptions', () => {
   });
 
   it.each<Command | undefined>(['upload', 'autorun', undefined])(
-    'should include upload config for command %s',
+    'should include upload config for command %s if API key is provided',
     command => {
       const projectName = 'my-app';
       const executorOptions = parseAutorunExecutorOptions(
         {
           command,
           upload: {
-            organization: 'code-pushup',
+            apiKey: '123456789',
           },
         },
         {