@pwrdrvr/microapps-publish 0.0.20 → 0.0.21

package/dist/index.d.ts

@@ -1,65 +1,2 @@
-#!/usr/bin/env node
-import 'source-map-support/register';
-import 'reflect-metadata';
-import { Command, flags as flagsParser } from '@oclif/command';
-import { IConfig as OCLIFIConfig } from '@oclif/config';
-import { IDeployVersionPreflightResult } from './DeployClient';
-export interface IContext {
-    preflightResult: IDeployVersionPreflightResult;
-    files: string[];
-}
-declare class PublishTool extends Command {
-    static flags: {
-        version: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
-        help: import("@oclif/parser/lib/flags").IBooleanFlag<void>;
-        deployerLambdaName: flagsParser.IOptionFlag<string>;
-        newVersion: flagsParser.IOptionFlag<string>;
-        repoName: flagsParser.IOptionFlag<string>;
-        leaveCopy: import("@oclif/parser/lib/flags").IBooleanFlag<boolean>;
-    };
-    private static escapeRegExp;
-    private VersionAndAlias;
-    private IMAGE_TAG;
-    private IMAGE_URI;
-    private FILES_TO_MODIFY;
-    private _restoreFilesStarted;
-    constructor(argv: string[], config: OCLIFIConfig);
-    run(): Promise<void>;
-    /**
-     * Restore files that the version was patched into
-     */
-    private restoreFiles;
-    /**
-     * Setup version and alias strings
-     * @param version
-     * @returns
-     */
-    private createVersions;
-    /**
-     * Write new versions into specified config files
-     * @param path
-     * @param requiredVersions
-     * @param leaveFiles
-     * @returns
-     */
-    private writeNewVersions;
-    /**
-     * Login to ECR for Lambda Docker functions
-     * @param config
-     * @returns
-     */
-    private loginToECR;
-    /**
-     * Publish to ECR for Lambda Docker function
-     * @param config
-     */
-    private publishToECR;
-    /**
-     * Publish an app version to Lambda
-     * @param config
-     * @param versions
-     */
-    private deployToLambda;
-}
-export default PublishTool;
+export { run } from '@oclif/command';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAGA,OAAO,6BAA6B,CAAC;AAErC,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAC;AAOxD,OAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAsB7E,MAAM,WAAW,QAAQ;IACvB,eAAe,EAAE,6BAA6B,CAAC;IAC/C,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,cAAM,WAAY,SAAQ,OAAO;IAC/B,MAAM,CAAC,KAAK;;;;;;;MA6BV;IAGF,OAAO,CAAC,MAAM,CAAC,YAAY;IAI3B,OAAO,CAAC,eAAe,CAAY;IACnC,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,SAAS,CAAM;IACvB,OAAO,CAAC,eAAe,CAGnB;IACJ,OAAO,CAAC,oBAAoB,CAAS;gBAEzB,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY;IAK1C,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IAkU1B;;OAEG;YACW,YAAY;IAkB1B;;;;OAIG;IACH,OAAO,CAAC,cAAc;IAItB;;;;;;OAMG;YACW,gBAAgB;IA0C9B;;;;OAIG;YACW,UAAU;IAexB;;;OAGG;YACW,YAAY;IAW1B;;;;OAIG;YACW,cAAc;CAoD7B;AAKD,eAAe,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/index.js

@@ -1,483 +1,6 @@
-#!/usr/bin/env node
 "use strict";
-/* eslint-disable no-console */
 Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-require("source-map-support/register");
-// Used by ts-convict
-require("reflect-metadata");
-const child_process_1 = require("child_process");
-const util = tslib_1.__importStar(require("util"));
-const lambda = tslib_1.__importStar(require("@aws-sdk/client-lambda"));
-const s3 = tslib_1.__importStar(require("@aws-sdk/client-s3"));
-const sts = tslib_1.__importStar(require("@aws-sdk/client-sts"));
-const command_1 = require("@oclif/command");
-const errors_1 = require("@oclif/errors");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const path_1 = tslib_1.__importDefault(require("path"));
-const fs_extra_1 = require("fs-extra");
-const listr2_1 = require("listr2");
-const Config_1 = require("./config/Config");
-const DeployClient_1 = tslib_1.__importDefault(require("./DeployClient"));
-const S3Uploader_1 = tslib_1.__importDefault(require("./S3Uploader"));
-const S3TransferUtility_1 = tslib_1.__importDefault(require("./S3TransferUtility"));
-const lib_storage_1 = require("@aws-sdk/lib-storage");
-const mime_types_1 = require("mime-types");
-const asyncSetTimeout = util.promisify(setTimeout);
-const asyncExec = util.promisify(child_process_1.exec);
-const RUNNING_TEXT = ' RUNS ';
-const RUNNING = chalk_1.default.reset.inverse.yellow.bold(RUNNING_TEXT) + ' ';
-const lambdaClient = new lambda.LambdaClient({
-    maxAttempts: 8,
-});
-class PublishTool extends command_1.Command {
-    constructor(argv, config) {
-        super(argv, config);
-        this.IMAGE_TAG = '';
-        this.IMAGE_URI = '';
-        this._restoreFilesStarted = false;
-        this.restoreFiles = this.restoreFiles.bind(this);
-    }
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
-    static escapeRegExp(value) {
-        return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
-    }
-    async run() {
-        const { flags: parsedFlags } = this.parse(PublishTool);
-        const version = parsedFlags.newVersion;
-        const leaveFiles = parsedFlags.leaveCopy;
-        const lambdaName = parsedFlags.deployerLambdaName;
-        const ecrRepo = parsedFlags.repoName;
-        // Override the config value
-        const config = Config_1.Config.instance;
-        config.deployer.lambdaName = lambdaName;
-        config.app.semVer = version;
-        // Get the account ID and region from STS
-        // TODO: Move this to the right place
-        if (config.app.awsAccountID === 0 || config.app.awsRegion === '') {
-            const stsClient = new sts.STSClient({
-                maxAttempts: 8,
-            });
-            const stsResponse = await stsClient.send(new sts.GetCallerIdentityCommand({}));
-            if (config.app.awsAccountID === 0) {
-                config.app.awsAccountID = parseInt(stsResponse.Account, 10);
-            }
-            if (config.app.awsRegion === '') {
-                config.app.awsRegion = stsClient.config.region;
-            }
-        }
-        if (config.app.ecrHost === '') {
-            config.app.ecrHost = `${config.app.awsAccountID}.dkr.ecr.${config.app.awsRegion}.amazonaws.com`;
-        }
-        if (ecrRepo) {
-            config.app.ecrRepoName = ecrRepo;
-        }
-        else if (config.app.ecrRepoName === '') {
-            config.app.ecrRepoName = `microapps-app-${config.app.name}${Config_1.Config.envLevel}-repo`;
-        }
-        this.VersionAndAlias = this.createVersions(version);
-        const versionOnly = { version: this.VersionAndAlias.version };
-        this.FILES_TO_MODIFY = [
-            { path: 'package.json', versions: versionOnly },
-            // { path: 'deploy.json', versions: this.VersionAndAlias },
-            { path: 'next.config.js', versions: versionOnly },
-        ];
-        // Install handler to ensure that we restore files
-        // eslint-disable-next-line @typescript-eslint/no-misused-promises
-        process.on('SIGINT', async () => {
-            if (this._restoreFilesStarted) {
-                return;
-            }
-            else {
-                this._restoreFilesStarted = true;
-            }
-            this.log('Caught Ctrl-C, restoring files');
-            await S3Uploader_1.default.removeTempDirIfExists();
-            await this.restoreFiles();
-        });
-        if (config === undefined) {
-            this.error('Failed to load the config file');
-        }
-        if (config.app.staticAssetsPath === undefined) {
-            this.error('StaticAssetsPath must be specified in the config file');
-        }
-        //
-        // Setup Tasks
-        //
-        const tasks = new listr2_1.Listr([
-            {
-                title: 'Logging into ECR',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    await this.loginToECR(config);
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Modifying Config Files',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Modify the existing files with the new version
-                    for (const fileToModify of this.FILES_TO_MODIFY) {
-                        task.output = `Patching version (${this.VersionAndAlias.version}) into ${fileToModify.path}`;
-                        if (!(await this.writeNewVersions(fileToModify.path, fileToModify.versions, leaveFiles))) {
-                            task.output = `Failed modifying file: ${fileToModify.path}`;
-                        }
-                    }
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Preflight Version Check',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Confirm the Version Does Not Exist in Published State
-                    task.output = `Checking if deployed app/version already exists for ${config.app.name}/${version}`;
-                    ctx.preflightResult = await DeployClient_1.default.DeployVersionPreflight(config, task);
-                    if (ctx.preflightResult.exists) {
-                        task.output = `Warning: App/Version already exists: ${config.app.name}/${config.app.semVer}`;
-                    }
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Serverless Next.js Build',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    task.output = `Invoking serverless next.js build for ${config.app.name}/${version}`;
-                    // Run the serverless next.js build
-                    await asyncExec('serverless');
-                    if (config.app.serverlessNextRouterPath !== undefined) {
-                        task.output = 'Copying Serverless Next.js router to build output directory';
-                        await fs_extra_1.promises.copyFile(config.app.serverlessNextRouterPath, './.serverless_nextjs/index.js');
-                    }
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Publish to ECR',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Docker, build, tag, push to ECR
-                    // Note: Need to already have AWS env vars set
-                    await this.publishToECR(config, task);
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Deploy to Lambda',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Update the Lambda function
-                    await this.deployToLambda(config, this.VersionAndAlias, task);
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Confirm Static Assets Folder Exists',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Check that Static Assets Folder exists
-                    if (!(await fs_extra_1.pathExists(config.app.staticAssetsPath))) {
-                        this.error(`Static asset path does not exist: ${config.app.staticAssetsPath}`);
-                    }
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Copy Static Files to Local Upload Dir',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Copy files to local dir to be uploaded
-                    await S3Uploader_1.default.CopyToUploadDir(config, ctx.preflightResult.response.s3UploadUrl);
-                    task.title = origTitle;
-                },
-            },
-            // {
-            //   title: 'Upload Files to S3 Staging AppName/Version Prefix',
-            //   task: async (ctx, task) => {
-            //     const origTitle = task.title;
-            //     task.title = RUNNING + origTitle;
-            //     const { destinationPrefix, bucketName } = S3Uploader.ParseUploadPath(
-            //       ctx.preflightResult.response.s3UploadUrl,
-            //     );
-            //     // Upload Files to S3 Staging AppName/Version Prefix
-            //     await S3TransferUtility.UploadDir(
-            //       S3Uploader.TempDir,
-            //       destinationPrefix,
-            //       bucketName,
-            //       ctx.preflightResult.response,
-            //     );
-            //     task.title = origTitle;
-            //   },
-            // },
-            {
-                title: 'Enumerate Files to Upload to S3',
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    ctx.files = (await S3TransferUtility_1.default.GetFiles(S3Uploader_1.default.TempDir));
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: 'Upload Static Files to S3',
-                task: (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    const { bucketName, destinationPrefix } = S3Uploader_1.default.ParseUploadPath(ctx.preflightResult.response.s3UploadUrl);
-                    // Use temp credentials for S3
-                    const s3Client = new s3.S3Client({
-                        maxAttempts: 16,
-                        credentials: {
-                            accessKeyId: ctx.preflightResult.response.awsCredentials.accessKeyId,
-                            secretAccessKey: ctx.preflightResult.response.awsCredentials.secretAccessKey,
-                            sessionToken: ctx.preflightResult.response.awsCredentials.sessionToken,
-                        },
-                    });
-                    const pathWithoutAppAndVer = path_1.default.join(S3Uploader_1.default.TempDir, destinationPrefix);
-                    const tasks = ctx.files.map((filePath) => ({
-                        task: async (ctx, subtask) => {
-                            const relFilePath = path_1.default.relative(pathWithoutAppAndVer, filePath);
-                            const origTitle = relFilePath;
-                            subtask.title = RUNNING + origTitle;
-                            const upload = new lib_storage_1.Upload({
-                                client: s3Client,
-                                leavePartsOnError: false,
-                                params: {
-                                    Bucket: bucketName,
-                                    Key: path_1.default.relative(S3Uploader_1.default.TempDir, filePath),
-                                    Body: fs_extra_1.createReadStream(filePath),
-                                    ContentType: mime_types_1.contentType(path_1.default.basename(filePath)) || 'application/octet-stream',
-                                    CacheControl: 'max-age=86400; public',
-                                },
-                            });
-                            await upload.done();
-                            subtask.title = origTitle;
-                        },
-                    }));
-                    task.title = origTitle;
-                    return task.newListr(tasks, {
-                        concurrent: 8,
-                        rendererOptions: {
-                            clearOutput: false,
-                            showErrorMessage: true,
-                            showTimer: true,
-                        },
-                    });
-                },
-            },
-            {
-                title: `Creating MicroApp Application: ${config.app.name}`,
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Call Deployer to Create App if Not Exists
-                    await DeployClient_1.default.CreateApp(config);
-                    task.title = origTitle;
-                },
-            },
-            {
-                title: `Creating MicroApp Version: ${config.app.semVer}`,
-                task: async (ctx, task) => {
-                    const origTitle = task.title;
-                    task.title = RUNNING + origTitle;
-                    // Call Deployer to Deploy AppName/Version
-                    await DeployClient_1.default.DeployVersion(config, task);
-                    task.title = origTitle;
-                },
-            },
-        ], {
-            rendererOptions: {
-                showTimer: true,
-            },
-        });
-        try {
-            await tasks.run();
-            // this.log(`Published: ${config.app.name}/${config.app.semVer}`);
-        }
-        catch (error) {
-            this.log(`Caught exception: ${error.message}`);
-        }
-        finally {
-            await S3Uploader_1.default.removeTempDirIfExists();
-            await this.restoreFiles();
-        }
-    }
-    /**
-     * Restore files that the version was patched into
-     */
-    async restoreFiles() {
-        // Put the old files back when succeeded or failed
-        for (const fileToModify of this.FILES_TO_MODIFY) {
-            try {
-                const stats = await fs_extra_1.promises.stat(`${fileToModify.path}.original`);
-                if (stats.isFile()) {
-                    // Remove the possibly modified file
-                    await fs_extra_1.promises.unlink(fileToModify.path);
-                    // Move the original file back
-                    await fs_extra_1.promises.rename(`${fileToModify.path}.original`, fileToModify.path);
-                }
-            }
-            catch (_a) {
-                // don't care... if the file doesn't exist we can't do anything
-            }
-        }
-    }
-    /**
-     * Setup version and alias strings
-     * @param version
-     * @returns
-     */
-    createVersions(version) {
-        return { version, alias: `v${version.replace(/\./g, '_')}` };
-    }
-    /**
-     * Write new versions into specified config files
-     * @param path
-     * @param requiredVersions
-     * @param leaveFiles
-     * @returns
-     */
-    async writeNewVersions(path, requiredVersions, leaveFiles) {
-        const stats = await fs_extra_1.promises.stat(path);
-        if (!stats.isFile) {
-            return false;
-        }
-        // Make a backup of the file
-        await fs_extra_1.promises.copyFile(path, `${path}.original`);
-        // File exists, check that it has the required version strings
-        let fileText = await fs_extra_1.promises.readFile(path, 'utf8');
-        for (const key of Object.keys(requiredVersions)) {
-            const placeHolder = key === 'version' ? '0.0.0' : 'v0_0_0';
-            if (fileText.indexOf(placeHolder) === -1) {
-                // The required placeholder is missing
-                return false;
-            }
-            else {
-                const regExp = new RegExp(PublishTool.escapeRegExp(placeHolder), 'g');
-                fileText = fileText.replace(regExp, key === 'version' ? requiredVersions.version : requiredVersions.alias);
-            }
-        }
-        // Write the updated file contents
-        await fs_extra_1.promises.writeFile(path, fileText, 'utf8');
-        // Leave a copy of the modified file if requested
-        if (leaveFiles) {
-            // This copy will overwrite an existing file
-            await fs_extra_1.promises.copyFile(path, `${path}.modified`);
-        }
-        return true;
-    }
-    /**
-     * Login to ECR for Lambda Docker functions
-     * @param config
-     * @returns
-     */
-    async loginToECR(config) {
-        this.IMAGE_TAG = `${config.app.ecrRepoName}:${this.VersionAndAlias.version}`;
-        this.IMAGE_URI = `${config.app.ecrHost}/${this.IMAGE_TAG}`;
-        try {
-            await asyncExec(`aws ecr get-login-password --region ${config.app.awsRegion} | docker login --username AWS --password-stdin ${config.app.ecrHost}`);
-        }
-        catch (error) {
-            throw new Error(`ECR Login Failed: ${error.message}`);
-        }
-        return true;
-    }
-    /**
-     * Publish to ECR for Lambda Docker function
-     * @param config
-     */
-    async publishToECR(config, task) {
-        task.output = 'Starting Docker build';
-        await asyncExec(`docker build -f Dockerfile -t ${this.IMAGE_TAG}  .`);
-        await asyncExec(`docker tag ${this.IMAGE_TAG} ${config.app.ecrHost}/${this.IMAGE_TAG}`);
-        task.output = 'Starting Docker push to ECR';
-        await asyncExec(`docker push ${config.app.ecrHost}/${this.IMAGE_TAG}`);
-    }
-    /**
-     * Publish an app version to Lambda
-     * @param config
-     * @param versions
-     */
-    async deployToLambda(config, versions, task) {
-        var _a;
-        // Create Lambda version
-        task.output = 'Updating Lambda code to point to new Docker image';
-        const resultUpdate = await lambdaClient.send(new lambda.UpdateFunctionCodeCommand({
-            FunctionName: config.app.lambdaName,
-            ImageUri: this.IMAGE_URI,
-            Publish: true,
-        }));
-        const lambdaVersion = resultUpdate.Version;
-        task.output = `Lambda version created: ${resultUpdate.Version}`;
-        let lastUpdateStatus = resultUpdate.LastUpdateStatus;
-        for (let i = 0; i < 5; i++) {
-            // When the function is created the status will be "Pending"
-            // and we have to wait until it's done creating
-            // before we can point an alias to it
-            if (lastUpdateStatus === 'Successful') {
-                task.output = `Lambda function updated, version: ${lambdaVersion}`;
-                break;
-            }
-            // If it didn't work, wait and try again
-            await asyncSetTimeout(1000 * i);
-            const resultGet = await lambdaClient.send(new lambda.GetFunctionCommand({
-                FunctionName: config.app.lambdaName,
-                Qualifier: lambdaVersion,
-            }));
-            // Save the last update status so we can check on re-loop
-            lastUpdateStatus = (_a = resultGet === null || resultGet === void 0 ? void 0 : resultGet.Configuration) === null || _a === void 0 ? void 0 : _a.LastUpdateStatus;
-        }
-        // Create Lambda alias point
-        task.output = `Creating the lambda alias for the new version: ${lambdaVersion}`;
-        const resultLambdaAlias = await lambdaClient.send(new lambda.CreateAliasCommand({
-            FunctionName: config.app.lambdaName,
-            Name: versions.alias,
-            FunctionVersion: lambdaVersion,
-        }));
-        task.output = `Lambda alias created, name: ${resultLambdaAlias.Name}`;
-    }
-}
-PublishTool.flags = {
-    version: command_1.flags.version({
-        char: 'v',
-    }),
-    help: command_1.flags.help(),
-    deployerLambdaName: command_1.flags.string({
-        char: 'd',
-        multiple: false,
-        required: true,
-        description: 'Name of the deployer lambda function',
-    }),
-    newVersion: command_1.flags.string({
-        char: 'n',
-        multiple: false,
-        required: true,
-        description: 'New semantic version to apply',
-    }),
-    repoName: command_1.flags.string({
-        char: 'r',
-        multiple: false,
-        required: true,
-        description: 'Name (not URI) of the Docker repo for the app',
-    }),
-    leaveCopy: command_1.flags.boolean({
-        char: 'l',
-        default: false,
-        required: false,
-        description: 'Leave a copy of the modifed files as .modified',
-    }),
-};
-// @ts-expect-error catch is actually defined
-PublishTool.run().catch(errors_1.handle);
-exports.default = PublishTool;
+exports.run = void 0;
+var command_1 = require("@oclif/command");
+Object.defineProperty(exports, "run", { enumerable: true, get: function () { return command_1.run; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,0CAAqC;AAA5B,8FAAA,GAAG,OAAA"}

package/dist/{DeployClient.d.ts → lib/DeployClient.d.ts}

@@ -1,9 +1,6 @@
 import * as lambda from '@aws-sdk/client-lambda';
-import { TaskWrapper } from 'listr2/dist/lib/task-wrapper';
-import { DefaultRenderer } from 'listr2/dist/renderer/default.renderer';
 import { IDeployVersionPreflightResponse } from '@pwrdrvr/microapps-deployer-lib';
-import { IConfig } from './config/Config';
-import { IContext } from './index';
+import { IConfig } from '../config/Config';
 export interface IDeployVersionPreflightResult {
     exists: boolean;
     response: IDeployVersionPreflightResponse;
@@ -12,7 +9,18 @@ export default class DeployClient {
     static readonly _client: lambda.LambdaClient;
     static readonly _decoder: TextDecoder;
     static CreateApp(config: IConfig): Promise<void>;
-    static DeployVersionPreflight(config: IConfig, task: TaskWrapper<IContext, typeof DefaultRenderer>): Promise<IDeployVersionPreflightResult>;
+    /**
+     * Check if version exists.
+     * Optionally get S3 creds for static asset upload.
+     * @param config
+     * @param output
+     * @returns
+     */
+    static DeployVersionPreflight(opts: {
+        config: IConfig;
+        needS3Creds?: boolean;
+        output: (message: string) => void;
+    }): Promise<IDeployVersionPreflightResult>;
     /**
      * Copy S3 static assets from staging to live bucket.
      * Create API Gateway Integration for app (if needed).
@@ -21,6 +29,6 @@ export default class DeployClient {
      * @param config
      * @param task
      */
-    static DeployVersion(config: IConfig, task: TaskWrapper<IContext, typeof DefaultRenderer>): Promise<void>;
+    static DeployVersion(config: IConfig, output: (message: string) => void): Promise<void>;
 }
 //# sourceMappingURL=DeployClient.d.ts.map

package/dist/lib/DeployClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeployClient.d.ts","sourceRoot":"","sources":["../../src/lib/DeployClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAEL,+BAA+B,EAIhC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,WAAW,6BAA6B;IAC5C,MAAM,EAAE,OAAO,CAAC;IAChB,QAAQ,EAAE,+BAA+B,CAAC;CAC3C;AAED,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,sBAEpB;IACH,MAAM,CAAC,QAAQ,CAAC,QAAQ,cAA4B;WAEhC,SAAS,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB7D;;;;;;OAMG;WACiB,sBAAsB,CAAC,IAAI,EAAE;QAC/C,MAAM,EAAE,OAAO,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;KACnC,GAAG,OAAO,CAAC,6BAA6B,CAAC;IAgC1C;;;;;;;OAOG;WACiB,aAAa,CAC/B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,OAAO,CAAC,IAAI,CAAC;CA6BjB"}