heroku 11.5.0 → 11.6.0

package/dist/lib/analytics-telemetry/backboard-herokulytics-client.js

@@ -1,4 +1,4 @@
-import { vars } from '@heroku-cli/command';
+import { APIClient } from '@heroku-cli/command';
 import { HTTP } from '@heroku/http-call';
 import fs from 'fs-extra';
 import path from 'node:path';
@@ -8,8 +8,8 @@ export default class BackboardHerokulyticsClient {
     config;
     http;
     userConfig;
+    heroku;
     isInitialized = false;
-    netrc;
     constructor(config) {
         this.config = config;
         this.http = HTTP.create({
@@ -17,26 +17,11 @@ export default class BackboardHerokulyticsClient {
         });
     }
     get authorizationToken() {
-        return process.env.HEROKU_API_KEY || this.netrcToken;
-    }
-    get netrcLogin() {
-        return this.netrc?.machines[vars.apiHost]?.login;
-    }
-    get netrcToken() {
-        return this.netrc?.machines[vars.apiHost]?.password;
+        return this.heroku.auth;
     }
     get url() {
         return process.env.HEROKU_ANALYTICS_URL || 'https://backboard.heroku.com/hamurai';
     }
-    get user() {
-        if (this.usingHerokuAPIKey)
-            return undefined;
-        return this.netrcLogin;
-    }
-    get usingHerokuAPIKey() {
-        const k = process.env.HEROKU_API_KEY;
-        return Boolean(k && k.length > 0);
-    }
     async _acAnalytics(id) {
         if (id === 'autocomplete:options')
             return 0;
@@ -110,10 +95,8 @@ export default class BackboardHerokulyticsClient {
         }
         telemetryDebug('Initializing Herokulytics client...');
         this.isInitialized = true;
-        const NetrcModule = await import('netrc-parser');
-        const NetrcClass = NetrcModule.Netrc || NetrcModule.default.constructor;
-        this.netrc = new NetrcClass();
-        await this.netrc.load();
+        this.heroku = new APIClient(this.config);
+        await this.heroku.getAuth();
         this.userConfig = new HerokulyticsConfig(this.config);
         await this.userConfig.init();
         telemetryDebug('Herokulytics client initialized (install_id: %s)', this.userConfig.install);

package/dist/lib/git/git.d.ts

@@ -1,12 +1,20 @@
+import cp from 'node:child_process';
 export default class Git {
+    private readonly execFile;
+    /** Configures `heroku git:credentials` as a Git credential helper
+    * that is URL-scoped to Heroku Git operations only.
+    */
+    configureCredentialHelper(): Promise<void>;
     createRemote(remote: string, url: string): Promise<string | null>;
+    /** Erases stored credentials for the Heroku Git host */
+    eraseCredentials(): Promise<void>;
     exec(args: string[]): Promise<string>;
     getBranch(symbolicRef: string): Promise<string>;
     getCommitTitle(ref: string): Promise<string>;
     getRef(branch: string): Promise<string>;
     hasGitRemote(remote: string): Promise<boolean>;
     httpGitUrl(app: string): string;
-    inGitRepo(): true | undefined;
+    inGitRepo(): boolean;
     readCommit(commit: string): Promise<{
         branch: string;
         message: string;
@@ -14,6 +22,11 @@ export default class Git {
     }>;
     remoteFromGitConfig(): Promise<string | void>;
     remoteUrl(name: string): Promise<string>;
-    spawn(args: string[]): Promise<unknown>;
+    /** Removes `heroku git:credentials` from the global config */
+    removeCredentialHelper(): Promise<void>;
+    spawn(args: string[], options?: {
+        input?: string;
+        stdio?: cp.StdioOptions;
+    }): Promise<unknown>;
     url(app: string): string;
 }

package/dist/lib/git/git.js

@@ -3,18 +3,39 @@ import { ux } from '@oclif/core/ux';
 import cp from 'node:child_process';
 import fs from 'node:fs';
 import { promisify } from 'node:util';
-const execFile = promisify(cp.execFile);
+const execFilePromise = promisify(cp.execFile);
 import debug from 'debug';
 const gitDebug = debug('git');
 export default class Git {
+    execFile = execFilePromise;
+    /** Configures `heroku git:credentials` as a Git credential helper
+    * that is URL-scoped to Heroku Git operations only.
+    */
+    async configureCredentialHelper() {
+        const { httpGitHost } = vars;
+        await this.exec([
+            'config',
+            '--global',
+            `credential.https://${httpGitHost}.helper`,
+            '!heroku git:credentials',
+        ]);
+    }
     createRemote(remote, url) {
         return this.hasGitRemote(remote)
             .then(exists => exists ? null : this.exec(['remote', 'add', remote, url]));
     }
+    /** Erases stored credentials for the Heroku Git host */
+    async eraseCredentials() {
+        const { httpGitHost } = vars;
+        await this.spawn(['credential', 'reject'], {
+            input: `protocol=https\nhost=${httpGitHost}\n\n`,
+            stdio: ['pipe', 'ignore', 'ignore'],
+        });
+    }
     async exec(args) {
         gitDebug('exec: git %o', args);
         try {
-            const { stderr, stdout } = await execFile('git', args);
+            const { stderr, stdout } = await this.execFile('git', args);
             if (stderr)
                 process.stderr.write(stderr);
             return stdout.trim();
@@ -51,6 +72,7 @@ export default class Git {
         catch (error) {
             if (error.code !== 'ENOENT')
                 throw error;
+            return false;
         }
     }
     async readCommit(commit) {
@@ -73,13 +95,27 @@ export default class Git {
             .find(r => r[0] === name)?.[1]
             ?.split(' ')[0] ?? '';
     }
-    spawn(args) {
+    /** Removes `heroku git:credentials` from the global config */
+    async removeCredentialHelper() {
+        const { httpGitHost } = vars;
+        await this.exec(['config', '--global', '--unset-all', `credential.https://${httpGitHost}.helper`]);
+    }
+    spawn(args, options = {}) {
         return new Promise((resolve, reject) => {
             gitDebug('spawn: git %o', args);
-            const s = cp.spawn('git', args, { stdio: [0, 1, 2] });
+            const s = cp.spawn('git', args, { stdio: options.stdio ?? [0, 1, 2] });
+            if (options.input && s.stdin) {
+                s.stdin.write(options.input);
+                s.stdin.end();
+            }
             s.on('error', (err) => {
                 if (err.code === 'ENOENT') {
-                    ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                    try {
+                        ux.error('Git must be installed to use the Heroku CLI.  See instructions here: https://git-scm.com');
+                    }
+                    catch (error) {
+                        reject(error);
+                    }
                 }
                 else
                     reject(err);