heroku 10.0.1-beta.1 → 10.0.2-beta.0

package/lib/commands/pipelines/diff.js

@@ -3,7 +3,7 @@ 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 http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const api_1 = require("../../lib/api");
 const kolkrabbi_api_1 = require("../../lib/pipelines/kolkrabbi-api");
 const PROMOTION_ORDER = ['development', 'staging', 'production'];
@@ -23,13 +23,15 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
     // Do the actual GitHub diff
     try {
         const path = `${targetApp.repo}/compare/${downstreamApp.hash}...${targetApp.hash}`;
-        const headers = { authorization: 'token ' + githubToken };
+        const headers = {
+            authorization: 'token ' + githubToken,
+            'Content-Type': 'application/vnd.github+json',
+            'X-GitHub-Api-Version': '2022-11-28',
+        };
         if (herokuUserAgent) {
-            headers['user-agent'] = herokuUserAgent;
+            Reflect.set(headers, 'user-agent', herokuUserAgent);
         }
-        const githubDiff = await http_call_1.default.get(`https://api.github.com/repos/${path}`, {
-            headers,
-        }).then(res => res.body);
+        const { body: githubDiff } = await http_call_1.default.get(`https://api.github.com/repos/${path}`, { headers });
         core_1.ux.log('');
         core_1.ux.styledHeader(`${color_1.default.app(targetApp.name)} is ahead of ${color_1.default.app(downstreamApp.name)} by ${githubDiff.ahead_by} commit${githubDiff.ahead_by === 1 ? '' : 's'}`);
         const mapped = githubDiff.commits.map((commit) => {
@@ -49,7 +51,6 @@ async function diff(targetApp, downstreamApp, githubToken, herokuUserAgent) {
             message: {},
         });
         core_1.ux.log(`\nhttps://github.com/${path}`);
-        // tslint:disable-next-line: no-unused
     }
     catch (_a) {
         core_1.ux.log(`\n${color_1.default.app(targetApp.name)} was not compared to ${color_1.default.app(downstreamApp.name)} because we were unable to perform a diff`);
@@ -99,15 +100,17 @@ class PipelinesDiff extends command_1.Command {
     async run() {
         const { flags } = await this.parse(PipelinesDiff);
         const targetAppName = flags.app;
-        const coupling = await (0, api_1.getCoupling)(this.heroku, targetAppName)
-            .then(res => res.body)
-            .catch(() => { });
-        if (!coupling) {
+        let coupling;
+        try {
+            ({ body: coupling } = await (0, api_1.getCoupling)(this.heroku, targetAppName));
+        }
+        catch (_a) {
             core_1.ux.error(`This app (${targetAppName}) does not seem to be a part of any pipeline`);
             return;
         }
+        const { body: pipeline } = await (0, api_1.getPipeline)(this.heroku, coupling.pipeline.id);
         const targetAppId = coupling.app.id;
-        const generation = coupling.generation;
+        const generation = pipeline.generation.name;
         core_1.ux.action.start('Fetching apps from pipeline');
         const allApps = await (0, api_1.listPipelineApps)(this.heroku, coupling.pipeline.id);
         core_1.ux.action.stop();

package/lib/commands/status.js

@@ -4,7 +4,7 @@ const color_1 = require("@heroku-cli/color");
 const core_1 = require("@oclif/core");
 const util_1 = require("@oclif/core/lib/util");
 const date_fns_1 = require("date-fns");
-const http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const util_2 = require("../lib/status/util");
 const printStatus = (status) => {
     const colorize = color_1.default[status];

package/lib/deps.d.ts

@@ -1,4 +1,4 @@
-import { HTTP } from 'http-call';
+import { HTTP } from '@heroku/http-call';
 import UserConfig from './user-config';
 import FS = require('fs-extra');
 import file = require('./file');

package/lib/deps.js

@@ -12,7 +12,7 @@ exports.default = {
         return fetch('fs-extra');
     },
     get HTTP() {
-        return fetch('http-call').HTTP;
+        return fetch('@heroku/http-call').HTTP;
     },
     get file() {
         return fetch('./file');

package/lib/lib/api.d.ts

@@ -1,6 +1,6 @@
 import { APIClient } from '@heroku-cli/command';
 import * as Heroku from '@heroku-cli/schema';
-import { App, PipelineCoupling, Release } from './types/fir';
+import { App, Pipeline, PipelineCoupling } from './types/fir';
 export declare const V3_HEADER = "application/vnd.heroku+json; version=3";
 export declare const SDK_HEADER = "application/vnd.heroku+json; version=3.sdk";
 export declare const FILTERS_HEADER: string;
@@ -14,24 +14,21 @@ export declare function createPipeline(heroku: APIClient, name: any, owner: any)
 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("@heroku/http-call").HTTP<PipelineCouplingSdk>>;
-export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<Heroku.Pipeline>>;
+export declare function getCoupling(heroku: APIClient, app: string): Promise<import("@heroku/http-call").HTTP<PipelineCoupling>>;
+export declare function getPipeline(heroku: APIClient, id: string): Promise<import("@heroku/http-call").HTTP<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;
+    pipelineCoupling: PipelineCoupling;
     [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("@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 getReleases(heroku: APIClient, appId: string): Promise<import("@heroku/http-call").HTTP<Heroku.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>>;

package/lib/lib/apps/generation.js

@@ -14,11 +14,11 @@ async function getApp(appOrName, herokuApi) {
 }
 async function isFirApp(appOrName, herokuApi) {
     const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'fir';
+    return app.generation.name === 'fir';
 }
 exports.isFirApp = isFirApp;
 async function isCedarApp(appOrName, herokuApi) {
     const app = await getApp(appOrName, herokuApi);
-    return app.generation === 'cedar';
+    return app.generation.name === 'cedar';
 }
 exports.isCedarApp = isCedarApp;

package/lib/lib/container/streamer.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.streamer = void 0;
 async function call(url, out, retries) {
-    const http = require('http-call').HTTP;
+    const http = require('@heroku/http-call').HTTP;
     const maxRetries = 30;
     try {
         const { response } = await http.stream(url);

package/lib/lib/pipelines/github-api.d.ts

@@ -1,4 +1,4 @@
-import HTTP from 'http-call';
+import HTTP from '@heroku/http-call';
 export default class GitHubAPI {
     version: any;
     token: any;

package/lib/lib/pipelines/github-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const GITHUB_API = 'https://api.github.com';
 class GitHubAPI {
     constructor(version, token) {

package/lib/lib/pipelines/kolkrabbi-api.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const http_call_1 = require("http-call");
+const http_call_1 = require("@heroku/http-call");
 const KOLKRABBI_BASE_URL = 'https://kolkrabbi.heroku.com';
 class default_1 {
     constructor(version, getToken) {

package/lib/lib/run/dyno.d.ts

@@ -5,7 +5,7 @@
 import { APIClient } from '@heroku-cli/command';
 import { IOptions } from '@heroku-cli/command/lib/api-client';
 import { Dyno as APIDyno } from '@heroku-cli/schema';
-import { HTTP } from 'http-call';
+import { HTTP } from '@heroku/http-call';
 import * as net from 'net';
 import { Duplex } from 'stream';
 import * as tls from 'tls';

package/oclif.manifest.json

@@ -14451,5 +14451,5 @@
       ]
     }
   },
-  "version": "10.0.1-beta.1"
+  "version": "10.0.2-beta.0"
 }

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.0.1-beta.1",
+  "version": "10.0.2-beta.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
   "dependencies": {
     "@heroku-cli/color": "2.0.1",
-    "@heroku-cli/command": "11.4.0-beta.1",
+    "@heroku-cli/command": "^11.4.0",
     "@heroku-cli/notifications": "^1.2.4",
-    "@heroku-cli/plugin-ps-exec": "2.6.0",
+    "@heroku-cli/plugin-ps-exec": "2.6.1",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
     "@heroku/heroku-cli-util": "^8.0.13",
-    "@heroku/http-call": "5.4.0-beta.1",
+    "@heroku/http-call": "^5.4.0",
     "@inquirer/prompts": "^5.0.5",
     "@oclif/core": "^2.16.0",
     "@oclif/plugin-commands": "2.2.28",
@@ -390,5 +390,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "c2a05b98dbb7dcd520197c1aa839b677f31aea02"
+  "gitHead": "507ecf9015f04a1ca0472abf6acf82d9fca76d24"
 }