heroku 9.0.0 → 9.1.0-beta.0

package/lib/commands/domains/index.d.ts

@@ -36,5 +36,9 @@ export default class DomainsIndex extends Command {
             extended: boolean;
         };
     };
+    getFilteredDomains: (filterKeyValue: string, domains: Array<Heroku.Domain>) => {
+        size: number;
+        filteredDomains: Heroku.Domain[];
+    };
     run(): Promise<void>;
 }

package/lib/commands/domains/index.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@heroku-cli/command");
+const color_1 = require("@heroku-cli/color");
 const core_1 = require("@oclif/core");
 const Uri = require("urijs");
+const prompts_1 = require("@inquirer/prompts");
+const paginator_1 = require("../../lib/utils/paginator");
+const keyValueParser_1 = require("../../lib/utils/keyValueParser");
 function isApexDomain(hostname) {
     if (hostname.includes('*'))
         return false;
@@ -44,12 +48,44 @@ class DomainsIndex extends command_1.Command {
             }
             return tableConfig;
         };
+        this.getFilteredDomains = (filterKeyValue, domains) => {
+            const filteredInfo = { size: 0, filteredDomains: domains };
+            const { key: filterName, value } = (0, keyValueParser_1.default)(filterKeyValue);
+            if (!value) {
+                throw new Error('Filter flag has an invalid value');
+            }
+            if (filterName === 'Domain Name') {
+                filteredInfo.filteredDomains = domains.filter(domain => domain.hostname.includes(value));
+            }
+            if (filterName === 'DNS Record Type') {
+                filteredInfo.filteredDomains = domains.filter(domain => {
+                    const kind = isApexDomain(domain.hostname) ? 'ALIAS or ANAME' : 'CNAME';
+                    return kind.includes(value);
+                });
+            }
+            if (filterName === 'DNS Target') {
+                filteredInfo.filteredDomains = domains.filter(domain => domain.cname.includes(value));
+            }
+            if (filterName === 'SNI Endpoint') {
+                filteredInfo.filteredDomains = domains.filter(domain => {
+                    if (!domain.sni_endpoint)
+                        domain.sni_endpoint = '';
+                    return domain.sni_endpoint.includes(value);
+                });
+            }
+            filteredInfo.size = filteredInfo.filteredDomains.length;
+            return filteredInfo;
+        };
     }
     async run() {
         const { flags } = await this.parse(DomainsIndex);
-        const { body: domains } = await this.heroku.get(`/apps/${flags.app}/domains`);
-        const herokuDomain = domains.find(domain => domain.kind === 'heroku');
-        const customDomains = domains.filter(domain => domain.kind === 'custom');
+        const domains = await (0, paginator_1.paginateRequest)(this.heroku, `/apps/${flags.app}/domains`, 1000);
+        const herokuDomain = domains.find((domain) => domain.kind === 'heroku');
+        let customDomains = domains.filter((domain) => domain.kind === 'custom');
+        let displayTotalDomains = false;
+        if (flags.filter) {
+            customDomains = this.getFilteredDomains(flags.filter, domains).filteredDomains;
+        }
         if (flags.json) {
             core_1.ux.styledJSON(domains);
         }
@@ -57,6 +93,14 @@ class DomainsIndex extends command_1.Command {
             core_1.ux.styledHeader(`${flags.app} Heroku Domain`);
             core_1.ux.log(herokuDomain && herokuDomain.hostname);
             if (customDomains && customDomains.length > 0) {
+                core_1.ux.log();
+                if (customDomains.length > 100 && !flags.csv) {
+                    core_1.ux.warn(`This app has over 100 domains. Your terminal may not be configured to display the total amount of domains. You can export all domains into a CSV file with: ${color_1.default.cyan('heroku domains -a example-app --csv > example-file.csv')}`);
+                    displayTotalDomains = await (0, prompts_1.confirm)({ default: false, message: `Display all ${customDomains.length} domains?`, theme: { prefix: '', style: { defaultAnswer: () => '(Y/N)' } } });
+                    if (!displayTotalDomains) {
+                        return;
+                    }
+                }
                 core_1.ux.log();
                 core_1.ux.styledHeader(`${flags.app} Custom Domains`);
                 core_1.ux.table(customDomains, this.tableConfig(true), Object.assign(Object.assign({}, flags), { 'no-truncate': true }));

package/lib/lib/container/helpers.js

@@ -13,12 +13,15 @@ const stackLabelMap = {
  * @returns {null} null
  */
 function ensureContainerStack(app, cmd) {
-    var _a, _b, _c;
-    if (((_a = app.stack) === null || _a === void 0 ? void 0 : _a.name) !== 'container') {
-        const appLabel = (((_b = app.stack) === null || _b === void 0 ? void 0 : _b.name) && stackLabelMap[app.stack.name]) || ((_c = app.stack) === null || _c === void 0 ? void 0 : _c.name);
+    var _a, _b;
+    const buildStack = (_a = app.build_stack) === null || _a === void 0 ? void 0 : _a.name;
+    const appStack = (_b = app.stack) === null || _b === void 0 ? void 0 : _b.name;
+    const allowedStack = 'container';
+    // either can be container stack and are allowed
+    if (buildStack !== allowedStack && appStack !== allowedStack) {
         let message = 'This command is for Docker apps only.';
         if (['push', 'release'].includes(cmd)) {
-            message += ` Run ${color_1.default.cyan('git push heroku main')} to deploy your ${color_1.default.cyan(app.name)} ${color_1.default.cyan(appLabel)} app instead.`;
+            message += ` Switch stacks by running ${color_1.default.cmd('heroku stack:set container')}. Or, to deploy ${color_1.default.app(app.name)} with ${color_1.default.yellow(appStack)}, run ${color_1.default.cmd('git push heroku main')} instead.`;
         }
         core_1.ux.error(message, { exit: 1 });
     }

package/lib/lib/pg/fetcher.js

@@ -86,7 +86,6 @@ async function getAttachment(heroku, app, db = 'DATABASE_URL', namespace = '') {
         if (attachments.length === 0) {
             throw new Error(`${color_1.default.app(app)} has no databases`);
         }
-        console.log('hi', JSON.stringify(attachments));
         matches = attachments.filter(attachment => config[db] && config[db] === config[(0, util_1.getConfigVarName)(attachment.config_vars)]);
         if (matches.length === 0) {
             const validOptions = attachments.map(attachment => (0, util_1.getConfigVarName)(attachment.config_vars));

package/lib/lib/utils/keyValueParser.d.ts

@@ -0,0 +1,4 @@
+export default function parseKeyValue(input: string): {
+    key: string;
+    value: string;
+};

package/lib/lib/utils/keyValueParser.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+function parseKeyValue(input) {
+    let [key, value] = input.split(/=(.+)/);
+    key = key.trim();
+    value = value ? value.trim() : '';
+    return { key, value };
+}
+exports.default = parseKeyValue;

package/lib/lib/utils/paginator.d.ts

@@ -0,0 +1,2 @@
+import { APIClient } from '@heroku-cli/command';
+export declare function paginateRequest<T = unknown>(client: APIClient, url: string, pageSize?: number): Promise<T[]>;

package/lib/lib/utils/paginator.js

@@ -0,0 +1,29 @@
+"use strict";
+// page size ranges from 200 - 1000 seen here
+// https://devcenter.heroku.com/articles/platform-api-reference#ranges
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.paginateRequest = void 0;
+async function paginateRequest(client, url, pageSize = 200) {
+    let isPartial = true;
+    let isFirstRequest = true;
+    let nextRange = '';
+    let aggregatedResponseBody = [];
+    while (isPartial) {
+        const response = await client.get(url, {
+            headers: {
+                Range: `${(isPartial && !isFirstRequest) ? `${nextRange}` : `id ..; max=${pageSize};`}`,
+            },
+            partial: true,
+        });
+        aggregatedResponseBody = [...response.body, ...aggregatedResponseBody];
+        isFirstRequest = false;
+        if (response.statusCode === 206) {
+            nextRange = response.headers['next-range'];
+        }
+        else {
+            isPartial = false;
+        }
+    }
+    return aggregatedResponseBody;
+}
+exports.paginateRequest = paginateRequest;