@corva/create-app 0.65.0-2 → 0.65.0-4

package/README.md

@@ -175,6 +175,7 @@ Options:
   --ignored-files [string...]  Patterns to skip zip (default: [])
   --env [string]               Environment to use (choices: "qa", "staging", "production", default: "qa")
   --api-key [string]           Pre generated API key for authorization during app upload
+  --app-key [string]           Explicitly set appKey that CLI is going to use. Otherwise it will be taken from manifest.json file. 
   --notes [string]             Add custom notes to published app
   --label [string]             Put a label on the release (choices: "DEV", "BETA", "PROD")
   --remove-on-fail [boolean]   Remove release if it fails during deployment (default: false)

package/lib/commands/create.js

@@ -276,10 +276,10 @@ const addNvmRc = async (root, manifest, runtime) => {
  *
  * @param {string} root
  * @param {Manifest} manifest
- * @param {import('./helpers/resolve-app-runtime.js').Runtime} runtime
+ * @param {import('../helpers/resolve-app-runtime.js').Runtime} runtime
  */
 const addPythonConfigs = async (root, manifest, runtime) => {
-  await fs.writeFile(resolve(root, '.python-version'), `${runtime.semver}\n`);
+  await fs.writeFile(resolve(root, '.python-version'), `${runtime.version}\n`);
   await fs.writeFile(resolve(root, '.python-virtualenv'), `${manifest.unix_name}\n`);
 };
 

package/lib/commands/release.js

@@ -10,6 +10,7 @@ import { originalCwdOption } from '../options/original-cwd.js';
 import { silentOption } from '../options/silent.js';
 import { ensureBumpVersion } from '../helpers/cli-version.js';
 import { ERROR_ICON } from '../constants/messages.js';
+import { appKeyOption } from '../options/app-key.js';
 
 export const releaseCommand = new Command('release')
   .description('Release app')
@@ -20,6 +21,7 @@ export const releaseCommand = new Command('release')
   .addOption(silentOption)
   .addOption(envOption)
   .addOption(apiKeyOption)
+  .addOption(appKeyOption)
   .addOption(originalCwdOption)
   .addOption(new Option('--notes [string]', 'Add custom notes to published app'))
   .addOption(new Option('--label [string]', 'Put a label on the release').choices(['DEV', 'BETA', 'PROD']))

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

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

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

@@ -27,15 +27,14 @@ export const UPLOAD_ZIP_TO_CORVA_STEP = {
    *
    * @param {object} param0
    * @param {import('../../lib/api').Api} param0.api
-   * @param {import('../../lib/manifest').Manifest} param0.manifest
    */
-  fn: async ({ zipFileName, manifest, api, appId, dirName, options, pkg }) => {
+  fn: async ({ zipFileName, api, appId, appKey, dirName, options, pkg }) => {
     async function uploadAppPackage() {
       const form = new FormData();
 
       form.append('package', createReadStream(resolve(dirName, zipFileName)), 'package.zip');
 
-      const { id: packageId } = await api.uploadPackages(manifest.manifest.application.key, form);
+      const { id: packageId } = await api.uploadPackages(appKey, form);
 
       return { packageId };
     }

package/lib/flows/steps/zip-file-list-resolve.js

@@ -75,7 +75,7 @@ const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles =
  * @param {import('../lib/manifest').Manifest} param1.manifest
  * @returns
  */
-const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, manifest }) => {
+const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, manifest, appKey }) => {
   const version = await getIncreasedVersion(pkg.version, options);
   const randomSuffix = generateRandomString(); // Random suffix is needed to not cause a conflict when we call 2 parallel commands at the same time.
   const zipFileName = `${manifest.unix_name}-${version}-${randomSuffix}.zip`;
@@ -123,6 +123,28 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, m
     ...(await transformPatternsIntoFileNames(dirName, ['src/**/*'], options.ignoredFiles)),
   );
 
+  if (options.appKey) {
+    /**
+     * Both manifest.json appKey in zip and the provided
+     * appKey param should match. That's why we set it for cases when appKey option
+     * is specified to override the one from manifest.json
+     */
+
+    const tmpManifestForSourceName = `manifestForSource_${randomSuffix}.json`;
+
+    itemsToSave.push({
+      name: tmpManifestForSourceName,
+      content: _.set('application.key', appKey, manifest.manifest),
+    });
+
+    itemsToRemove.push(tmpManifestForSourceName);
+
+    itemsToZip.push({
+      path: resolve(dirName, tmpManifestForSourceName),
+      name: 'manifest.json',
+    });
+  }
+
   return {
     zipFileName,
     itemsToZip,

package/lib/helpers/resolve-app-runtime.js

@@ -105,13 +105,13 @@ export const resolveAppRuntime = (opts) => {
     };
   }
 
-  const version = /python(\d\.\d)/.exec(opts.runtime)[1];
+  const version = /python(\d\.\d+)/.exec(opts.runtime)[1];
 
   return {
     language: 'python',
     isRuntimeAvailable: async () => {
       if (!IS_WINDOWS) {
-        return checkCliVersion(`python${version}`, version);
+        return checkCliVersion(`python3`, version);
       }
 
       return (

package/lib/options/app-key.js

@@ -0,0 +1,6 @@
+import { Option } from 'commander';
+
+export const appKeyOption = new Option(
+  '--app-key [string]',
+  'Explicitely set appKey. Otherwise it will be taked from the manifest.json',
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corva/create-app",
-  "version": "0.65.0-2",
+  "version": "0.65.0-4",
   "private": false,
   "description": "Create an app to use it in CORVA.AI",
   "keywords": [

package/templates/stream_depth/python/test/app_test.py

@@ -1,4 +1,4 @@
-from corva import StreamDepthEvent, StreamTimeRecord
+from corva import StreamDepthEvent, StreamDepthRecord
 from lambda_function import lambda_handler