heroku 10.13.2 → 11.0.0-alpha.10

package/lib/commands/container/push.js

@@ -1,67 +1,62 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const DockerHelper = require("../../lib/container/docker_helper");
-const helpers_1 = require("../../lib/container/helpers");
-const debug_1 = require("../../lib/container/debug");
-async function selectJobs(jobs, processTypes, recursive) {
-    let filteredJobs = {};
-    let selectedJobs = [];
-    if (Object.keys(jobs).length === 0) {
-        return selectedJobs;
-    }
-    if (recursive) {
-        if (processTypes.length > 0) {
-            filteredJobs = DockerHelper.filterByProcessType(jobs, processTypes);
-        }
-        else {
-            filteredJobs = jobs;
-        }
-        selectedJobs = await DockerHelper.chooseJobs(filteredJobs);
-    }
-    else if (jobs.standard) {
-        jobs.standard.forEach(pj => {
-            pj.resource = pj.resource.replace(/standard$/, processTypes[0]);
-        });
-        selectedJobs = jobs.standard || [];
-    }
-    return selectedJobs;
-}
-class Push extends command_1.Command {
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { DockerHelper } from '../../lib/container/docker_helper.js';
+import { ensureContainerStack } from '../../lib/container/helpers.js';
+import { debug } from '../../lib/container/debug.js';
+export default class Push extends Command {
+    static topic = 'container';
+    static description = 'builds, then pushes Docker images to deploy your Heroku app';
+    static strict = false;
+    static flags = {
+        app: flags.app({ required: true }),
+        verbose: flags.boolean({ char: 'v' }),
+        recursive: flags.boolean({ char: 'R', description: 'pushes Dockerfile.<process> found in current and subdirectories' }),
+        arg: flags.string({ description: 'set build-time variables' }),
+        'context-path': flags.string({ description: 'path to use as build context (defaults to Dockerfile dir)' }),
+        remote: flags.remote({ char: 'r' }),
+    };
+    static examples = [
+        '$ heroku container:push web                          # Pushes Dockerfile to web process type',
+        '$ heroku container:push worker                       # Pushes Dockerfile to worker process type',
+        '$ heroku container:push web worker --recursive       # Pushes Dockerfile.web and Dockerfile.worker',
+        '$ heroku container:push --recursive                  # Pushes Dockerfile.*',
+        '$ heroku container:push web --arg ENV=live,HTTPS=on  # Build-time variables',
+        '$ heroku container:push --recursive --context-path . # Pushes Dockerfile.* using current dir as build context',
+    ];
+    dockerHelper = new DockerHelper();
     async run() {
         const { argv: processTypes, flags } = await this.parse(Push);
         const { verbose, app, recursive, arg, 'context-path': contextPath } = flags;
         if (verbose) {
-            debug_1.debug.enabled = true;
+            debug.enabled = true;
         }
         if (processTypes.length === 0 && !recursive) {
-            core_1.ux.error('Requires either --recursive or one or more process types', { exit: 1 });
+            ux.error('Requires either --recursive or one or more process types', { exit: 1 });
         }
         if (processTypes.length > 1 && !recursive) {
-            core_1.ux.error('Requires exactly one target process type, or --recursive option', { exit: 1 });
+            ux.error('Requires exactly one target process type, or --recursive option', { exit: 1 });
         }
         const { body: appBody } = await this.heroku.get(`/apps/${app}`);
-        (0, helpers_1.ensureContainerStack)(appBody, 'push');
+        ensureContainerStack(appBody, 'push');
         const herokuHost = process.env.HEROKU_HOST || 'heroku.com';
         const registry = `registry.${herokuHost}`;
-        const dockerfiles = DockerHelper.getDockerfiles(process.cwd(), recursive);
-        const possibleJobs = DockerHelper.getJobs(`${registry}/${app}`, dockerfiles);
-        const jobs = await selectJobs(possibleJobs, processTypes, recursive);
+        const dockerfiles = this.dockerHelper.getDockerfiles(process.cwd(), recursive);
+        const possibleJobs = this.dockerHelper.getJobs(`${registry}/${app}`, dockerfiles);
+        const jobs = await this.selectJobs(possibleJobs, processTypes, recursive);
         if (jobs.length === 0) {
-            core_1.ux.error('No images to push', { exit: 1 });
+            ux.error('No images to push', { exit: 1 });
         }
         const buildArgs = (arg === undefined) ? [] : arg.split(',');
         try {
             for (const job of jobs) {
                 if (job.name === 'standard') {
-                    heroku_cli_util_1.hux.styledHeader(`Building ${processTypes} (${job.dockerfile})`);
+                    hux.styledHeader(`Building ${processTypes} (${job.dockerfile})`);
                 }
                 else {
-                    heroku_cli_util_1.hux.styledHeader(`Building ${job.name} (${job.dockerfile})`);
+                    hux.styledHeader(`Building ${job.name} (${job.dockerfile})`);
                 }
-                await DockerHelper.buildImage({
+                await this.dockerHelper.buildImage({
                     dockerfile: job.dockerfile,
                     resource: job.resource,
                     buildArgs,
@@ -71,43 +66,46 @@ class Push extends command_1.Command {
             }
         }
         catch (error) {
-            core_1.ux.error(`docker build exited with ${error}`, { exit: 1 });
+            ux.error(`docker build exited with ${error}`, { exit: 1 });
         }
         try {
             for (const job of jobs) {
                 if (job.name === 'standard') {
-                    heroku_cli_util_1.hux.styledHeader(`Pushing ${processTypes} (${job.dockerfile})`);
+                    hux.styledHeader(`Pushing ${processTypes} (${job.dockerfile})`);
                 }
                 else {
-                    heroku_cli_util_1.hux.styledHeader(`Pushing ${job.name} (${job.dockerfile})`);
+                    hux.styledHeader(`Pushing ${job.name} (${job.dockerfile})`);
                 }
-                await DockerHelper.pushImage(job.resource, this.config.arch);
+                await this.dockerHelper.pushImage(job.resource, this.config.arch);
             }
             const plural = jobs.length !== 1;
-            core_1.ux.log(`Your image${plural ? 's have' : ' has'} been successfully pushed. You can now release ${plural ? 'them' : 'it'} with the 'container:release' command.`);
+            ux.stdout(`Your image${plural ? 's have' : ' has'} been successfully pushed. You can now release ${plural ? 'them' : 'it'} with the 'container:release' command.`);
         }
         catch (error) {
-            core_1.ux.error(`docker push exited with ${error}`, { exit: 1 });
+            ux.error(`docker push exited with ${error}`, { exit: 1 });
         }
     }
+    async selectJobs(jobs, processTypes, recursive) {
+        let filteredJobs = {};
+        let selectedJobs = [];
+        if (Object.keys(jobs).length === 0) {
+            return selectedJobs;
+        }
+        if (recursive) {
+            if (processTypes.length > 0) {
+                filteredJobs = this.dockerHelper.filterByProcessType(jobs, processTypes);
+            }
+            else {
+                filteredJobs = jobs;
+            }
+            selectedJobs = await this.dockerHelper.chooseJobs(filteredJobs);
+        }
+        else if (jobs.standard) {
+            jobs.standard.forEach(pj => {
+                pj.resource = pj.resource.replace(/standard$/, processTypes[0]);
+            });
+            selectedJobs = jobs.standard || [];
+        }
+        return selectedJobs;
+    }
 }
-exports.default = Push;
-Push.topic = 'container';
-Push.description = 'builds, then pushes Docker images to deploy your Heroku app';
-Push.strict = false;
-Push.flags = {
-    app: command_1.flags.app({ required: true }),
-    verbose: command_1.flags.boolean({ char: 'v' }),
-    recursive: command_1.flags.boolean({ char: 'R', description: 'pushes Dockerfile.<process> found in current and subdirectories' }),
-    arg: command_1.flags.string({ description: 'set build-time variables' }),
-    'context-path': command_1.flags.string({ description: 'path to use as build context (defaults to Dockerfile dir)' }),
-    remote: command_1.flags.remote({ char: 'r' }),
-};
-Push.examples = [
-    '$ heroku container:push web                          # Pushes Dockerfile to web process type',
-    '$ heroku container:push worker                       # Pushes Dockerfile to worker process type',
-    '$ heroku container:push web worker --recursive       # Pushes Dockerfile.web and Dockerfile.worker',
-    '$ heroku container:push --recursive                  # Pushes Dockerfile.*',
-    '$ heroku container:push web --arg ENV=live,HTTPS=on  # Build-time variables',
-    '$ heroku container:push --recursive --context-path . # Pushes Dockerfile.* using current dir as build context',
-];

package/lib/commands/container/release.d.ts

@@ -6,9 +6,9 @@ export default class ContainerRelease extends Command {
     static example: string;
     static strict: boolean;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/container/release.js

@@ -1,12 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const color_1 = require("@heroku-cli/color");
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const debug_1 = require("../../lib/container/debug");
-const streamer_1 = require("../../lib/container/streamer");
-const helpers_1 = require("../../lib/container/helpers");
-class ContainerRelease extends command_1.Command {
+import { color } from '@heroku-cli/color';
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { debug } from '../../lib/container/debug.js';
+import { streamer } from '../../lib/container/streamer.js';
+import { ensureContainerStack } from '../../lib/container/helpers.js';
+export default class ContainerRelease extends Command {
+    static topic = 'container';
+    static description = 'Releases previously pushed Docker images to your Heroku app';
+    static usage = 'container:release';
+    static example = `
+  ${color.cmd('heroku container:release web')}        # Releases the previously pushed web process type
+  ${color.cmd('heroku container:release web worker')} # Releases the previously pushed web and worker process types`;
+    static strict = false;
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+        verbose: flags.boolean({ char: 'v' }),
+    };
     async run() {
         const { flags, argv } = await this.parse(ContainerRelease);
         const { app, verbose } = flags;
@@ -14,10 +24,10 @@ class ContainerRelease extends command_1.Command {
             this.error(`Error: Requires one or more process types\n ${ContainerRelease.example}`);
         }
         if (verbose) {
-            debug_1.debug.enabled = true;
+            debug.enabled = true;
         }
         const { body: appBody } = await this.heroku.get(`/apps/${app}`);
-        (0, helpers_1.ensureContainerStack)(appBody, 'release');
+        ensureContainerStack(appBody, 'release');
         const herokuHost = process.env.HEROKU_HOST || 'heroku.com';
         const updateData = [];
         for (const process of argv) {
@@ -33,13 +43,15 @@ class ContainerRelease extends command_1.Command {
             let imageID;
             let v1Comp;
             switch (imageResp.schemaVersion) {
-                case 1:
+                case 1: {
                     v1Comp = JSON.parse(imageResp.history[0].v1Compatibility);
                     imageID = v1Comp.id;
                     break;
-                case 2:
+                }
+                case 2: {
                     imageID = imageResp.config.digest;
                     break;
+                }
             }
             updateData.push({
                 type: process, docker_image: imageID,
@@ -49,13 +61,13 @@ class ContainerRelease extends command_1.Command {
             partial: true, headers: { Range: 'version ..; max=1, order=desc' },
         });
         const oldRelease = oldReleases[0];
-        core_1.ux.action.start(`Releasing images ${argv.join(',')} to ${app}`);
+        ux.action.start(`Releasing images ${argv.join(',')} to ${app}`);
         await this.heroku.patch(`/apps/${app}/formation`, {
             body: { updates: updateData }, headers: {
                 Accept: 'application/vnd.heroku+json; version=3.docker-releases',
             },
         });
-        core_1.ux.action.stop();
+        ux.action.stop();
         const { body: updatedReleases } = await this.heroku.get(`/apps/${app}/releases`, {
             partial: true, headers: { Range: 'version ..; max=1, order=desc' },
         });
@@ -64,28 +76,15 @@ class ContainerRelease extends command_1.Command {
             return;
         }
         if (release.status === 'failed') {
-            core_1.ux.error('Error: release command failed', { exit: 1 });
+            ux.error('Error: release command failed', { exit: 1 });
         }
         else if ((release.status === 'pending') && release.output_stream_url) {
-            core_1.ux.log('Running release command...');
-            await (0, streamer_1.streamer)(release.output_stream_url, process.stdout);
+            ux.stdout('Running release command...');
+            await streamer(release.output_stream_url, process.stdout);
             const { body: finishedRelease } = await this.heroku.request(`/apps/${app}/releases/${release.id}`);
             if (finishedRelease.status === 'failed') {
-                core_1.ux.error('Error: release command failed', { exit: 1 });
+                ux.error('Error: release command failed', { exit: 1 });
             }
         }
     }
 }
-exports.default = ContainerRelease;
-ContainerRelease.topic = 'container';
-ContainerRelease.description = 'Releases previously pushed Docker images to your Heroku app';
-ContainerRelease.usage = 'container:release';
-ContainerRelease.example = `
-  ${color_1.default.cmd('heroku container:release web')}        # Releases the previously pushed web process type
-  ${color_1.default.cmd('heroku container:release web worker')} # Releases the previously pushed web and worker process types`;
-ContainerRelease.strict = false;
-ContainerRelease.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-    verbose: command_1.flags.boolean({ char: 'v' }),
-};

package/lib/commands/container/rm.d.ts

@@ -6,8 +6,8 @@ export default class Rm extends Command {
     static example: string;
     static strict: boolean;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/container/rm.js

@@ -1,10 +1,19 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const color_1 = require("@heroku-cli/color");
-const helpers_1 = require("../../lib/container/helpers");
-class Rm extends command_1.Command {
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { color } from '@heroku-cli/color';
+import { ensureContainerStack } from '../../lib/container/helpers.js';
+export default class Rm extends Command {
+    static topic = 'container';
+    static description = 'remove the process type from your app';
+    static usage = 'container:rm -a APP [-v] PROCESS_TYPE...';
+    static example = `
+  ${color.cmd('heroku container:rm web')}        # Destroys the web container
+  ${color.cmd('heroku container:rm web worker')} # Destroys the web and worker containers`;
+    static strict = false;
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+    };
     async run() {
         const { argv, flags } = await this.parse(Rm);
         const { app } = flags;
@@ -12,28 +21,16 @@ class Rm extends command_1.Command {
             this.error(`Error: Requires one or more process types\n${Rm.example}`);
         }
         const { body: appBody } = await this.heroku.get(`/apps/${app}`);
-        (0, helpers_1.ensureContainerStack)(appBody, 'rm');
+        ensureContainerStack(appBody, 'rm');
         for (const process of argv) {
-            core_1.ux.action.start(`Removing container ${process} for ${color_1.default.app(app)}`);
+            ux.action.start(`Removing container ${process} for ${color.app(app)}`);
             await this.heroku.patch(`/apps/${app}/formation/${process}`, {
                 headers: {
                     Accept: 'application/vnd.heroku+json; version=3.docker-releases',
                 },
                 body: { docker_image: null },
             });
-            core_1.ux.action.stop();
+            ux.action.stop();
         }
     }
 }
-exports.default = Rm;
-Rm.topic = 'container';
-Rm.description = 'remove the process type from your app';
-Rm.usage = 'container:rm -a APP [-v] PROCESS_TYPE...';
-Rm.example = `
-  ${color_1.default.cmd('heroku container:rm web')}        # Destroys the web container
-  ${color_1.default.cmd('heroku container:rm web worker')} # Destroys the web and worker containers`;
-Rm.strict = false;
-Rm.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-};

package/lib/commands/container/run.d.ts

@@ -1,4 +1,5 @@
 import { Command } from '@heroku-cli/command';
+import { DockerHelper } from '../../lib/container/docker_helper.js';
 export default class Run extends Command {
     static topic: string;
     static description: string;
@@ -6,10 +7,11 @@ export default class Run extends Command {
     static example: string;
     static strict: boolean;
     static flags: {
-        app: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        remote: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        port: import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        app: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        remote: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        port: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
+        verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
+    dockerHelper: DockerHelper;
     run(): Promise<void>;
 }

package/lib/commands/container/run.js

@@ -1,13 +1,26 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const heroku_cli_util_1 = require("@heroku/heroku-cli-util");
-const DockerHelper = require("../../lib/container/docker_helper");
-const helpers_1 = require("../../lib/container/helpers");
-const debug_1 = require("../../lib/container/debug");
-const color_1 = require("@heroku-cli/color");
-class Run extends command_1.Command {
+import { Command, flags } from '@heroku-cli/command';
+import { ux } from '@oclif/core';
+import { hux } from '@heroku/heroku-cli-util';
+import { DockerHelper } from '../../lib/container/docker_helper.js';
+import { ensureContainerStack } from '../../lib/container/helpers.js';
+import { debug } from '../../lib/container/debug.js';
+import { color } from '@heroku-cli/color';
+export default class Run extends Command {
+    static topic = 'container';
+    static description = 'builds, then runs the docker image locally';
+    static usage = 'container:run -a APP [-v] PROCESS_TYPE...';
+    static example = `
+  ${color.cmd('$ heroku container:pull web')}        # Pulls the web image from the app
+  ${color.cmd('$ heroku container:pull web worker')} # Pulls both the web and worker images from the app
+  ${color.cmd('$ heroku container:pull web:latest')} # Pulls the latest tag from the web image`;
+    static strict = false;
+    static flags = {
+        app: flags.app({ required: true }),
+        remote: flags.remote(),
+        port: flags.integer({ char: 'p', description: 'port the app will run on', default: 5000 }),
+        verbose: flags.boolean({ char: 'v' }),
+    };
+    dockerHelper = new DockerHelper();
     async run() {
         const { argv, flags } = await this.parse(Run);
         const { verbose, app, port } = flags;
@@ -15,16 +28,16 @@ class Run extends command_1.Command {
             this.error(`Error: Requires one process type\n${Run.example}`);
         }
         if (verbose) {
-            debug_1.debug.enabled = true;
+            debug.enabled = true;
         }
         const { body: appBody } = await this.heroku.get(`/apps/${app}`);
-        (0, helpers_1.ensureContainerStack)(appBody, 'run');
+        ensureContainerStack(appBody, 'run');
         const processType = argv.shift();
         const command = argv.join(' ');
         const herokuHost = process.env.HEROKU_HOST || 'heroku.com';
         const registry = `registry.${herokuHost}`;
-        const dockerfiles = DockerHelper.getDockerfiles(process.cwd(), false);
-        const possibleJobs = DockerHelper.getJobs(`${registry}/${app}`, dockerfiles);
+        const dockerfiles = this.dockerHelper.getDockerfiles(process.cwd(), false);
+        const possibleJobs = this.dockerHelper.getJobs(`${registry}/${app}`, dockerfiles);
         let jobs = [];
         if (possibleJobs.standard) {
             possibleJobs.standard.forEach((pj) => {
@@ -33,35 +46,20 @@ class Run extends command_1.Command {
             jobs = possibleJobs.standard || [];
         }
         if (jobs.length === 0) {
-            core_1.ux.error('No images to run');
+            ux.error('No images to run');
         }
         const job = jobs[0];
         if (command.length === 0) {
-            heroku_cli_util_1.hux.styledHeader(`Running ${job.resource}`);
+            hux.styledHeader(`Running ${job.resource}`);
         }
         else {
-            heroku_cli_util_1.hux.styledHeader(`Running '${command}' on ${job.resource}`);
+            hux.styledHeader(`Running '${command}' on ${job.resource}`);
         }
         try {
-            await DockerHelper.runImage(job.resource, command, port);
+            await this.dockerHelper.runImage(job.resource, command, port);
         }
         catch (error) {
-            core_1.ux.error(`docker run exited with ${error}`);
+            ux.error(`docker run exited with ${error}`);
         }
     }
 }
-exports.default = Run;
-Run.topic = 'container';
-Run.description = 'builds, then runs the docker image locally';
-Run.usage = 'container:run -a APP [-v] PROCESS_TYPE...';
-Run.example = `
-  ${color_1.default.cmd('$ heroku container:pull web')}        # Pulls the web image from the app
-  ${color_1.default.cmd('$ heroku container:pull web worker')} # Pulls both the web and worker images from the app
-  ${color_1.default.cmd('$ heroku container:pull web:latest')} # Pulls the latest tag from the web image`;
-Run.strict = false;
-Run.flags = {
-    app: command_1.flags.app({ required: true }),
-    remote: command_1.flags.remote(),
-    port: command_1.flags.integer({ char: 'p', description: 'port the app will run on', default: 5000 }),
-    verbose: command_1.flags.boolean({ char: 'v' }),
-};