fix(cli): non-built project bootstrap fails

fixes aws-samples#112
sperka · May 10, 2024 · f04e615 · f04e615
1 parent c4240fa
commit f04e615
Showing 1 changed file with 30 additions and 27 deletions.
diff --git a/packages/galileo-cli/src/commands/deploy/index.ts b/packages/galileo-cli/src/commands/deploy/index.ts
@@ -108,7 +108,6 @@ export default class DeployCommand extends Command {
     }
 
     const modelRegion = context.appConfig.llms.region || appRegion;
-
     const regionsToBootstrap = new Set<string>();
     for (const _region of new Set<string>([appRegion, modelRegion])) {
       const bootstapInfo = await accountUtils.retrieveCdkBootstrapInfo({
@@ -121,32 +120,6 @@ export default class DeployCommand extends Command {
       }
     }
 
-    if (regionsToBootstrap.size > 0) {
-      if (!flags.skipConfirmations) {
-        const { bootstrapRegions } = context.cachedAnswers(
-          await prompts(
-            galileoPrompts.confirmBootstrapRegions({
-              regions: Array.from(regionsToBootstrap),
-              account,
-            }),
-          ),
-        );
-
-        if (!bootstrapRegions) {
-          console.error(
-            chalk.redBright('Account must be bootstrapped in all regions to be used, before deployment. Quitting...'),
-          );
-          this.exit();
-        }
-      }
-
-      await this.executeCdkBootstrap({
-        account,
-        profile,
-        regionsToBootstrap,
-      });
-    }
-
     context.deployStacks.push(`Dev/${context.appConfig.app.name}`);
     context.cdkContext.set('configPath', appConfigPath);
 
@@ -170,7 +143,37 @@ export default class DeployCommand extends Command {
         )
       ).confirmed
     ) {
+      // build the project
       this.executeBuild(flags.build);
+
+      // check if bootstrapping needed
+      if (regionsToBootstrap.size > 0) {
+        if (!flags.skipConfirmations) {
+          const { bootstrapRegions } = context.cachedAnswers(
+            await prompts(
+              galileoPrompts.confirmBootstrapRegions({
+                regions: Array.from(regionsToBootstrap),
+                account,
+              }),
+            ),
+          );
+
+          if (!bootstrapRegions) {
+            console.error(
+              chalk.redBright('Account must be bootstrapped in all regions to be used, before deployment. Quitting...'),
+            );
+            this.exit();
+          }
+        }
+
+        await this.executeCdkBootstrap({
+          account,
+          profile,
+          regionsToBootstrap,
+        });
+      }
+
+      // deploy into the cloud
       this.executeCdkDeploy(cmdDeploy, flags.skipConfirmations);
       if (flags.saveExec) {
         context.saveExecTasks();