@liquidmetal-ai/raindrop 0.2.5 → 0.2.7

package/dist/commands/build/branch.js

@@ -1,23 +1,18 @@
-import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-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';
+import { deploy } from '../../deploy.js';
 export default class Branch extends BaseCommand {
     static args = {
         branch: Args.string({ description: 'branch name', required: true }),
     };
-    static description = 'create a new branch in the Raindrop catalog';
+    static description = 'branch a Raindrop application';
     static examples = [
         `<%= config.bin %> <%= command.id %> .
-Created new branch 1234
+Branch a Raindrop application.
 `,
     ];
     static flags = {
+        ...BaseCommand.HIDDEN_FLAGS,
         root: Flags.string({ char: 'r', description: 'root directory', required: false, default: process.cwd() }),
         manifest: Flags.string({
             char: 'm',
@@ -25,23 +20,11 @@ Created new branch 1234
             required: false,
             default: 'raindrop.manifest',
         }),
-        config: Flags.string({
-            char: 'c',
-            description: 'config file',
-            required: false,
-            hidden: true,
-            default: '.raindrop/config.json',
-        }),
         output: Flags.string({ char: 'o', description: 'output directory', required: false, default: 'dist' }),
         versionId: Flags.string({
             char: 'p',
             aliases: ['version'],
-            description: 'Branch from this version',
-            required: false,
-        }),
-        start: Flags.boolean({
-            description: 'Start the application',
-            default: false,
+            description: 'branch from this version',
             required: false,
         }),
         impersonate: Flags.string({
@@ -50,15 +33,10 @@ Created new branch 1234
             required: false,
             hidden: true,
         }),
-        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,
+        start: Flags.boolean({
+            description: 'start the application after deploying',
+            default: false,
+            required: false,
         }),
         show: Flags.boolean({ description: 'show the current branch', required: false }),
     };
@@ -69,99 +47,17 @@ Created new branch 1234
             this.log(`Current versionId: ${config.versionId}`);
             return;
         }
-        // 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)),
-            });
-            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
-        }
-        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,
-            locks: deployResp.applications.map((a) => new ReleaseRequest_Lock({
-                applicationName: a.applicationName,
-                currentVersionId: a.currentVersionId,
-                lock: a.lock,
-            })),
+        await deploy({
+            command: this,
+            root: this.flags.root,
+            manifest: this.flags.manifest,
+            output: this.flags.output,
+            previousVersionId: versionId,
+            branch: this.args.branch,
+            amend: false,
+            start: this.flags.start,
+            impersonate: this.flags.impersonate,
         });
-        // TODO [ian] Call watch and subscribe to events.
     }
 }

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

@@ -6,10 +6,13 @@ export default class Branch extends BaseCommand<typeof Branch> {
     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>;
+        config: 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>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

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

@@ -1 +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"}
+{"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;;;;;;;;MAGV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA+B3B"}

package/dist/commands/build/checkout.js

@@ -14,24 +14,8 @@ Switched to version: 01jux6z20m4gbhn5kaa4mcm2jr
 `,
     ];
     static flags = {
-        config: Flags.string({
-            char: 'c',
-            description: 'config file',
-            required: false,
-            hidden: true,
-            default: '.raindrop/config.json',
-        }),
+        ...BaseCommand.HIDDEN_FLAGS,
         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) {

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

@@ -8,13 +8,16 @@ export default class Delete extends BaseCommand<typeof Delete> {
     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>;
         output: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         version: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         all: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        config: 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>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

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;CAsD3B"}
+{"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;;;;;;;;;;;;;MAiCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsD3B"}

package/dist/commands/build/delete.js

@@ -13,6 +13,7 @@ Deleted (application) at version (version)
 `,
     ];
     static flags = {
+        ...BaseCommand.HIDDEN_FLAGS,
         root: Flags.string({ char: 'r', description: 'root directory', required: false, default: process.cwd() }),
         manifest: Flags.string({
             char: 'm',
@@ -20,13 +21,6 @@ Deleted (application) at version (version)
             required: false,
             default: 'raindrop.manifest',
         }),
-        config: Flags.string({
-            char: 'c',
-            description: 'config file',
-            required: false,
-            hidden: true,
-            default: '.raindrop/config.json',
-        }),
         output: Flags.string({
             char: 'o',
             description: 'output format',
@@ -51,16 +45,6 @@ Deleted (application) at version (version)
             required: false,
             hidden: true,
         }),
-        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() {
         const { client: catalogService, userId, organizationId } = await this.catalogService();

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

@@ -6,14 +6,19 @@ export default class Deploy extends BaseCommand<typeof Deploy> {
     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>;
         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>;
         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>;
         start: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        resume: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        lock: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         amend: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        config: 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>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

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":"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"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/build/deploy.ts"],"names":[],"mappings":"AACA,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;;;;;;;;;;;;;;;;MAsCV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA+B3B"}

package/dist/commands/build/deploy.js

@@ -1,21 +1,16 @@
-import { valueOf } from '@liquidmetal-ai/drizzle/appify/build';
-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 { 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 { deploy } from '../../deploy.js';
 export default class Deploy extends BaseCommand {
     static args = {};
     static description = 'deploy a Raindrop application';
     static examples = [
         `<%= config.bin %> <%= command.id %> .
-Deploy a Raindrop application.
+Deploy a Raindrop application version.
 `,
     ];
     static flags = {
+        ...BaseCommand.HIDDEN_FLAGS,
         root: Flags.string({ char: 'r', description: 'root directory', required: false, default: process.cwd() }),
         manifest: Flags.string({
             char: 'm',
@@ -23,13 +18,6 @@ Deploy a Raindrop application.
             required: false,
             default: 'raindrop.manifest',
         }),
-        config: Flags.string({
-            char: 'c',
-            description: 'config file',
-            required: false,
-            hidden: true,
-            default: '.raindrop/config.json',
-        }),
         output: Flags.string({ char: 'o', description: 'output directory', required: false, default: 'dist' }),
         versionId: Flags.string({
             char: 'v',
@@ -43,131 +31,49 @@ Deploy a Raindrop application.
             required: false,
             hidden: true,
         }),
-        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,
-        }),
         start: Flags.boolean({
             char: 's',
             description: 'start the application after deploying',
             required: false,
             default: false,
         }),
+        resume: Flags.boolean({
+            description: 'resume a deployment',
+            required: false,
+            default: false,
+        }),
+        lock: Flags.string({
+            description: 'override lock ID to resume deployment',
+            required: false,
+        }),
         amend: Flags.boolean({ char: 'a', description: 'amend an existing application', required: false, default: false }),
     };
     async run() {
-        // 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 config = await this.loadConfig();
         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),
-                    currentVersionId: this.flags.amend ? versionId : undefined,
-                    previousVersionId: this.flags.amend ? undefined : versionId,
-                    amend: this.flags.amend,
-                    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)),
-            });
-            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
-        }
-        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"`);
-        }
-        // 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,
-                })),
-            });
+        const unlock = this.flags.resume ? this.flags.lock ?? config.lock : undefined;
+        if (this.flags.resume) {
+            if (versionId === undefined) {
+                this.error(`Cannot resume deployment without a versionId. Please specify a versionId or run without --resume to start a new deployment.`);
+            }
+            if (unlock === undefined) {
+                this.error(`Cannot resume deployment without a lock. Please specify --lock or run without --resume to start a new deployment.`);
+            }
         }
-        // Release locks.
-        await catalogService.release({
-            userId,
-            organizationId,
-            locks: deployResp.applications.map((a) => new ReleaseRequest_Lock({
-                applicationName: a.applicationName,
-                currentVersionId: a.currentVersionId,
-                lock: a.lock,
-            })),
+        // Resuming is _always_ amending
+        const amend = this.flags.resume || this.flags.amend;
+        await deploy({
+            command: this,
+            root: this.flags.root,
+            manifest: this.flags.manifest,
+            output: this.flags.output,
+            versionId,
+            currentVersionId: amend ? versionId : undefined,
+            previousVersionId: amend ? undefined : versionId,
+            amend,
+            lock: unlock,
+            start: this.flags.start,
+            impersonate: this.flags.impersonate,
         });
-        // TODO [ian] Call watch and subscribe to events.
     }
 }

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

@@ -7,13 +7,16 @@ export default class Get extends BaseCommand<typeof Get> {
     static examples: string[];
     static flags: {
         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>;
         manifest: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         versionId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         application: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         config: 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>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

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;CA2D3B"}
+{"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;;;;;;;;;;;;MA0BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA2D3B"}

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

@@ -12,17 +12,8 @@ sets an env var/secret.
 `,
     ];
     static flags = {
+        ...BaseCommand.HIDDEN_FLAGS,
         output: Flags.string({ char: 'o', description: 'output format', default: 'table' }),
-        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,
-        }),
         manifest: Flags.string({
             char: 'm',
             description: 'project manifest',
@@ -46,13 +37,6 @@ sets an env var/secret.
             required: false,
             hidden: true,
         }),
-        config: Flags.string({
-            char: 'c',
-            description: 'config file',
-            required: false,
-            hidden: true,
-            default: '.raindrop/config.json',
-        }),
     };
     async run() {
         const apps = await this.loadManifest();

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

@@ -9,13 +9,16 @@ export default class Set extends BaseCommand<typeof Set> {
     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>;
         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>;
         application: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         impersonate: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        config: 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>;
+        rainbowAuthToken: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowOrganizationId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        rainbowUserId: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

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;CAsE3B"}
+{"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;;;;;;;;;;;;;MA2BV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsE3B"}