@liquidmetal-ai/raindrop 0.1.5 → 0.2.2

package/dist/codegen.js

@@ -13,6 +13,7 @@ const TEMPLATE_R2_EVENT_NOTIFICATION = path.join('handlers', 'r2-event-notificat
 const TEMPLATE_QUEUE_CONSUMER = path.join('handlers', 'queue-consumer');
 const TEMPLATE_HTTP_SERVICE = path.join('handlers', 'http-service');
 const TEMPLATE_ACTOR = path.join('handlers', 'actor');
+const TEMPLATE_TASK = path.join('handlers', 'task');
 const TEMPLATE_EXTENSION = '.hbs';
 const SCAFFOLDING_PREFIX = '__';
 const HANDLEBARS_RENDER_OPTS = {
@@ -116,6 +117,13 @@ export function codegenPlan(apps) {
                 context: { actorClassName: kebabCaseToUpperCamelCase(valueOf(actor.name)) },
             });
         }
+        for (const task of app.task) {
+            plan.push({
+                templateName: path.join(TEMPLATES_DIR, TEMPLATE_TASK),
+                outPath: path.join(HANDLERS_DIR, valueOf(task.name)),
+                context: { taskClassName: kebabCaseToUpperCamelCase(valueOf(task.name)) },
+            });
+        }
     }
     return plan;
 }
@@ -179,6 +187,10 @@ export function gatherEnvForHandler(handler, app) {
         bindings[kebabCaseToConstantCase(valueOf(appVectorizeIndex.name))] = 'VectorIndex';
         types.add('VectorIndex');
     }
+    for (const appKvStore of app.kvStore) {
+        bindings[kebabCaseToConstantCase(valueOf(appKvStore.name))] = 'KvStore';
+        types.add('KvStore');
+    }
     for (const env of app.env) {
         bindings[kebabCaseToConstantCase(valueOf(env.name))] = 'string';
     }

package/dist/commands/build/branch.d.ts

@@ -1,14 +1,17 @@
 import { BaseCommand } from '../../base-command.js';
 export default class Branch extends BaseCommand<typeof Branch> {
-    static args: {};
+    static args: {
+        branch: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+    };
     static description: string;
     static examples: string[];
     static flags: {
         root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
-        previousVersionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
-        select: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        versionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        start: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         rainbowAuthService: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         raindropCatalogService: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/build/branch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../../src/commands/build/branch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAAiD;IAEnE,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MA6CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAmD3B"}
+{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../../src/commands/build/branch.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAAiD;IAEnE,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MA4CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqH3B"}

package/dist/commands/build/branch.js

@@ -1,8 +1,16 @@
 import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-import { Flags } from '@oclif/core';
+import { archive } from '@liquidmetal-ai/drizzle/codestore';
+import { BundleArchiveType, ReleaseRequest_Lock } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_pb';
+import { FileSystemBundle } from '@liquidmetal-ai/drizzle/unsafe/codestore';
+import { Args, Flags } from '@oclif/core';
+import fs from 'node:fs/promises';
+import * as path from 'node:path';
 import { BaseCommand } from '../../base-command.js';
+import { buildHandlers } from '../../build.js';
 export default class Branch extends BaseCommand {
-    static args = {};
+    static args = {
+        branch: Args.string({ description: 'branch name', required: true }),
+    };
     static description = 'create a new branch in the Raindrop catalog';
     static examples = [
         `<%= config.bin %> <%= command.id %> .
@@ -24,18 +32,17 @@ Created new branch 1234
             hidden: true,
             default: '.raindrop/config.json',
         }),
-        previousVersionId: Flags.string({
+        output: Flags.string({ char: 'o', description: 'output directory', required: false, default: 'dist' }),
+        versionId: Flags.string({
             char: 'p',
-            aliases: ['prev'],
-            description: 'previous version ID',
+            aliases: ['version'],
+            description: 'Branch from this version',
             required: false,
-            exclusive: ['select'],
         }),
-        select: Flags.string({
-            char: 's',
-            description: 'select a specific version ID',
+        start: Flags.boolean({
+            description: 'Start the application',
+            default: false,
             required: false,
-            exclusive: ['previousVersionId'],
         }),
         impersonate: Flags.string({
             char: 'i',
@@ -56,49 +63,105 @@ Created new branch 1234
         show: Flags.boolean({ description: 'show the current branch', required: false }),
     };
     async run() {
-        const { client: catalogService, userId, organizationId: defaultOrganizationId } = await this.catalogService();
-        const organizationId = this.flags.impersonate ?? defaultOrganizationId;
         const config = await this.loadConfig();
         // Allow the user to see the currently selected version
         if (this.flags.show) {
-            this.log(`Current branch: ${config.versionId}`);
+            this.log(`Current versionId: ${config.versionId}`);
             return;
         }
-        // If we're selecting a version, just update config.
-        if (this.flags.select) {
-            // Check if this is a valid version.
-            const resp = await catalogService.versions({ userId, organizationId });
-            const validVersion = resp.versions.some((app) => {
-                if (app.versionId === this.flags.select) {
-                    return true;
-                }
+        // Build then deploy
+        const manifestPath = path.isAbsolute(this.flags.manifest)
+            ? this.flags.manifest
+            : path.join(this.flags.root, this.flags.manifest);
+        // Do this first to check for errors.
+        const apps = await this.loadManifest();
+        // We should really just work with a single app at the moment.
+        if (apps[0] === undefined) {
+            this.error('There are no applications in the manifest');
+        }
+        const app = apps[0];
+        const manifestContents = await fs.readFile(manifestPath, 'utf8');
+        const buildDir = path.isAbsolute(this.flags.output)
+            ? this.flags.output
+            : path.join(this.flags.root, this.flags.output);
+        // It's weird that it takes an array of apps.
+        await buildHandlers(this, apps, buildDir, this.flags.root);
+        const versionId = this.flags.versionId || config.versionId;
+        const runtimeVersion = await this.raindropFrameworkVersion();
+        const { client: catalogService, userId, organizationId: defaultOrganizationId } = await this.catalogService();
+        const organizationId = this.flags.impersonate ?? defaultOrganizationId;
+        const deployResp = await catalogService.deploy({
+            userId: userId,
+            organizationId: organizationId,
+            applications: [
+                {
+                    application: valueOf(app.name),
+                    previousVersionId: versionId,
+                    branch: this.args.branch,
+                    amend: false,
+                    metadata: {
+                        runtimeVersion,
+                    },
+                    manifest: manifestContents,
+                },
+            ],
+        });
+        if (deployResp.applications[0] === undefined) {
+            this.error('Failed to deploy application');
+        }
+        // If we deployed, we have to actually retrieve the
+        // currentVersionId from the response.
+        const currentVersionId = deployResp.applications[0].currentVersionId;
+        // And save it asap.
+        config.versionId = currentVersionId;
+        await this.saveConfig(config);
+        // Upload bundle to this version's store.
+        for (const handler of app.handlers()) {
+            const bundle = new FileSystemBundle(path.join(buildDir, valueOf(handler.name)));
+            await catalogService.uploadBundle({
+                userId,
+                organizationId,
+                applicationName: valueOf(app.name),
+                applicationVersionId: currentVersionId,
+                archiveType: BundleArchiveType.ZIP,
+                bundleName: valueOf(handler.name),
+                archive: Buffer.from(await archive(bundle)),
             });
-            if (!validVersion) {
-                this.error(`Version ${this.flags.select} does not exist`, { exit: 1 });
-            }
-            // We have a valid version, check to see if it exists against
-            // this application or none.
-            const apps = await this.loadManifest();
-            const app = apps[0];
-            if (app === undefined) {
-                this.error('No application found in manifest', { exit: 1 });
-            }
-            const applicationResp = await catalogService.applications({ userId, organizationId });
-            if (applicationResp.applications.some((a) => a.name !== valueOf(app.name) && a.versionId === this.flags.select)) {
-                this.error(`Cannot select version ${this.flags.select} belonging to another application`, { exit: 1 });
-            }
-            config.versionId = this.flags.select;
-            await this.saveConfig(config);
-            return;
+            this.log(`Uploaded bundle "${valueOf(handler.name)}"`);
+        }
+        // Upload DB bundle if it exists.
+        const dbDir = path.join(this.flags.root, 'db');
+        let dbExists = false;
+        try {
+            const stat = await fs.lstat(dbDir);
+            dbExists = stat.isDirectory();
+        }
+        catch (_e) {
+            // Nothing to do
         }
-        const previousVersionId = this.flags.previousVersionId || config.versionId;
-        const resp = await catalogService.createVersion({
+        if (dbExists) {
+            const dbBundle = new FileSystemBundle(path.join(this.flags.root, 'db'));
+            await catalogService.uploadBundle({
+                userId,
+                organizationId,
+                applicationName: valueOf(app.name),
+                applicationVersionId: currentVersionId,
+                archiveType: BundleArchiveType.ZIP,
+                bundleName: 'db',
+                archive: Buffer.from(await archive(dbBundle)),
+            });
+            this.log(`Uploaded bundle "db"`);
+        }
+        // Release locks.
+        await catalogService.release({
             userId,
             organizationId,
-            previousVersionId,
+            locks: deployResp.applications.map((a) => new ReleaseRequest_Lock({
+                applicationName: a.applicationName,
+                currentVersionId: a.currentVersionId,
+                lock: a.lock,
+            })),
         });
-        config.versionId = resp.versionId;
-        await this.saveConfig(config);
-        console.log(`Created new branch ${config.versionId}`);
+        // TODO [ian] Call watch and subscribe to events.
     }
 }

package/dist/commands/build/checkout.d.ts

@@ -0,0 +1,16 @@
+import { BaseCommand } from '../../base-command.js';
+export default class Branch extends BaseCommand<typeof Branch> {
+    static args: {
+        version: import("@oclif/core/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static description: string;
+    static examples: string[];
+    static flags: {
+        config: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowAuthService: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        raindropCatalogService: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+    };
+    run(): Promise<void>;
+}
+//# sourceMappingURL=checkout.d.ts.map

package/dist/commands/build/checkout.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"checkout.d.ts","sourceRoot":"","sources":["../../../src/commands/build/checkout.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAAsD;IAExE,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;MAmBV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA+B3B"}

package/dist/commands/build/checkout.js

@@ -0,0 +1,66 @@
+import { Args, Flags } from '@oclif/core';
+import { BaseCommand } from '../../base-command.js';
+export default class Branch extends BaseCommand {
+    static args = {
+        version: Args.string({ description: 'version id', required: false }),
+    };
+    static description = 'switch the current context to a specific version';
+    static examples = [
+        `<%= config.bin %> <%= command.id %>
+Currently on version: 01jac6p20m4gahn1kaa2mhm2js
+
+<%= config.bin %> <%= command.id %> 01jux6z20m4gbhn5kaa4mcm2jr
+Switched to version: 01jux6z20m4gbhn5kaa4mcm2jr
+`,
+    ];
+    static flags = {
+        config: Flags.string({
+            char: 'c',
+            description: 'config file',
+            required: false,
+            hidden: true,
+            default: '.raindrop/config.json',
+        }),
+        output: Flags.string({ char: 'o', description: 'output format', required: false, default: 'text' }),
+        rainbowAuthService: Flags.string({
+            default: 'https://liquidmetal.run/api/connect',
+            hidden: true,
+            env: 'LIQUIDMETAL_RAINBOW_AUTH_SERVICE',
+        }),
+        raindropCatalogService: Flags.string({
+            env: 'RAINDROP_CATALOG_SERVICE',
+            description: 'URL of the catalog service',
+            hidden: true,
+        }),
+    };
+    async run() {
+        if (['text', 'json'].indexOf(this.flags.output) === -1) {
+            this.error(`unsupported output format: ${this.flags.output}`, { exit: 1 });
+        }
+        const config = await this.loadConfig();
+        // No args: just show the current version
+        if (!this.args.version) {
+            if (this.flags.output === 'json') {
+                console.log(JSON.stringify({ versionId: config.versionId }, null, 2));
+            }
+            else {
+                if (!config.versionId) {
+                    console.log('No version set');
+                }
+                else {
+                    console.log(`Currently on version ${config.versionId}`);
+                }
+            }
+            return;
+        }
+        // Switch to a different version
+        config.versionId = this.args.version;
+        await this.saveConfig(config);
+        if (this.flags.output === 'json') {
+            console.log(JSON.stringify({ versionId: config.versionId }, null, 2));
+        }
+        else {
+            console.log(`Switched to version ${config.versionId}`);
+        }
+    }
+}

package/dist/commands/build/delete.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/commands/build/delete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAAkC;IAEpD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MAiDV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqD3B"}
+{"version":3,"file":"delete.d.ts","sourceRoot":"","sources":["../../../src/commands/build/delete.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAAkC;IAEpD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MAiDV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsD3B"}

package/dist/commands/build/delete.js

@@ -88,17 +88,18 @@ Deleted (application) at version (version)
             this.args.application = valueOf(app.name);
         }
         try {
-            const resp = await catalogService.deleteApplications({
+            await catalogService.delete({
                 userId,
                 organizationId: this.flags.impersonate ?? organizationId,
                 // Omitting versionId will delete all versions of the application
-                applications: [{ name: this.args.application, versionId }],
+                applications: [{ applicationName: this.args.application, currentVersionId: versionId }],
             });
-            if (resp.failure.length) {
-                this.error(`Failed to delete applications: ${resp.failure.map((f) => `${f.name}@${f.versionId}`).join(', ')}`, {
-                    exit: 1,
-                });
-            }
+            // TODO [ian] Failures?
+            // if (resp.failure.length) {
+            //   this.error(`Failed to delete applications: ${resp.failure.map((f) => `${f.name}@${f.versionId}`).join(', ')}`, {
+            //     exit: 1,
+            //   });
+            // }
         }
         catch (e) {
             if (e instanceof Error) {

package/dist/commands/build/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/build/deploy.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAAmC;IAErD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MA6CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAiI3B"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/build/deploy.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,MAAM,CAAC,OAAO,OAAO,MAAO,SAAQ,WAAW,CAAC,OAAO,MAAM,CAAC;IAC5D,MAAM,CAAC,IAAI,KAAM;IAEjB,MAAM,CAAC,WAAW,SAAmC;IAErD,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;MA6CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA4H3B"}

package/dist/commands/build/deploy.js

@@ -1,14 +1,12 @@
 import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-import { JSONTranslator, Parser, Tokenizer } from '@liquidmetal-ai/drizzle/appify/parse';
 import { archive } from '@liquidmetal-ai/drizzle/codestore';
-import { BundleArchiveType, } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_pb';
+import { BundleArchiveType, ReleaseRequest_Lock } from '@liquidmetal-ai/drizzle/liquidmetal/v1alpha1/catalog_pb';
 import { FileSystemBundle } from '@liquidmetal-ai/drizzle/unsafe/codestore';
 import { Flags } from '@oclif/core';
 import fs from 'node:fs/promises';
 import * as path from 'node:path';
 import { BaseCommand } from '../../base-command.js';
 import { buildHandlers } from '../../build.js';
-import { defaultConfig } from '../../config.js';
 export default class Deploy extends BaseCommand {
     static args = {};
     static description = 'deploy a Raindrop application';
@@ -70,112 +68,106 @@ Deploy a Raindrop application.
             : path.join(this.flags.root, this.flags.manifest);
         // Do this first to check for errors.
         const apps = await this.loadManifest();
+        // We should really just work with a single app at the moment.
+        if (apps[0] === undefined) {
+            this.error('There are no applications in the manifest');
+        }
+        const app = apps[0];
         const manifestContents = await fs.readFile(manifestPath, 'utf8');
-        // Now do a translate to get the JSON version of the manifest.
-        const tokenizer = new Tokenizer(await fs.readFile(manifestPath, 'utf8'));
-        const parser = new Parser(tokenizer);
-        const manifestJson = new JSONTranslator().translate(parser.parse());
         const buildDir = path.isAbsolute(this.flags.output)
             ? this.flags.output
             : path.join(this.flags.root, this.flags.output);
+        // It's weird that it takes an array of apps.
         await buildHandlers(this, apps, buildDir, this.flags.root);
         const config = await this.loadConfig();
-        const versionId = this.flags.versionId || config.versionId;
-        if (versionId === defaultConfig.versionId) {
-            this.error('You must create a new version with `raindrop build branch` before deploying your first application', {
-                exit: 1,
-            });
-        }
+        const versionId = this.flags.versionId ?? config.versionId;
+        const runtimeVersion = await this.raindropFrameworkVersion();
         const { client: catalogService, userId, organizationId: defaultOrganizationId } = await this.catalogService();
         const organizationId = this.flags.impersonate ?? defaultOrganizationId;
-        // The raindrop-framework version is pinned to the raindrop-runtime version
-        const runtimeVersion = await this.raindropFrameworkVersion();
-        let changed = [];
-        if (this.flags.amend) {
-            const manifests = apps.map((app) => ({
-                name: valueOf(app.name),
-                versionId,
-                manifest: manifestContents,
-                metadata: {
-                    runtimeVersion,
+        const deployResp = await catalogService.deploy({
+            userId: userId,
+            organizationId: organizationId,
+            applications: [
+                {
+                    application: valueOf(app.name),
+                    currentVersionId: this.flags.amend ? versionId : undefined,
+                    previousVersionId: this.flags.amend ? undefined : versionId,
+                    amend: this.flags.amend,
+                    metadata: {
+                        runtimeVersion,
+                    },
+                    manifest: manifestContents,
                 },
-            }));
-            const appsResp = await catalogService.setApplicationManifests({
-                manifests,
+            ],
+        });
+        if (deployResp.applications[0] === undefined) {
+            this.error('Failed to deploy application');
+        }
+        // If we deployed, we have to actually retrieve the
+        // currentVersionId from the response.
+        const currentVersionId = deployResp.applications[0].currentVersionId;
+        // And save it asap.
+        config.versionId = currentVersionId;
+        await this.saveConfig(config);
+        // Upload bundle to this version's store.
+        for (const handler of app.handlers()) {
+            const bundle = new FileSystemBundle(path.join(buildDir, valueOf(handler.name)));
+            await catalogService.uploadBundle({
                 userId,
                 organizationId,
+                applicationName: valueOf(app.name),
+                applicationVersionId: currentVersionId,
+                archiveType: BundleArchiveType.ZIP,
+                bundleName: valueOf(handler.name),
+                archive: Buffer.from(await archive(bundle)),
             });
-            changed = appsResp.success;
-            if (appsResp.failure.length > 0) {
-                this.error(`Failed to amend applications: ${appsResp.failure.map((a) => `${a.name}@${a.versionId}`).join(', ')}. Make sure the application exists and the version is sandboxed.`, { exit: 1 });
-            }
+            this.log(`Uploaded bundle "${valueOf(handler.name)}"`);
         }
-        else {
-            const applications = apps.map((app) => ({
-                name: valueOf(app.name),
-                manifest: manifestContents,
-                manifestJson: JSON.stringify(manifestJson),
-                version: {
-                    case: 'versionId',
-                    value: versionId,
-                },
-                isActive: this.flags.start,
-                metadata: { runtimeVersion },
-            }));
-            const appsResp = await catalogService.createApplications({
-                applications,
+        // Upload DB bundle if it exists.
+        const dbDir = path.join(this.flags.root, 'db');
+        let dbExists = false;
+        try {
+            const stat = await fs.lstat(dbDir);
+            dbExists = stat.isDirectory();
+        }
+        catch (_e) {
+            // Nothing to do
+        }
+        if (dbExists) {
+            const dbBundle = new FileSystemBundle(path.join(this.flags.root, 'db'));
+            await catalogService.uploadBundle({
                 userId,
                 organizationId,
-                suite: undefined, // TODO [bosgood] Provide suite name once available
+                applicationName: valueOf(app.name),
+                applicationVersionId: currentVersionId,
+                archiveType: BundleArchiveType.ZIP,
+                bundleName: 'db',
+                archive: Buffer.from(await archive(dbBundle)),
             });
-            changed = appsResp.applications;
+            this.log(`Uploaded bundle "db"`);
         }
-        // Upload bundle to this version's store.
-        for (const [i, app] of apps.entries()) {
-            const appResp = changed[i];
-            if (!appResp) {
-                this.error(`Failed to create application ${valueOf(app.name)}, not uploading code bundle`, { exit: false });
-                continue;
-            }
-            const versionId = appResp.versionId;
-            this.log(`${this.flags.amend ? 'Updated' : 'Created'} application "${valueOf(app.name)}" with version ID "${versionId}"`);
-            for (const handler of app.handlers()) {
-                const bundle = new FileSystemBundle(path.join(buildDir, valueOf(handler.name)));
-                await catalogService.uploadBundle({
-                    userId,
-                    organizationId,
-                    applicationName: valueOf(app.name),
-                    applicationVersionId: versionId,
-                    archiveType: BundleArchiveType.ZIP,
-                    bundleName: valueOf(handler.name),
-                    archive: Buffer.from(await archive(bundle)),
-                });
-                this.log(`Uploaded bundle "${valueOf(handler.name)}"`);
-            }
-            // Per above, each application gets the same db bundle, which is
-            // boneheaded. src/db is pretty arbitrary.
-            const dbDir = path.join(this.flags.root, 'db');
-            let dbExists = false;
-            try {
-                const stat = await fs.lstat(dbDir);
-                dbExists = stat.isDirectory();
-            }
-            catch (_e) {
-                // Nothing to do
-            }
-            if (dbExists) {
-                const dbBundle = new FileSystemBundle(path.join(this.flags.root, 'db'));
-                await catalogService.uploadBundle({
-                    userId,
-                    organizationId,
-                    applicationName: valueOf(app.name),
-                    applicationVersionId: versionId,
-                    archiveType: BundleArchiveType.ZIP,
-                    bundleName: 'db',
-                    archive: Buffer.from(await archive(dbBundle)),
-                });
-                this.log(`Uploaded bundle "db"`);
-            }
+        // Set to start?
+        if (this.flags.start) {
+            await catalogService.setActive({
+                userId,
+                organizationId,
+                applications: deployResp.applications.map((a) => ({
+                    applicationName: a.applicationName,
+                    currentVersionId: a.currentVersionId,
+                    isActive: this.flags.start,
+                })),
+            });
         }
+        // Release locks.
+        await catalogService.release({
+            userId,
+            organizationId,
+            locks: deployResp.applications.map((a) => new ReleaseRequest_Lock({
+                applicationName: a.applicationName,
+                currentVersionId: a.currentVersionId,
+                lock: a.lock,
+            })),
+        });
+        // TODO [ian] Call watch and subscribe to events.
     }
 }

package/dist/commands/build/env/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/env/get.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAA2B;IAE7C,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MA0CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA0D3B"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/env/get.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,IAAI;;MAET;IAEF,MAAM,CAAC,WAAW,SAA2B;IAE7C,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MA0CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2D3B"}

package/dist/commands/build/env/get.js

@@ -64,9 +64,6 @@ sets an env var/secret.
         let isSecret = false;
         // Split up the variable path.
         const path = this.args.var.split(':');
-        if (path.shift() !== valueOf(app.name)) {
-            this.error(`variable does not belong to application ${valueOf(app.name)}`, { exit: 1 });
-        }
         const envVarName = path.pop();
         if (envVarName === undefined) {
             this.error('variable name not specified', { exit: 1 });
@@ -98,18 +95,22 @@ sets an env var/secret.
         }
         const config = await this.loadConfig();
         const { client: catalogService, userId, organizationId } = await this.catalogService();
-        const resp = await catalogService.getEnv({
+        const resp = await catalogService.getEnvs({
             userId,
             organizationId: this.flags.impersonate ?? organizationId,
-            applicationName: valueOf(app.name),
-            applicationVersionId: this.flags.versionId || config.versionId,
-            key: this.args.var,
+            envs: [
+                {
+                    applicationName: valueOf(app.name),
+                    currentVersionId: this.flags.versionId || config.versionId,
+                    key: this.args.var,
+                },
+            ],
         });
         if (isSecret) {
-            console.log(`${this.args.var}=[hash: ${resp.value}]`);
+            console.log(`${this.args.var}=[hash: ${resp.envs[0]?.value}]`);
         }
         else {
-            console.log(`${this.args.var}=${resp.value}`);
+            console.log(`${this.args.var}=${resp.envs[0]?.value}`);
         }
     }
 }

package/dist/commands/build/env/set.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/env/set.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,WAAW,SAA2B;IAE7C,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MA2CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAqE3B"}
+{"version":3,"file":"set.d.ts","sourceRoot":"","sources":["../../../../src/commands/build/env/set.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,MAAM,CAAC,OAAO,OAAO,GAAI,SAAQ,WAAW,CAAC,OAAO,GAAG,CAAC;IACtD,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,WAAW,SAA2B;IAE7C,MAAM,CAAC,QAAQ,WAIb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;MA2CV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsE3B"}