getlocalci · kienstra · Jan 6, 2022 · Jan 6, 2022 · Jan 6, 2022 · Jan 6, 2022
diff --git a/src/classes/JobProvider.ts b/src/classes/JobProvider.ts
@@ -18,6 +18,7 @@ import {
   ENTER_LICENSE_COMMAND,
   GET_LICENSE_COMMAND,
   JOB_TREE_VIEW_ID,
+  PROCESS_TRY_AGAIN_COMMAND,
   TRIAL_STARTED_TIMESTAMP,
 } from '../constants';
 
@@ -183,7 +184,7 @@ export default class JobProvider
         return [
           new Warning('Error processing the CircleCI config:'),
           new vscode.TreeItem(this.getJobErrorMessage()),
-          new Command('Try Again', `${JOB_TREE_VIEW_ID}.refresh`),
+          new Command('Try Again', PROCESS_TRY_AGAIN_COMMAND),
         ];
       default:
         return [];

diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -5,6 +5,7 @@ export const LICENSE_ERROR = 'localCiLicenseKeyError';
 export const GET_LICENSE_COMMAND = 'local-ci.license.get';
 export const ENTER_LICENSE_COMMAND = 'local-ci.license.enter';
 export const EXIT_JOB_COMMAND = 'local-ci.job.exit';
+export const PROCESS_TRY_AGAIN_COMMAND = 'local-ci.process-error.try-again';
 
 export const GET_RUNNING_CONTAINER_FUNCTION = `get_running_container() {
   IMAGE=$1

diff --git a/src/extension.ts b/src/extension.ts
@@ -18,6 +18,7 @@ import {
   HELP_URL,
   HOST_TMP_DIRECTORY,
   JOB_TREE_VIEW_ID,
+  PROCESS_TRY_AGAIN_COMMAND,
   RUN_JOB_COMMAND,
   SELECTED_CONFIG_PATH,
   TELEMETRY_KEY,
@@ -30,6 +31,7 @@ import getCheckoutJobs from './utils/getCheckoutJobs';
 import getConfig from './utils/getConfig';
 import getConfigFilePath from './utils/getConfigFilePath';
 import getDebuggingTerminalName from './utils/getDebuggingTerminalName';
+import getDynamicConfigFilePath from './utils/getDynamicConfigFilePath';
 import getFinalTerminalName from './utils/getFinalTerminalName';
 import getRepoBasename from './utils/getRepoBasename';
 import getStarterConfig from './utils/getStarterConfig';
@@ -79,6 +81,17 @@ export function activate(context: vscode.ExtensionContext): void {
     vscode.commands.registerCommand(`${JOB_TREE_VIEW_ID}.refresh`, () =>
       jobProvider.refresh()
     ),
+    vscode.commands.registerCommand(PROCESS_TRY_AGAIN_COMMAND, async () => {
+      // There might have been a problem with the dynamic config file, so remove it.
+      const dynamicConfig = getDynamicConfigFilePath(
+        await getConfigFilePath(context)
+      );
+      if (fs.existsSync(dynamicConfig)) {
+        fs.rmSync(dynamicConfig);
+      }
+
+      jobProvider.refresh();
+    }),
     vscode.commands.registerCommand(`${JOB_TREE_VIEW_ID}.enterToken`, () => {
       const terminal = vscode.window.createTerminal({
         name: 'Enter CircleCI® API Token',

diff --git a/src/utils/runJob.ts b/src/utils/runJob.ts
@@ -103,6 +103,7 @@ export default async function runJob(
   );
 
   const helperMessagesProcess = showMainTerminalHelperMessages(
+    context,
     jobProvider,
     job,
     doesJobCreateDynamicConfig(jobInConfig)

diff --git a/src/utils/showMainTerminalHelperMessages.ts b/src/utils/showMainTerminalHelperMessages.ts
@@ -3,9 +3,13 @@ import * as vscode from 'vscode';
 import Job from '../classes/Job';
 import JobProvider from '../classes/JobProvider';
 import { GET_PICARD_CONTAINER_FUNCTION } from '../constants';
+import getConfigFilePath from './getConfigFilePath';
+import getConfigFromPath from './getConfigFromPath';
+import getDynamicConfigFilePath from './getDynamicConfigFilePath';
 import getSpawnOptions from './getSpawnOptions';
 
 export default function showMainTerminalHelperMessages(
+  context: vscode.ExtensionContext,
   jobProvider: JobProvider,
   job: Job | undefined,
   doesJobCreateDynamicConfig: boolean
@@ -25,7 +29,7 @@ export default function showMainTerminalHelperMessages(
     getSpawnOptions()
   );
 
-  process.stdout.on('data', (data) => {
+  process.stdout.on('data', async (data) => {
     const output = data?.toString();
     if (!output?.length) {
       return;
@@ -38,8 +42,14 @@ export default function showMainTerminalHelperMessages(
 
       if (doesJobCreateDynamicConfig) {
         jobProvider.refresh();
+        const dynamicConfig = getConfigFromPath(
+          getDynamicConfigFilePath(await getConfigFilePath(context))
+        );
+
         vscode.window.showInformationMessage(
-          'Success, you can now run the dynamic config jobs'
+          dynamicConfig?.jobs
+            ? `Success! You can now run the dynamic config jobs.`
+            : `The step succeeded, but it didn't create any dynamic job`
         );
       } else {
         jobProvider.refresh(job);