heroku 8.3.1-beta.1 → 8.3.1-beta.3

package/lib/global_telemetry.js

@@ -6,6 +6,7 @@ const Rollbar = require("rollbar");
 const command_1 = require("@heroku-cli/command");
 const core_1 = require("@oclif/core");
 const api_1 = require("@opentelemetry/api");
+const packageParser_1 = require("./lib/utils/packageParser");
 const { Resource } = require('@opentelemetry/resources');
 const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
 const { registerInstrumentations } = require('@opentelemetry/instrumentation');
@@ -53,43 +54,29 @@ exports.initializeInstrumentation = initializeInstrumentation;
 function setupTelemetry(config, opts) {
     const now = new Date();
     const cmdStartTime = now.getTime();
-    const isHelpOrVersionCmd = (opts.id === 'version' || opts.id === '--help');
+    const isHelpOrVersionCmd = ((0, packageParser_1.getAllVersionFlags)().includes(opts.id) || (0, packageParser_1.getAllHelpFlags)().includes(opts.id));
     const isRegularCmd = Boolean(opts.Command);
+    const baseTelemetryObject = {
+        command: opts.id,
+        os: config.platform,
+        version: config.version,
+        exitCode: 0,
+        exitState: 'successful',
+        cliRunDuration: 0,
+        commandRunDuration: cmdStartTime,
+        lifecycleHookCompletion: {
+            init: true,
+            prerun: false,
+            postrun: false,
+            command_not_found: false,
+        },
+        isVersionOrHelp: true,
+    };
     if (isHelpOrVersionCmd) {
-        return {
-            command: opts.id,
-            os: config.platform,
-            version: config.version,
-            exitCode: 0,
-            exitState: 'successful',
-            cliRunDuration: 0,
-            commandRunDuration: cmdStartTime,
-            lifecycleHookCompletion: {
-                init: true,
-                prerun: false,
-                postrun: false,
-                command_not_found: false,
-            },
-            isVersionOrHelp: true,
-        };
+        return baseTelemetryObject;
     }
     if (isRegularCmd) {
-        return {
-            command: opts.Command.id,
-            os: config.platform,
-            version: config.version,
-            exitCode: 0,
-            exitState: 'successful',
-            cliRunDuration: 0,
-            commandRunDuration: cmdStartTime,
-            lifecycleHookCompletion: {
-                init: true,
-                prerun: true,
-                postrun: false,
-                command_not_found: false,
-            },
-            isVersionOrHelp: false,
-        };
+        return Object.assign(Object.assign({}, baseTelemetryObject), { command: opts.Command.id, lifecycleHookCompletion: Object.assign(Object.assign({}, baseTelemetryObject.lifecycleHookCompletion), { prerun: true }), isVersionOrHelp: false });
     }
 }
 exports.setupTelemetry = setupTelemetry;

package/lib/hooks/init/version.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const packageParser_1 = require("../../lib/utils/packageParser");
 const allowlist = [
     'HEROKU_API_KEY',
     'HEROKU_APP',
@@ -11,7 +12,7 @@ const allowlist = [
     'SSL_KEY_FILE',
 ];
 const version = async function () {
-    if (['-v', '--version', 'version'].includes(process.argv[2])) {
+    if ((0, packageParser_1.getAllVersionFlags)().includes(process.argv[2])) {
         for (const env of allowlist) {
             if (process.env[env]) {
                 const value = env === 'HEROKU_API_KEY' ? 'to [REDACTED]' : `to ${process.env[env]}`;

package/lib/lib/utils/packageParser.d.ts

@@ -0,0 +1,2 @@
+export declare function getAllVersionFlags(): any[];
+export declare function getAllHelpFlags(): any[];

package/lib/lib/utils/packageParser.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAllHelpFlags = exports.getAllVersionFlags = void 0;
+const { oclif } = require('../../../package.json');
+function getAllVersionFlags() {
+    return [...oclif.additionalVersionFlags, '--version'];
+}
+exports.getAllVersionFlags = getAllVersionFlags;
+function getAllHelpFlags() {
+    return [...oclif.additionalHelpFlags, '--help', 'help'];
+}
+exports.getAllHelpFlags = getAllHelpFlags;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.3.1-beta.1",
+  "version": "8.3.1-beta.3",
   "commands": {
     "console": {
       "id": "console",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "heroku",
   "description": "CLI to interact with Heroku",
-  "version": "8.3.1-beta.1",
+  "version": "8.3.1-beta.3",
   "author": "Jeff Dickey @jdxcode",
   "bin": "./bin/run",
   "bugs": "https://github.com/heroku/cli/issues",
@@ -9,8 +9,8 @@
     "@heroku-cli/color": "1.1.14",
     "@heroku-cli/command": "^10.0.0",
     "@heroku-cli/notifications": "^1.2.2",
-    "@heroku-cli/plugin-addons-v5": "^8.2.0",
-    "@heroku-cli/plugin-apps-v5": "^8.2.0",
+    "@heroku-cli/plugin-addons-v5": "^8.3.1-beta.3",
+    "@heroku-cli/plugin-apps-v5": "^8.3.1-beta.3",
     "@heroku-cli/plugin-certs-v5": "^8.2.0",
     "@heroku-cli/plugin-ci-v5": "^8.2.0",
     "@heroku-cli/plugin-container-registry-v5": "^8.2.0",
@@ -19,7 +19,7 @@
     "@heroku-cli/plugin-ps": "^8.1.7",
     "@heroku-cli/plugin-ps-exec": "^2.4.0",
     "@heroku-cli/plugin-redis-v5": "^8.2.0",
-    "@heroku-cli/plugin-spaces": "^8.2.0",
+    "@heroku-cli/plugin-spaces": "^8.3.1-beta.3",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
     "@heroku/eventsource": "^1.0.7",
@@ -332,5 +332,5 @@
     "version": "oclif readme --multi && git add README.md ../../docs"
   },
   "types": "lib/index.d.ts",
-  "gitHead": "4343cc17b5657499283a547da2e118741f4099ce"
+  "gitHead": "64393461430887ace7546c02f020bf94d3dc15df"
 }