heroku 10.5.0 → 10.5.1-beta.0

package/README.md

@@ -34,6 +34,7 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 # Command Topics
 
 * [`heroku access`](docs/access.md) - manage user access to apps
+* [`heroku accounts`](docs/accounts.md) - list the Heroku accounts in your cache
 * [`heroku addons`](docs/addons.md) - tools and services for developing, extending, and operating your app
 * [`heroku apps`](docs/apps.md) - manage apps on Heroku
 * [`heroku auth`](docs/auth.md) - manage authentication for your Heroku account
@@ -73,7 +74,7 @@ For other issues, [submit a support ticket](https://help.heroku.com/).
 * [`heroku teams`](docs/teams.md) - manage teams
 * [`heroku telemetry`](docs/telemetry.md) - list telemetry drains
 * [`heroku update`](docs/update.md) - update the Heroku CLI
-* [`heroku usage`](docs/usage.md) - list usage values for metered addons associated with a given app or team
+* [`heroku usage`](docs/usage.md) - list usage for metered add-ons attached to an app or apps within a team
 * [`heroku version`](docs/version.md)
 * [`heroku webhooks`](docs/webhooks.md) - list webhooks on an app
 

package/lib/commands/accounts/add.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@heroku-cli/command';
+export default class Add extends Command {
+    static description: string;
+    static args: {
+        name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    static example: string;
+    run(): Promise<void>;
+}

package/lib/commands/accounts/add.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const accounts_1 = require("../../lib/accounts/accounts");
+class Add extends command_1.Command {
+    async run() {
+        const { args } = await this.parse(Add);
+        const { name } = args;
+        const logInMessage = 'You must be logged in to run this command.';
+        if ((0, accounts_1.list)().some(a => a.name === name)) {
+            core_1.ux.error(`${name} already exists`);
+        }
+        const { body: account } = await this.heroku.get('/account');
+        const email = account.email || '';
+        const token = this.heroku.auth || '';
+        if (token === '') {
+            core_1.ux.error(logInMessage);
+        }
+        if (email === '') {
+            core_1.ux.error(logInMessage);
+        }
+        (0, accounts_1.add)(name, email, token);
+    }
+}
+exports.default = Add;
+Add.description = 'add a Heroku account to your cache';
+Add.args = {
+    name: core_1.Args.string({ description: 'name of Heroku account to add', required: true }),
+};
+Add.example = 'heroku accounts:add my-account';

package/lib/commands/accounts/current.d.ts

@@ -0,0 +1,6 @@
+import { Command } from '@heroku-cli/command';
+export default class Current extends Command {
+    static description: string;
+    static example: string;
+    run(): Promise<void>;
+}

package/lib/commands/accounts/current.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const accounts_1 = require("../../lib/accounts/accounts");
+const color_1 = require("@heroku-cli/color");
+class Current extends command_1.Command {
+    async run() {
+        const account = (0, accounts_1.current)();
+        if (account) {
+            core_1.ux.styledHeader(`Current account is ${account}`);
+        }
+        else {
+            core_1.ux.error(`You haven't set an account. Run ${color_1.default.cmd('heroku accounts:add <account-name>')} to add an account to your cache or ${color_1.default.cmd('heroku accounts:set <account-name>')} to set the current account.`);
+        }
+    }
+}
+exports.default = Current;
+Current.description = 'display the current Heroku account';
+Current.example = 'heroku accounts:current';

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

@@ -0,0 +1,6 @@
+import { Command } from '@heroku-cli/command';
+export default class AccountsIndex extends Command {
+    static description: string;
+    static example: string;
+    run(): Promise<void>;
+}

package/lib/commands/accounts/index.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const accounts_1 = require("../../lib/accounts/accounts");
+class AccountsIndex extends command_1.Command {
+    async run() {
+        const accounts = (0, accounts_1.list)();
+        if (accounts.length === 0) {
+            core_1.ux.error('You don\'t have any accounts in your cache.');
+        }
+        for (const account of accounts) {
+            if (account.name === (0, accounts_1.current)()) {
+                core_1.ux.log(`* ${account.name}`);
+            }
+            else {
+                core_1.ux.log(`  ${account.name}`);
+            }
+        }
+    }
+}
+exports.default = AccountsIndex;
+AccountsIndex.description = 'list the Heroku accounts in your cache';
+AccountsIndex.example = 'heroku accounts';

package/lib/commands/accounts/remove.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@heroku-cli/command';
+export default class Remove extends Command {
+    static description: string;
+    static args: {
+        name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    static example: string;
+    run(): Promise<void>;
+}

package/lib/commands/accounts/remove.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const accounts_1 = require("../../lib/accounts/accounts");
+class Remove extends command_1.Command {
+    async run() {
+        const { args } = await this.parse(Remove);
+        const { name } = args;
+        if (!(0, accounts_1.list)().some(a => a.name === name)) {
+            core_1.ux.error(`${name} doesn't exist in your accounts cache.`);
+        }
+        if ((0, accounts_1.current)() === name) {
+            core_1.ux.error(`${name} is the current account.`);
+        }
+        (0, accounts_1.remove)(name);
+    }
+}
+exports.default = Remove;
+Remove.description = 'remove a Heroku account from your cache';
+Remove.args = {
+    name: core_1.Args.string({ description: 'name of Heroku account to remove', required: true }),
+};
+Remove.example = 'heroku accounts:remove my-account';

package/lib/commands/accounts/set.d.ts

@@ -0,0 +1,9 @@
+import { Command } from '@heroku-cli/command';
+export default class Set extends Command {
+    static description: string;
+    static args: {
+        name: import("@oclif/core/lib/interfaces/parser").Arg<string, Record<string, unknown>>;
+    };
+    static example: string;
+    run(): Promise<void>;
+}

package/lib/commands/accounts/set.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const command_1 = require("@heroku-cli/command");
+const core_1 = require("@oclif/core");
+const accounts_1 = require("../../lib/accounts/accounts");
+class Set extends command_1.Command {
+    async run() {
+        const { args } = await this.parse(Set);
+        const { name } = args;
+        if (!(0, accounts_1.list)().some(a => a.name === name)) {
+            core_1.ux.error(`${name} does not exist in your accounts cache.`);
+        }
+        (0, accounts_1.set)(name);
+    }
+}
+exports.default = Set;
+Set.description = 'set the current Heroku account from your cache';
+Set.args = {
+    name: core_1.Args.string({ description: 'name of account to set', required: true }),
+};
+Set.example = 'heroku accounts:set my-account';

package/lib/commands/ps/type.js

@@ -22,6 +22,35 @@ const COST_MONTHLY = {
     'Performance-L-RAM': 500,
     'Performance-XL': 750,
     'Performance-2XL': 1500,
+    'Private-S': 225,
+    'Private-M': 450,
+    'Private-L': 900,
+    'Shield-M': 540,
+    'Shield-L': 1080,
+    'Shield-S': 270,
+    'Private-Memory-L': 500,
+    'Private-Memory-XL': 750,
+    'Private-Memory-2XL': 1500,
+    'Shield-Memory-L': 600,
+    'Shield-Memory-XL': 900,
+    'Shield-Memory-2XL': 1800,
+    'dyno-1c-0.5gb': 25,
+    'dyno-2c-1gb': 50,
+    'dyno-1c-4gb': 80,
+    'dyno-2c-8gb': 160,
+    'dyno-4c-16gb': 320,
+    'dyno-8c-32gb': 640,
+    'dyno-16c-64gb': 1000,
+    'dyno-2c-4gb': 150,
+    'dyno-4c-8gb': 300,
+    'dyno-8c-16gb': 600,
+    'dyno-16c-32gb': 1200,
+    'dyno-32c-64gb': 2400,
+    'dyno-1c-8gb': 100,
+    'dyno-2c-16gb': 250,
+    'dyno-4c-32gb': 500,
+    'dyno-8c-64gb': 750,
+    'dyno-16c-128gb': 1500,
 };
 const calculateHourly = (size) => COST_MONTHLY[size] / 720;
 const emptyFormationErr = (app) => {

package/lib/commands/usage/addons.js

@@ -12,7 +12,7 @@ class UsageAddons extends command_1.Command {
         })));
         core_1.ux.styledHeader(`Usage for ${color_1.default.app(app)}`);
         core_1.ux.table(metersArray, {
-            Addon: {
+            'Add-on': {
                 get: row => {
                     const matchingAddon = appAddons.find(a => a.id === row.addonId);
                     return (matchingAddon === null || matchingAddon === void 0 ? void 0 : matchingAddon.name) || row.addonId;
@@ -111,8 +111,8 @@ class UsageAddons extends command_1.Command {
 }
 exports.default = UsageAddons;
 UsageAddons.topic = 'usage';
-UsageAddons.description = 'list usage values for metered addons associated with a given app or team';
+UsageAddons.description = 'list usage for metered add-ons attached to an app or apps within a team';
 UsageAddons.flags = {
-    app: command_1.flags.string(),
-    team: command_1.flags.string(),
+    app: command_1.flags.string({ char: 'a', description: 'app to list metered add-ons usage for' }),
+    team: command_1.flags.team({ description: 'team to list metered add-ons usage for' }),
 };

package/lib/lib/accounts/accounts.d.ts

@@ -0,0 +1,6 @@
+import * as Heroku from '@heroku-cli/schema';
+export declare function list(): Heroku.Account[] | [];
+export declare function current(): string | null;
+export declare function add(name: string, username: string, password: string): void;
+export declare function remove(name: string): void;
+export declare function set(name: string): void;

package/lib/lib/accounts/accounts.js

@@ -0,0 +1,70 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.set = exports.remove = exports.add = exports.current = exports.list = void 0;
+const yaml_1 = require("yaml");
+const fs = require("fs");
+const os = require("node:os");
+const path = require("node:path");
+const netrc_parser_1 = require("netrc-parser");
+function configDir() {
+    const legacyDir = path.join(os.homedir(), '.heroku');
+    if (fs.existsSync(legacyDir)) {
+        return legacyDir;
+    }
+    return path.join(os.homedir(), '.config', 'heroku');
+}
+function account(name) {
+    const basedir = path.join(configDir(), 'accounts');
+    const file = fs.readFileSync(path.join(basedir, name), 'utf8');
+    const account = (0, yaml_1.parse)(file);
+    if (account[':username']) {
+        // convert from ruby symbols
+        account.username = account[':username'];
+        account.password = account[':password'];
+        delete account[':username'];
+        delete account[':password'];
+    }
+    return account;
+}
+function list() {
+    const basedir = path.join(configDir(), 'accounts');
+    try {
+        return fs.readdirSync(basedir)
+            .map(name => Object.assign(account(name), { name }));
+    }
+    catch (_a) {
+        return [];
+    }
+}
+exports.list = list;
+function current() {
+    if (netrc_parser_1.default.machines['api.heroku.com']) {
+        const current = list().find(a => a.username === netrc_parser_1.default.machines['api.heroku.com'].login);
+        return current && current.name ? current.name : null;
+    }
+    return null;
+}
+exports.current = current;
+function add(name, username, password) {
+    const basedir = path.join(configDir(), 'accounts');
+    fs.mkdirSync(basedir, { recursive: true });
+    fs.writeFileSync(path.join(basedir, name), (0, yaml_1.stringify)({ username, password }), 'utf8');
+    fs.chmodSync(path.join(basedir, name), 0o600);
+}
+exports.add = add;
+function remove(name) {
+    const basedir = path.join(configDir(), 'accounts');
+    fs.unlinkSync(path.join(basedir, name));
+}
+exports.remove = remove;
+function set(name) {
+    const current = account(name);
+    netrc_parser_1.default.machines['git.heroku.com'] = {};
+    netrc_parser_1.default.machines['api.heroku.com'] = {};
+    netrc_parser_1.default.machines['git.heroku.com'].login = current.username;
+    netrc_parser_1.default.machines['api.heroku.com'].login = current.username;
+    netrc_parser_1.default.machines['git.heroku.com'].password = current.password;
+    netrc_parser_1.default.machines['api.heroku.com'].password = current.password;
+    netrc_parser_1.default.saveSync();
+}
+exports.set = set;

package/oclif.manifest.json

@@ -533,6 +533,134 @@
         "update.js"
       ]
     },
+    "accounts:add": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "name of Heroku account to add",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "add a Heroku account to your cache",
+      "examples": "heroku accounts:add my-account",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "accounts:add",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "example": "heroku accounts:add my-account",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "accounts",
+        "add.js"
+      ]
+    },
+    "accounts:current": {
+      "aliases": [],
+      "args": {},
+      "description": "display the current Heroku account",
+      "examples": "heroku accounts:current",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "accounts:current",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "example": "heroku accounts:current",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "accounts",
+        "current.js"
+      ]
+    },
+    "accounts": {
+      "aliases": [],
+      "args": {},
+      "description": "list the Heroku accounts in your cache",
+      "examples": "heroku accounts",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "accounts",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "example": "heroku accounts",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "accounts",
+        "index.js"
+      ]
+    },
+    "accounts:remove": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "name of Heroku account to remove",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "remove a Heroku account from your cache",
+      "examples": "heroku accounts:remove my-account",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "accounts:remove",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "example": "heroku accounts:remove my-account",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "accounts",
+        "remove.js"
+      ]
+    },
+    "accounts:set": {
+      "aliases": [],
+      "args": {
+        "name": {
+          "description": "name of account to set",
+          "name": "name",
+          "required": true
+        }
+      },
+      "description": "set the current Heroku account from your cache",
+      "examples": "heroku accounts:set my-account",
+      "flags": {},
+      "hasDynamicHelp": false,
+      "hiddenAliases": [],
+      "id": "accounts:set",
+      "pluginAlias": "heroku",
+      "pluginName": "heroku",
+      "pluginType": "core",
+      "strict": true,
+      "example": "heroku accounts:set my-account",
+      "isESM": false,
+      "relativePath": [
+        "lib",
+        "commands",
+        "accounts",
+        "set.js"
+      ]
+    },
     "addons:attach": {
       "aliases": [],
       "args": {
@@ -10275,15 +10403,19 @@
     "usage:addons": {
       "aliases": [],
       "args": {},
-      "description": "list usage values for metered addons associated with a given app or team",
+      "description": "list usage for metered add-ons attached to an app or apps within a team",
       "flags": {
         "app": {
+          "char": "a",
+          "description": "app to list metered add-ons usage for",
           "name": "app",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "team": {
+          "char": "t",
+          "description": "team to list metered add-ons usage for",
           "name": "team",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -14520,5 +14652,5 @@
       ]
     }
   },
-  "version": "10.5.0"
+  "version": "10.5.1-beta.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "10.5.0",
+  "version": "10.5.1-beta.0",
   "author": "Heroku",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -78,7 +78,8 @@
     "urijs": "^1.19.11",
     "validator": "^13.7.0",
     "word-wrap": "^1.2.5",
-    "ws": "^6.2.2"
+    "ws": "^6.2.2",
+    "yaml": "^2.0.1"
   },
   "devDependencies": {
     "@heroku-cli/schema": "^1.0.25",
@@ -397,5 +398,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "508b163af7ae9a143cae0f02589b50b4a0a81d50"
+  "gitHead": "65bb66c86fd0c948e3d0971737c1032ac99be819"
 }