heroku 10.0.0-beta.4 → 10.0.1-beta.0

package/lib/commands/addons/open.js

@@ -7,7 +7,7 @@ const resolve_1 = require("../../lib/addons/resolve");
 const fs = require("node:fs/promises");
 const os = require("node:os");
 const path = require("node:path");
-const http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const open = require("open");
 class Open extends command_1.Command {
     constructor() {

package/lib/commands/apps/destroy.js

@@ -3,11 +3,11 @@ 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 lodash_1 = require("lodash");
 const confirmCommand_1 = require("../../lib/confirmCommand");
 const git = require("../../lib/ci/git");
 class Destroy extends command_1.Command {
     async run() {
+        var _a, _b;
         const { flags, args } = await this.parse(Destroy);
         const app = args.app || flags.app;
         if (!app)
@@ -17,18 +17,18 @@ class Destroy extends command_1.Command {
         await (0, confirmCommand_1.default)(app, flags.confirm, `WARNING: This will delete ${color_1.default.app(app)} including all add-ons.`);
         core_1.ux.action.start(`Destroying ${color_1.default.app(app)} (including all add-ons)`);
         await this.heroku.delete(`/apps/${app}`);
+        /**
+         * It is possible to have as many git remotes as
+         * you want, and they can all point to the same url.
+         * The only requirement is that the "name" is unique.
+         */
         if (git.inGitRepo()) {
             // delete git remotes pointing to this app
-            await git.listRemotes()
-                .then(remotes => {
-                const transformed = remotes
-                    .filter(r => git.gitUrl(app) === r[1] || git.sshGitUrl(app) === r[1])
-                    .map(r => r[0]);
-                const uniqueRemotes = (0, lodash_1.uniq)(transformed);
-                uniqueRemotes.forEach(element => {
-                    git.rmRemote(element);
-                });
-            });
+            const remotes = await git.listRemotes();
+            await Promise.all([
+                (_a = remotes.get(git.gitUrl(app))) === null || _a === void 0 ? void 0 : _a.map(({ name }) => git.rmRemote(name)),
+                (_b = remotes.get(git.sshGitUrl(app))) === null || _b === void 0 ? void 0 : _b.map(({ name }) => git.rmRemote(name)),
+            ]);
         }
         core_1.ux.action.stop();
     }

package/lib/commands/apps/rename.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const command_1 = require("@heroku-cli/command");
-const _ = require("lodash");
 const git = require("../../lib/ci/git");
 const color_1 = require("@heroku-cli/color");
 class AppsRename extends command_1.Command {
@@ -20,16 +19,28 @@ class AppsRename extends command_1.Command {
             core_1.ux.log('Please note that it may take a few minutes for Heroku to provision a SSL certificate for your application.');
         }
         if (git.inGitRepo()) {
-            // delete git remotes pointing to this app
-            await _(await git.listRemotes())
-                .filter(r => git.gitUrl(oldApp) === r[1] || git.sshGitUrl(oldApp) === r[1])
-                .map(r => r[0])
-                .uniq()
-                .map(r => {
-                return git.rmRemote(r)
-                    .then(() => git.createRemote(r, gitUrl))
-                    .then(() => core_1.ux.log(`Git remote ${r} updated`));
-            }).value();
+            /**
+             * It is possible to have as many git remotes as
+             * you want, and they can all point to the same url.
+             * The only requirement is that the "name" is unique.
+             */
+            const remotes = await git.listRemotes();
+            const httpsUrl = git.gitUrl(oldApp);
+            const sshUrl = git.sshGitUrl(oldApp);
+            const targetRemotesBySSHUrl = remotes.get(sshUrl);
+            const targetRemotesByHttpsUrl = remotes.get(httpsUrl);
+            const doRename = async (remotes, url) => {
+                for (const remote of remotes !== null && remotes !== void 0 ? remotes : []) {
+                    const { name } = remote;
+                    await git.rmRemote(name);
+                    await git.createRemote(name, url.replace(oldApp, newApp));
+                    core_1.ux.log(`Git remote ${name} updated`);
+                }
+            };
+            await Promise.all([
+                doRename(targetRemotesByHttpsUrl, httpsUrl),
+                doRename(targetRemotesBySSHUrl, sshUrl),
+            ]);
         }
         core_1.ux.warn("Don't forget to update git remotes for all other local checkouts of the app.");
     }

package/lib/lib/addons/resolve.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AmbiguousError = exports.NotFound = exports.resolveAddon = exports.attachmentResolver = exports.appAttachment = exports.addonResolver = exports.appAddon = void 0;
-const http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const api_client_1 = require("@heroku-cli/command/lib/api-client");
 const addonHeaders = {
     Accept: 'application/vnd.heroku+json; version=3.actions',

package/lib/lib/api.d.ts

@@ -7,33 +7,33 @@ export declare const FILTERS_HEADER: string;
 export declare const PIPELINES_HEADER: string;
 export declare function createAppSetup(heroku: APIClient, body: {
     body: any;
-}): Promise<import("http-call").HTTP<Heroku.AppSetup>>;
-export declare function postCoupling(heroku: APIClient, pipeline: any, app: any, stage: string): Promise<import("http-call").HTTP<unknown>>;
-export declare function createCoupling(heroku: APIClient, pipeline: any, app: string, stage: string): Promise<import("http-call").HTTP<unknown>>;
-export declare function createPipeline(heroku: APIClient, name: any, owner: any): Promise<import("http-call").HTTP<Heroku.Pipeline>>;
-export declare function createPipelineTransfer(heroku: APIClient, pipeline: Heroku.Pipeline): Promise<import("http-call").HTTP<unknown>>;
-export declare function destroyPipeline(heroku: APIClient, name: any, pipelineId: any): Promise<import("http-call").HTTP<unknown>>;
-export declare function findPipelineByName(heroku: APIClient, idOrName: string): Promise<import("http-call").HTTP<Heroku.Pipeline[]>>;
+}): Promise<import("@heroku/http-call").HTTP<Heroku.AppSetup>>;
+export declare function postCoupling(heroku: APIClient, pipeline: any, app: any, stage: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
+export declare function createCoupling(heroku: APIClient, pipeline: any, app: string, stage: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
+export declare function createPipeline(heroku: APIClient, name: any, owner: any): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function createPipelineTransfer(heroku: APIClient, pipeline: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<unknown>>;
+export declare function destroyPipeline(heroku: APIClient, name: any, pipelineId: any): Promise<import("@heroku/http-call").HTTP<unknown>>;
+export declare function findPipelineByName(heroku: APIClient, idOrName: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline[]>>;
 export interface PipelineCouplingSdk extends Required<PipelineCoupling> {
     generation: 'fir' | 'cedar';
 }
-export declare function getCoupling(heroku: APIClient, app: string): Promise<import("http-call").HTTP<PipelineCouplingSdk>>;
-export declare function getPipeline(heroku: APIClient, id: string): Promise<import("http-call").HTTP<Heroku.Pipeline>>;
-export declare function updatePipeline(heroku: APIClient, id: string, body: Heroku.Pipeline): Promise<import("http-call").HTTP<Heroku.Pipeline>>;
-export declare function getTeam(heroku: APIClient, teamId: any): Promise<import("http-call").HTTP<Heroku.Team>>;
-export declare function getAccountInfo(heroku: APIClient, id?: string): Promise<import("http-call").HTTP<Heroku.Account>>;
-export declare function getAppSetup(heroku: APIClient, buildId: any): Promise<import("http-call").HTTP<Heroku.AppSetup>>;
+export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCouplingSdk>>;
+export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function updatePipeline(heroku: APIClient, id: string, body: Heroku.Pipeline): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function getTeam(heroku: APIClient, teamId: any): Promise<import("@heroku/http-call").HTTP<Heroku.Team>>;
+export declare function getAccountInfo(heroku: APIClient, id?: string): Promise<import("@heroku/http-call").HTTP<Heroku.Account>>;
+export declare function getAppSetup(heroku: APIClient, buildId: any): Promise<import("@heroku/http-call").HTTP<Heroku.AppSetup>>;
 export interface AppWithPipelineCoupling extends App {
     pipelineCoupling: PipelineCouplingSdk;
     [k: string]: unknown;
 }
 export declare function listPipelineApps(heroku: APIClient, pipelineId: string): Promise<Array<AppWithPipelineCoupling>>;
-export declare function patchCoupling(heroku: APIClient, id: string, stage: string): Promise<import("http-call").HTTP<Heroku.PipelineCoupling>>;
-export declare function removeCoupling(heroku: APIClient, app: string): Promise<import("http-call").HTTP<unknown>>;
-export declare function updateCoupling(heroku: APIClient, app: string, stage: string): Promise<import("http-call").HTTP<Heroku.PipelineCoupling>>;
-export declare function getReleases(heroku: APIClient, appId: string): Promise<import("http-call").HTTP<Release[]>>;
-export declare function getPipelineConfigVars(heroku: APIClient, pipelineID: string): Promise<import("http-call").HTTP<Heroku.ConfigVars>>;
-export declare function setPipelineConfigVars(heroku: APIClient, pipelineID: string, body: Heroku.ConfigVars | Record<string, null>): Promise<import("http-call").HTTP<Heroku.ConfigVars>>;
-export declare function createTestRun(heroku: APIClient, body: Heroku.TestRun): Promise<import("http-call").HTTP<Heroku.TestRun>>;
-export declare function getTestNodes(heroku: APIClient, testRunIdD: string): Promise<import("http-call").HTTP<Heroku.TestRun>>;
-export declare function updateTestRun(heroku: APIClient, id: string, body: Heroku.TestRun): Promise<import("http-call").HTTP<Heroku.TestRun>>;
+export declare function patchCoupling(heroku: APIClient, id: string, stage: string): Promise<import("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
+export declare function removeCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<unknown>>;
+export declare function updateCoupling(heroku: APIClient, app: string, stage: string): Promise<import("@heroku/http-call").HTTP<Heroku.PipelineCoupling>>;
+export declare function getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Release[]>>;
+export declare function getPipelineConfigVars(heroku: APIClient, pipelineID: string): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
+export declare function setPipelineConfigVars(heroku: APIClient, pipelineID: string, body: Heroku.ConfigVars | Record<string, null>): Promise<import("@heroku/http-call").HTTP<Heroku.ConfigVars>>;
+export declare function createTestRun(heroku: APIClient, body: Heroku.TestRun): Promise<import("@heroku/http-call").HTTP<Heroku.TestRun>>;
+export declare function getTestNodes(heroku: APIClient, testRunIdD: string): Promise<import("@heroku/http-call").HTTP<Heroku.TestRun>>;
+export declare function updateTestRun(heroku: APIClient, id: string, body: Heroku.TestRun): Promise<import("@heroku/http-call").HTTP<Heroku.TestRun>>;

package/lib/lib/ci/git.d.ts

@@ -7,8 +7,19 @@ declare function readCommit(commit: string): Promise<{
 }>;
 declare function sshGitUrl(app: string): string;
 declare function gitUrl(app?: string): string;
-declare function listRemotes(): Promise<string[][]>;
+/**
+ * Lists remotes by their url and returns an
+ * array of objects containing the name and kind
+ *
+ * @return A map of remotes whose key is the url
+ * and value is an array of objects containing
+ * the 'name' (heroku, heroku-dev, etc.) and 'kind' (fetch, push, etc.)
+ */
+declare function listRemotes(): Promise<Map<string, {
+    name: string;
+    kind: string;
+}[]>>;
 declare function inGitRepo(): true | undefined;
-declare function rmRemote(remote: string): Promise<string>;
+declare function rmRemote(remote: string): Promise<void>;
 declare function createRemote(remote: string, url: string): Promise<string | null>;
 export { createArchive, githubRepository, readCommit, sshGitUrl, gitUrl, createRemote, listRemotes, rmRemote, inGitRepo, };

package/lib/lib/ci/git.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inGitRepo = exports.rmRemote = exports.listRemotes = exports.createRemote = exports.gitUrl = exports.sshGitUrl = exports.readCommit = exports.githubRepository = exports.createArchive = void 0;
+const tslib_1 = require("tslib");
 const fs = require("fs-extra");
 const command_1 = require("@heroku-cli/command");
 const gh = require('github-url-to-object');
@@ -15,6 +16,8 @@ function runGit(...args) {
     return new Promise((resolve, reject) => {
         git.on('exit', (exitCode) => {
             if (exitCode === 0) {
+                // not all git commands write data to stdout
+                resolve(exitCode.toString(10));
                 return;
             }
             const error = (git.stderr.read() || 'unknown error').toString().trim();
@@ -78,8 +81,27 @@ function gitUrl(app) {
     return `https://${command_1.vars.httpGitHost}/${app}.git`;
 }
 exports.gitUrl = gitUrl;
+/**
+ * Lists remotes by their url and returns an
+ * array of objects containing the name and kind
+ *
+ * @return A map of remotes whose key is the url
+ * and value is an array of objects containing
+ * the 'name' (heroku, heroku-dev, etc.) and 'kind' (fetch, push, etc.)
+ */
 async function listRemotes() {
-    return runGit('remote', '-v').then(remotes => remotes.trim().split('\n').map(r => r.split(/\s/)));
+    const gitRemotes = await runGit('remote', '-v');
+    const lines = gitRemotes.trim().split('\n');
+    const remotes = lines.map(line => line.trim().split(/\s+/)).map(([name, url, kind]) => ({ name, url, kind }));
+    const remotesByUrl = new Map();
+    remotes.forEach(remote => {
+        var _a;
+        const { url } = remote, nameAndKind = tslib_1.__rest(remote, ["url"]);
+        const entry = (_a = remotesByUrl.get(url)) !== null && _a !== void 0 ? _a : [];
+        entry.push(nameAndKind);
+        remotesByUrl.set(url, entry);
+    });
+    return remotesByUrl;
 }
 exports.listRemotes = listRemotes;
 function inGitRepo() {
@@ -93,22 +115,19 @@ function inGitRepo() {
     }
 }
 exports.inGitRepo = inGitRepo;
-function rmRemote(remote) {
-    return runGit('remote', 'rm', remote);
+async function rmRemote(remote) {
+    await runGit('remote', 'rm', remote);
 }
 exports.rmRemote = rmRemote;
-function hasGitRemote(remote) {
-    return runGit('remote')
-        .then(remotes => remotes.split('\n'))
-        .then(remotes => remotes.find(r => r === remote));
+async function hasGitRemote(remote) {
+    const remotes = await runGit('remote');
+    return remotes.split('\n').find(r => r === remote);
 }
-function createRemote(remote, url) {
-    return hasGitRemote(remote)
-        .then(exists => {
-        if (!exists) {
-            return runGit('remote', 'add', remote, url);
-        }
-        return null;
-    });
+async function createRemote(remote, url) {
+    const exists = await hasGitRemote(remote);
+    if (!exists) {
+        return runGit('remote', 'add', remote, url);
+    }
+    return null;
 }
 exports.createRemote = createRemote;

package/lib/lib/pg/bastion.d.ts

@@ -23,7 +23,7 @@ export declare function getConfigs(db: ConnectionDetails): {
 export declare function sshTunnel(db: ConnectionDetails, dbTunnelConfig: TunnelConfig, timeout?: number): Promise<void | import("net").Server | null>;
 export declare function fetchConfig(heroku: APIClient, db: {
     id: string;
-}): Promise<import("http-call").HTTP<{
+}): Promise<import("@heroku/http-call").HTTP<{
     host: string;
     private_key: string;
 }>>;

package/lib/lib/pipelines/setup/create-apps.d.ts

@@ -1,2 +1,2 @@
 import * as Heroku from '@heroku-cli/schema';
-export default function createApps(heroku: any, archiveURL: any, pipeline: any, pipelineName: any, stagingAppName: any, organization: any): Promise<void | import("http-call").HTTP<Heroku.AppSetup>[]>;
+export default function createApps(heroku: any, archiveURL: any, pipeline: any, pipelineName: any, stagingAppName: any, organization: any): Promise<void | import("@heroku/http-call").HTTP<Heroku.AppSetup>[]>;

package/lib/lib/redis/api.d.ts

@@ -57,7 +57,7 @@ export declare type RedisFormationWaitResponse = {
 };
 declare type HttpVerb = 'GET' | 'POST' | 'PATCH' | 'DELETE' | 'PUT';
 declare const _default: (app: string, database: string | undefined, json: boolean, heroku: APIClient) => {
-    request<T>(path: string, method?: HttpVerb, body?: {}): Promise<import("http-call").HTTP<T>>;
+    request<T>(path: string, method?: HttpVerb, body?: {}): Promise<import("@heroku/http-call").HTTP<T>>;
     makeAddonsFilter(filter: string | undefined): (addons: Required<Heroku.AddOn>[]) => Required<Heroku.AddOn>[];
     getRedisAddon(addons?: Required<Heroku.AddOn>[]): Promise<Required<Heroku.AddOn>>;
     info(): Promise<void>;