heroku 9.2.0-beta.1 → 9.2.1-beta.0

package/lib/commands/container/push.js

@@ -60,7 +60,13 @@ class Push extends command_1.Command {
                 else {
                     core_1.ux.styledHeader(`Building ${job.name} (${job.dockerfile})`);
                 }
-                await DockerHelper.buildImage(job.dockerfile, job.resource, buildArgs, contextPath);
+                await DockerHelper.buildImage({
+                    dockerfile: job.dockerfile,
+                    resource: job.resource,
+                    buildArgs,
+                    path: contextPath,
+                    arch: this.config.arch,
+                });
             }
         }
         catch (error) {

package/lib/commands/local/run.js

@@ -4,14 +4,14 @@ const completions_1 = require("@heroku-cli/command/lib/completions");
 const core_1 = require("@oclif/core");
 const color_1 = require("@heroku-cli/color");
 const fork_foreman_1 = require("../../lib/local/fork-foreman");
-const helpers_1 = require("../../lib/run/helpers");
 const fs = require("fs");
 class Run extends core_1.Command {
     async run() {
         const execArgv = ['run'];
         const { argv, flags } = await this.parse(Run);
-        const userArgvInputOrder = (0, helpers_1.revertSortedArgs)(process.argv, argv);
-        if (userArgvInputOrder.length === 0) {
+        const maybeOptionsIndex = process.argv.indexOf('--');
+        const commandArgs = (maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1));
+        if (commandArgs.length === 0) {
             const errorMessage = 'Usage: heroku local:run [COMMAND]\nMust specify command to run';
             this.error(errorMessage, { exit: -1 });
         }
@@ -24,7 +24,7 @@ class Run extends core_1.Command {
         if (flags.port)
             execArgv.push('--port', flags.port);
         execArgv.push('--'); // disable node-foreman flag parsing
-        execArgv.push(...userArgvInputOrder); // eslint-disable-line unicorn/no-array-push-push
+        execArgv.push(...commandArgs); // eslint-disable-line unicorn/no-array-push-push
         await (0, fork_foreman_1.fork)(execArgv);
     }
 }

package/lib/commands/pg/promote.js

@@ -17,36 +17,36 @@ class Promote extends command_1.Command {
         core_1.ux.action.start(`Ensuring an alternate alias for existing ${color_1.default.green('DATABASE_URL')}`);
         const { body: attachments } = await this.heroku.get(`/apps/${app}/addon-attachments`);
         const current = attachments.find(a => a.name === 'DATABASE');
-        if (!current)
-            return;
-        // eslint-disable-next-line eqeqeq
-        if (((_a = current.addon) === null || _a === void 0 ? void 0 : _a.name) === attachment.addon.name && current.namespace == attachment.namespace) {
-            if (attachment.namespace) {
-                core_1.ux.error(`${color_1.default.cyan(attachment.name)} is already promoted on ${color_1.default.app(app)}`);
+        if (current) {
+            // eslint-disable-next-line eqeqeq
+            if (((_a = current.addon) === null || _a === void 0 ? void 0 : _a.name) === attachment.addon.name && current.namespace == attachment.namespace) {
+                if (attachment.namespace) {
+                    core_1.ux.error(`${color_1.default.cyan(attachment.name)} is already promoted on ${color_1.default.app(app)}`);
+                }
+                else {
+                    core_1.ux.error(`${color_1.default.addon(attachment.addon.name)} is already promoted on ${color_1.default.app(app)}`);
+                }
+            }
+            const existing = attachments.filter(a => { var _a, _b; return ((_a = a.addon) === null || _a === void 0 ? void 0 : _a.id) === ((_b = current.addon) === null || _b === void 0 ? void 0 : _b.id) && a.namespace === current.namespace; })
+                .find(a => a.name !== 'DATABASE');
+            if (existing) {
+                core_1.ux.action.stop(color_1.default.green(existing.name + '_URL'));
             }
             else {
-                core_1.ux.error(`${color_1.default.addon(attachment.addon.name)} is already promoted on ${color_1.default.app(app)}`);
+                // The current add-on occupying the DATABASE attachment has no
+                // other attachments. In order to promote this database without
+                // error, we can create a secondary attachment, just-in-time.
+                const { body: backup } = await this.heroku.post('/addon-attachments', {
+                    body: {
+                        app: { name: app },
+                        addon: { name: (_b = current.addon) === null || _b === void 0 ? void 0 : _b.name },
+                        namespace: current.namespace,
+                        confirm: app,
+                    },
+                });
+                core_1.ux.action.stop(color_1.default.green(backup.name + '_URL'));
             }
         }
-        const existing = attachments.filter(a => { var _a, _b; return ((_a = a.addon) === null || _a === void 0 ? void 0 : _a.id) === ((_b = current.addon) === null || _b === void 0 ? void 0 : _b.id) && a.namespace === current.namespace; })
-            .find(a => a.name !== 'DATABASE');
-        if (existing) {
-            core_1.ux.action.stop(color_1.default.green(existing.name + '_URL'));
-        }
-        else {
-            // The current add-on occupying the DATABASE attachment has no
-            // other attachments. In order to promote this database without
-            // error, we can create a secondary attachment, just-in-time.
-            const { body: backup } = await this.heroku.post('/addon-attachments', {
-                body: {
-                    app: { name: app },
-                    addon: { name: (_b = current.addon) === null || _b === void 0 ? void 0 : _b.name },
-                    namespace: current.namespace,
-                    confirm: app,
-                },
-            });
-            core_1.ux.action.stop(color_1.default.green(backup.name + '_URL'));
-        }
         if (!force) {
             const { body: status } = await this.heroku.get(`/client/v11/databases/${attachment.addon.id}/wait_status`, {
                 hostname: (0, host_1.default)(),
@@ -54,9 +54,9 @@ class Promote extends command_1.Command {
             if (status['waiting?']) {
                 core_1.ux.error((0, tsheredoc_1.default)(`
           Database cannot be promoted while in state: ${status.message}
-          
+
           Promoting this database can lead to application errors and outage. Please run ${color_1.default.cmd('heroku pg:wait')} to wait for database to become available.
-          
+
           To ignore this error, you can pass the --force flag to promote the database and risk application issues.
         `));
             }
@@ -79,7 +79,7 @@ class Promote extends command_1.Command {
             },
         });
         core_1.ux.action.stop();
-        const currentPooler = attachments.find(a => { var _a, _b; return a.namespace === 'connection-pooling:default' && ((_a = a.addon) === null || _a === void 0 ? void 0 : _a.id) === ((_b = current.addon) === null || _b === void 0 ? void 0 : _b.id) && a.name === 'DATABASE_CONNECTION_POOL'; });
+        const currentPooler = attachments.find(a => { var _a, _b; return a.namespace === 'connection-pooling:default' && ((_a = a.addon) === null || _a === void 0 ? void 0 : _a.id) === ((_b = current === null || current === void 0 ? void 0 : current.addon) === null || _b === void 0 ? void 0 : _b.id) && a.name === 'DATABASE_CONNECTION_POOL'; });
         if (currentPooler) {
             core_1.ux.action.start('Reattaching pooler to new leader');
             await this.heroku.post('/addon-attachments', {
@@ -100,9 +100,9 @@ class Promote extends command_1.Command {
             const unfollowLeaderCmd = `heroku pg:unfollow ${attachment.addon.name}`;
             core_1.ux.warn((0, tsheredoc_1.default)(`
         Your database has been promoted but it is currently a follower database in read-only mode.
-        
+
         Promoting a database with ${color_1.default.cmd('heroku pg:promote')} doesn't automatically unfollow its leader.
-        
+
         Use ${color_1.default.cmd(unfollowLeaderCmd)} to stop this follower from replicating from its leader (${color_1.default.yellow(promotedDatabaseDetails.leader)}) and convert it into a writable database.
       `));
         }
@@ -141,7 +141,7 @@ class Promote extends command_1.Command {
                         msg += 'without an attached DATABASE_URL.';
                     }
                     else {
-                        msg += `with ${(_c = current.addon) === null || _c === void 0 ? void 0 : _c.name} attached as DATABASE_URL.`;
+                        msg += `with ${(_c = current === null || current === void 0 ? void 0 : current.addon) === null || _c === void 0 ? void 0 : _c.name} attached as DATABASE_URL.`;
                     }
                     msg += ' Check your release phase logs for failure causes.';
                     core_1.ux.action.stop(msg);

package/lib/commands/run/index.js

@@ -10,13 +10,14 @@ const debug = (0, debug_1.default)('heroku:run');
 class Run extends command_1.Command {
     async run() {
         const { argv, flags } = await this.parse(Run);
-        const userArgvInputOrder = (0, helpers_1.revertSortedArgs)(process.argv, argv);
+        const maybeOptionsIndex = process.argv.indexOf('--');
+        const command = (0, helpers_1.buildCommand)((maybeOptionsIndex === -1 ? argv : process.argv.slice(maybeOptionsIndex + 1)));
         const opts = {
             'exit-code': flags['exit-code'],
             'no-tty': flags['no-tty'],
             app: flags.app,
             attach: true,
-            command: (0, helpers_1.buildCommand)(userArgvInputOrder),
+            command,
             env: flags.env,
             heroku: this.heroku,
             listen: flags.listen,

package/lib/lib/container/docker_helper.d.ts

@@ -19,6 +19,14 @@ export declare type groupedDockerJobs = {
 export declare const getJobs: (resourceRoot: string, dockerfiles: string[]) => groupedDockerJobs;
 export declare const filterByProcessType: (jobs: groupedDockerJobs, processTypes: string[]) => groupedDockerJobs;
 export declare const chooseJobs: (jobs: groupedDockerJobs) => Promise<dockerJob[]>;
-export declare const buildImage: (dockerfile: string, resource: string, buildArgs: string[], path?: string) => Promise<string>;
+declare type BuildImageParams = {
+    dockerfile: string;
+    resource: string;
+    buildArgs: string[];
+    path?: string;
+    arch?: string;
+};
+export declare const buildImage: ({ dockerfile, resource, buildArgs, path, arch }: BuildImageParams) => Promise<string>;
 export declare const pushImage: (resource: string) => Promise<string>;
 export declare const runImage: (resource: string, command: string, port: number) => Promise<string>;
+export {};

package/lib/lib/container/docker_helper.js

@@ -7,6 +7,7 @@ const glob = require("glob");
 const Path = require("path");
 const inquirer = require("inquirer");
 const os = require("os");
+const core_1 = require("@oclif/core");
 const DOCKERFILE_REGEX = /\bDockerfile(.\w*)?$/;
 const cmd = async function (cmd, args, options = {}) {
     (0, debug_1.debug)(cmd, args);
@@ -114,6 +115,10 @@ const chooseJobs = async function (jobs) {
     for (const processType in jobs) {
         if (Object.prototype.hasOwnProperty.call(jobs, processType)) {
             const group = jobs[processType];
+            if (group === undefined) {
+                core_1.ux.warn(`Dockerfile.${processType} not found`);
+                continue;
+            }
             if (group.length > 1) {
                 const prompt = [{
                         type: 'list',
@@ -135,9 +140,13 @@ const chooseJobs = async function (jobs) {
     return chosenJobs;
 };
 exports.chooseJobs = chooseJobs;
-const buildImage = async function (dockerfile, resource, buildArgs, path) {
+const buildImage = async function ({ dockerfile, resource, buildArgs, path, arch }) {
     const cwd = path || Path.dirname(dockerfile);
-    const args = ['build', '-f', dockerfile, '-t', resource, '--platform', 'linux/amd64'];
+    const args = ['build', '-f', dockerfile, '-t', resource];
+    // Older Docker versions don't allow for this flag, but we are
+    // adding it here when necessary to allow for pushing a docker build from m1/m2 Macs.
+    if (arch === 'arm64')
+        args.push('--platform', 'linux/amd64');
     for (const element of buildArgs) {
         if (element.length > 0) {
             args.push('--build-arg', element);

package/lib/lib/run/helpers.d.ts

@@ -1,3 +1,2 @@
-export declare function revertSortedArgs(processArgs: Array<string>, argv: Array<string>): string[];
 export declare function buildCommand(args: Array<string>): string;
 export declare function buildEnvFromFlag(flag: string): {};

package/lib/lib/run/helpers.js

@@ -1,20 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildEnvFromFlag = exports.buildCommand = exports.revertSortedArgs = void 0;
+exports.buildEnvFromFlag = exports.buildCommand = void 0;
 /* eslint-disable @typescript-eslint/ban-ts-comment */
 const core_1 = require("@oclif/core");
-// this function exists because oclif sorts argv
-function revertSortedArgs(processArgs, argv) {
-    const originalInputOrder = [];
-    // this reorders the arguments in the order the user inputted
-    for (const processArg of processArgs) {
-        if (argv.includes(processArg)) {
-            originalInputOrder.push(processArg);
-        }
-    }
-    return originalInputOrder;
-}
-exports.revertSortedArgs = revertSortedArgs;
 function buildCommand(args) {
     if (args.length === 1) {
         // do not add quotes around arguments if there is only one argument