@corva/create-app 0.40.0-1 → 0.41.0-2

package/lib/flows/lib/create-zip-archive.js

@@ -1,9 +1,11 @@
-const archiver = require('archiver');
-const debug = require('debug')('cca:zip');
-const { promises: fs, createWriteStream } = require('fs');
-const path = require('path');
+import archiver from 'archiver';
+import Debug from 'debug';
 
-const createZipArchive = async (dirName, zipName, itemsToZip = []) => {
+const debug = Debug('cca:zip');
+import { promises as fs, createWriteStream } from 'node:fs';
+import path from 'node:path';
+
+export const createZipArchive = async (dirName, zipName, itemsToZip = []) => {
   const filePath = path.resolve(dirName, zipName);
   const archive = archiver.create('zip', {});
   const output = createWriteStream(filePath);
@@ -73,5 +75,3 @@ const getDataToZip = async (itemsToZip, dirName) => {
 
   return allData.filter((f) => f.exists);
 };
-
-module.exports = { createZipArchive };

package/lib/flows/lib/json.js

@@ -1,10 +1,12 @@
-const { resolve } = require('path');
-const { promises: fs } = require('fs');
-const os = require('os');
+import { resolve } from 'node:path';
+import { promises as fs } from 'node:fs';
+import os from 'node:os';
 
-const debug = require('debug')('cca:json');
+import Debug from 'debug';
 
-const loadJson = async (dirName, fileName) => {
+const debug = Debug('cca:json');
+
+export const loadJson = async (dirName, fileName) => {
   const fullPath = resolve(dirName, fileName);
 
   try {
@@ -21,8 +23,6 @@ const loadJson = async (dirName, fileName) => {
   }
 };
 
-const saveJson = async (dirName, fileName, data) => {
+export const saveJson = async (dirName, fileName, data) => {
   return fs.writeFile(resolve(dirName, fileName), JSON.stringify(data, null, 2) + os.EOL);
 };
-
-module.exports = { loadJson, saveJson };

package/lib/flows/lib/manifest.js

@@ -1,8 +1,8 @@
-const { APP_TYPES, APP_RUNTIMES } = require('../../constants/cli');
+import { APP_TYPES, APP_RUNTIMES } from '../../constants/cli.js';
 
 const NODE_RUNTIMES = [APP_RUNTIMES.NODE12, APP_RUNTIMES.NODE14, APP_RUNTIMES.NODE16];
 
-class Manifest {
+export class Manifest {
   constructor(manifest) {
     this.manifest = manifest;
   }
@@ -12,11 +12,11 @@ class Manifest {
   }
 
   get type() {
-    return this.manifest.application.type
+    return this.manifest.application.type;
   }
 
   get name() {
-    return this.manifest.application.name
+    return this.manifest.application.name;
   }
 
   get unix_name() {
@@ -25,7 +25,7 @@ class Manifest {
   }
 
   get description() {
-    return this.manifest.application.description
+    return this.manifest.application.description;
   }
 
   isNode() {
@@ -48,5 +48,3 @@ class Manifest {
     return this.manifest.application.type === APP_TYPES.SCHEDULER;
   }
 }
-
-module.exports = { Manifest };

package/lib/flows/lib/step-error.js

@@ -1,4 +1,4 @@
-class StepError extends Error {
+export class StepError extends Error {
   cause;
   name;
 
@@ -8,5 +8,3 @@ class StepError extends Error {
     this.cause = cause;
   }
 }
-
-module.exports = { StepError };

package/lib/flows/lib/waitForMs.js

@@ -0,0 +1,3 @@
+export async function waitForMs(ms) {
+  return new Promise(resolve => setTimeout(resolve, ms));
+}

package/lib/flows/prepare.js

@@ -1,8 +1,6 @@
-const { LOAD_APP_FILES_STEP } = require('./steps/prepare-load-app-files');
+import { LOAD_APP_FILES_STEP } from './steps/prepare-load-app-files.js';
 
-const PREPARE_FLOW = {
+export const PREPARE_FLOW = {
   name: 'prepare',
   steps: [LOAD_APP_FILES_STEP],
 };
-
-module.exports = { PREPARE_FLOW };

package/lib/flows/release.js

@@ -1,18 +1,26 @@
-const { PREPARE_FLOW } = require('./prepare');
-const { GET_APP_KEY_STEP } = require('./steps/release-get-app-key');
-const { GET_RELEASE_CONFIG_STEP } = require('./steps/release-get-config');
-const { UPLOAD_ZIP_TO_CORVA_STEP } = require('./steps/release-upload-zip-to-corva');
-const { ZIP_SIMPLE_FLOW } = require('./zip-simple');
+import { PREPARE_FLOW } from './prepare.js';
+import { SETUP_API_CLIENT_STEP } from './steps/release/get-config.js';
+import { UPLOAD_ZIP_TO_CORVA_STEP } from './steps/release/upload-zip-to-corva.js';
+import { ZIP_SIMPLE_FLOW } from './zip-simple.js';
+import { WAIT_FOR_BUILD_FINISH_STEP } from './steps/release/wait-for-build.js';
+import { REMOVE_FAILED_UPLOAD_STEP } from './steps/release/remove-failed-upload.js';
+import { ADD_LABEL_STEP } from './steps/release/add-label.js';
+import { ADD_NOTES_STEP } from './steps/release/add-notes.js';
+import { PUBLISH_PACKAGE_STEP } from './steps/release/publish.js';
+import { RELEASE_PREPARE_DATA_STEP } from './steps/release/prepare-data.js';
 
-const RELEASE_FLOW = {
+export const RELEASE_FLOW = {
   name: 'release',
   steps: [
     PREPARE_FLOW,
-    GET_RELEASE_CONFIG_STEP,
-    GET_APP_KEY_STEP,
+    SETUP_API_CLIENT_STEP,
+    RELEASE_PREPARE_DATA_STEP,
     ZIP_SIMPLE_FLOW,
     UPLOAD_ZIP_TO_CORVA_STEP,
+    WAIT_FOR_BUILD_FINISH_STEP,
+    REMOVE_FAILED_UPLOAD_STEP,
+    PUBLISH_PACKAGE_STEP,
+    ADD_LABEL_STEP,
+    ADD_NOTES_STEP
   ],
 };
-
-module.exports = { RELEASE_FLOW };

package/lib/flows/rerun.js

@@ -1,10 +1,8 @@
-const { PREPARE_FLOW } = require('./prepare');
-const { RERUN_STEPS } = require('./steps/rerun');
-const { GET_RELEASE_CONFIG_STEP } = require('./steps/release-get-config');
+import { PREPARE_FLOW } from './prepare.js';
+import { RERUN_STEPS } from './steps/rerun.js';
+import { SETUP_API_CLIENT_STEP } from './steps/release/get-config.js';
 
-const RERUN_FLOW = {
+export const RERUN_FLOW = {
   name: 'rerun',
-  steps: [PREPARE_FLOW, GET_RELEASE_CONFIG_STEP, ...RERUN_STEPS],
+  steps: [PREPARE_FLOW, SETUP_API_CLIENT_STEP, ...RERUN_STEPS],
 };
-
-module.exports = { RERUN_FLOW };

package/lib/flows/steps/prepare-load-app-files.js

@@ -1,7 +1,7 @@
-const { loadJson } = require('../lib/json');
-const { Manifest } = require('../lib/manifest');
+import { loadJson } from '../lib/json.js';
+import { Manifest } from '../lib/manifest.js';
 
-const LOAD_APP_FILES_STEP = {
+export const LOAD_APP_FILES_STEP = {
   message: "Loading Corva app's files...",
   async fn(context) {
     const manifest =
@@ -12,7 +12,3 @@ const LOAD_APP_FILES_STEP = {
     return { pkg, manifest };
   },
 };
-
-module.exports = {
-  LOAD_APP_FILES_STEP,
-};

package/lib/flows/steps/release/add-label.js

@@ -0,0 +1,11 @@
+
+export const ADD_LABEL_STEP = {
+  message: 'Adding label...',
+  async fn({ options: { label }, api, appId, packageId }) {
+    if (!label) {
+      return;
+    }
+
+    await api.putLabel(appId, packageId, label);
+  }
+}

package/lib/flows/steps/release/add-notes.js

@@ -0,0 +1,10 @@
+export const ADD_NOTES_STEP = {
+  message: 'Adding notes...',
+  async fn({ api, appId, packageId, options: { notes } }) {
+    if (!notes) {
+      return;
+    }
+
+    await api.addNotes(appId, packageId, notes);
+  }
+}

package/lib/flows/steps/release/get-config.js

@@ -0,0 +1,37 @@
+import { RELEASE } from '../../../constants/messages.js';
+import { promises as fs } from 'node:fs';
+import dotenv from 'dotenv';
+import { resolve } from 'node:path';
+import { StepError } from '../../lib/step-error.js';
+import { Api } from '../../lib/api.js';
+
+async function getVarsFromDotEnv({ dirName }) {
+  try {
+    const envFile = await fs.readFile(resolve(dirName, '.env'));
+    return dotenv.parse(envFile);
+  } catch (error) {
+    return {};
+  }
+}
+
+export const SETUP_API_CLIENT_STEP = {
+  message: RELEASE.getAuthToken,
+  fn: async ({ dirName, options: { apiKey, env } }) => {
+    const parsedEnv = await getVarsFromDotEnv({ dirName });
+
+    const CORVA_API_ENV = env || process.env.CORVA_API_ENV || parsedEnv.CORVA_API_ENV;
+    const AUTH_TOKEN = process.env.AUTH_TOKEN || parsedEnv.AUTH_TOKEN;
+    const API_KEY = apiKey || process.env.API_KEY || parsedEnv.API_KEY;
+
+    if (!AUTH_TOKEN && !API_KEY) {
+      throw new StepError(RELEASE.getAuthTokenError);
+    }
+
+    const api = new Api(CORVA_API_ENV, API_KEY, AUTH_TOKEN);
+
+    return {
+      CORVA_API_ENV: CORVA_API_ENV || 'qa',
+      api
+    };
+  },
+};

package/lib/flows/steps/release/prepare-data.js

@@ -0,0 +1,10 @@
+export const RELEASE_PREPARE_DATA_STEP = {
+  message: 'Preparing data...',
+  async fn({ api, manifest }) {
+    const app = await api.getAppByKey(manifest.manifest.application.key.toLowerCase());
+
+    return {
+      appId: app.id,
+    }
+  }
+}

package/lib/flows/steps/release/publish.js

@@ -0,0 +1,9 @@
+export const PUBLISH_PACKAGE_STEP = {
+  message: 'Publishing app...',
+  /**
+   * 
+   * @param {object} param0 
+   * @param {import('../../lib/api').Api} param0.api
+   */
+  async fn({ api, appId, packageId }) { await api.publishApp(appId, packageId) }
+}

package/lib/flows/steps/release/remove-failed-upload.js

@@ -0,0 +1,20 @@
+import { resolve } from 'node:path'
+import { unlink } from 'node:fs/promises'
+
+export const REMOVE_FAILED_UPLOAD_STEP = {
+  message: 'Cleaning up...',
+  async fn({ api, appId, packageId, removeOnFail, uploadStatus, dirName, zipFileName }) {
+    if (uploadStatus === 'draft') {
+      await unlink(resolve(dirName, zipFileName));
+
+      return;
+    }
+
+    if (removeOnFail) {
+      await unlink(resolve(dirName, zipFileName));
+      await api.deleteAppUpload(appId, packageId);
+    }
+
+    throw new Error(`Got unexpected status '${uploadStatus}' while processing package ${packageId}.`);
+  }
+}

package/lib/flows/steps/release/upload-zip-to-corva.js

@@ -0,0 +1,25 @@
+import { RELEASE } from '../../../constants/messages.js';
+import FormData from 'form-data';
+import { resolve } from 'node:path';
+import { createReadStream } from 'node:fs';
+import { StepError } from '../../lib/step-error.js';
+import _ from 'lodash/fp.js';
+
+export const UPLOAD_ZIP_TO_CORVA_STEP = {
+  message: RELEASE.uploadApp,
+  /**
+   * 
+   * @param {object} param0 
+   * @param {import('../../lib/api').Api} param0.api 
+   * @param {import('../../lib/manifest').Manifest} param0.manifest 
+   */
+  fn: async ({ zipFileName, manifest, api, dirName }) => {
+    const form = new FormData();
+
+    form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
+
+    const { id: packageId, status: uploadStatus } = await api.uploadPackages(manifest.manifest.application.key, form)
+
+    return { packageId }
+  },
+};

package/lib/flows/steps/release/wait-for-build.js

@@ -0,0 +1,29 @@
+import Debug from 'debug';
+import { waitForMs } from '../../lib/waitForMs.js';
+
+const debug = Debug('cca:flow:release:step:wait-for-build');
+
+const PROCESSING_STATUSES = ['pending', 'processing', 'queued', 'deploying'];
+
+export const WAIT_FOR_BUILD_FINISH_STEP = {
+  message: 'Wait till the app will process to draft status...',
+  /**
+   * @param {object} param0
+   * @param {import('../../lib/api').Api} param0.api 
+   */
+  async fn({ api, appId, packageId, progress }) {
+    do {
+      const { status } = await api.checkApp(appId, packageId);
+
+      progress()
+
+      debug(`Status: ${status}`);
+
+      if (!PROCESSING_STATUSES.includes(status)) {
+        return { uploadStatus: status };
+      }
+
+      await waitForMs(5000);
+    } while (true);
+  }
+}

package/lib/flows/steps/rerun-create-task.js

@@ -1,8 +1,15 @@
-const _ = require('lodash');
-const chalk = require('chalk');
+import _ from 'lodash';
+import chalk from 'chalk';
 
-const CREATE_TASK_STEP = {
+import { logger } from '../../helpers/logger.js';
+
+export const CREATE_TASK_STEP = {
   message: 'Creating tasks...',
+  /**
+   * 
+   * @param {object} param0 
+   * @param {import('../lib/api').Api} param0.api 
+   */
   fn: async ({
     appId,
     assets,
@@ -14,38 +21,38 @@ const CREATE_TASK_STEP = {
     CORVA_API_ENV,
   }) => {
     if (!assets.length) {
-      process.stdout.write( 
+      logger.write(
         `\n\n${chalk.yellow.bold('There is not a asset ID to create new task')}`
       );
     }
 
     for (const assetId of assets) {
-
       try {
         const result = await api.queueAppRun(
           appId,
           version,
-          mappedAssetsToWells.get(parseInt(assetId)),
+          assetId,
           appDatasetsNames,
           mappedAssetsToStreams.get(parseInt(assetId))
-        );
-  
-        process.stdout.write(
+        ).catch(e => { console.log(e.response.body); throw e });
+
+        logger.write(
           `\n    Created new task with ID ${chalk.yellow(result.id)} for asset ID - ${chalk.green(
             assetId
           )}`
         );
 
-        process.stdout.write(
-          `\n    Task link - https://app${CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`}corva.ai/dev-center/apps/${appId}/runner`
+        logger.write(
+          `\n    Task link - https://app${CORVA_API_ENV === 'production' ? '.' : `.${CORVA_API_ENV}.`
+          }corva.ai/dev-center/apps/${appId}/runner`
         );
       } catch (e) {
-        process.stdout.write( 
-          `\n\n${chalk.red.underline.bold(`Could not rerun app for asset ID - ${assetId}, an error occured: ${e.message}`)}\n\n`
+        logger.write(
+          `\n\n${chalk.red.underline.bold(
+            `Could not rerun app for asset ID - ${assetId}, an error occured: ${e.message}`
+          )}\n\n`
         );
       }
     }
   },
 };
-
-module.exports = { CREATE_TASK_STEP };