heroku 8.3.2-beta.1 → 8.3.2-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -42,6 +42,6 @@ WebhooksAdd.flags = {
|
|
|
42
42
|
include: command_1.flags.string({ char: 'i', description: 'comma delimited event types your server will receive ', required: true }),
|
|
43
43
|
level: command_1.flags.string({ char: 'l', description: 'notify does not retry, sync will retry until successful or timeout', required: true }),
|
|
44
44
|
secret: command_1.flags.string({ char: 's', description: 'value to sign delivery with in Heroku-Webhook-Hmac-SHA256 header' }),
|
|
45
|
-
authorization: command_1.flags.string({ char: 't', description: '
|
|
45
|
+
authorization: command_1.flags.string({ char: 't', description: 'authorization header to send with webhooks' }),
|
|
46
46
|
url: command_1.flags.string({ char: 'u', description: 'URL for receiver', required: true }),
|
|
47
47
|
};
|
|
@@ -33,7 +33,7 @@ WebhooksUpdate.flags = {
|
|
|
33
33
|
include: command_1.flags.string({ char: 'i', description: 'comma delimited event types your server will receive ', required: true }),
|
|
34
34
|
level: command_1.flags.string({ char: 'l', description: 'notify does not retry, sync will retry until successful or timeout', required: true }),
|
|
35
35
|
secret: command_1.flags.string({ char: 's', description: 'value to sign delivery with in Heroku-Webhook-Hmac-SHA256 header' }),
|
|
36
|
-
authorization: command_1.flags.string({ char: 't', description: '
|
|
36
|
+
authorization: command_1.flags.string({ char: 't', description: 'authorization header to send with webhooks' }),
|
|
37
37
|
url: command_1.flags.string({ char: 'u', description: 'URL for receiver', required: true }),
|
|
38
38
|
};
|
|
39
39
|
WebhooksUpdate.args = {
|
|
@@ -38,7 +38,7 @@ export declare function setupTelemetry(config: any, opts: any): {
|
|
|
38
38
|
command_not_found: boolean;
|
|
39
39
|
};
|
|
40
40
|
isVersionOrHelp: boolean;
|
|
41
|
-
}
|
|
41
|
+
};
|
|
42
42
|
export declare function computeDuration(cmdStartTime: any): number;
|
|
43
43
|
export declare function reportCmdNotFound(config: any): {
|
|
44
44
|
command: string;
|
package/lib/global_telemetry.js
CHANGED
|
@@ -6,17 +6,16 @@ const Rollbar = require("rollbar");
|
|
|
6
6
|
const command_1 = require("@heroku-cli/command");
|
|
7
7
|
const core_1 = require("@oclif/core");
|
|
8
8
|
const api_1 = require("@opentelemetry/api");
|
|
9
|
-
const packageParser_1 = require("./lib/utils/packageParser");
|
|
10
9
|
const { Resource } = require('@opentelemetry/resources');
|
|
11
10
|
const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
|
|
12
11
|
const { registerInstrumentations } = require('@opentelemetry/instrumentation');
|
|
13
12
|
const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
|
|
14
13
|
const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
|
|
15
14
|
const { OTLPTraceExporter } = require('@opentelemetry/exporter-trace-otlp-http');
|
|
16
|
-
const isDev = process.env.IS_DEV_ENVIRONMENT === 'true';
|
|
17
15
|
const path = require('path');
|
|
18
|
-
const root = path.resolve(__dirname, '../package.json');
|
|
19
16
|
const { version } = require('../package.json');
|
|
17
|
+
const root = path.resolve(__dirname, '../package.json');
|
|
18
|
+
const isDev = process.env.IS_DEV_ENVIRONMENT === 'true';
|
|
20
19
|
const config = new core_1.Config({ root });
|
|
21
20
|
const heroku = new command_1.APIClient(config);
|
|
22
21
|
const token = heroku.auth;
|
|
@@ -26,6 +25,7 @@ const rollbar = new Rollbar({
|
|
|
26
25
|
captureUncaught: true,
|
|
27
26
|
captureUnhandledRejections: true,
|
|
28
27
|
environment: isDev ? 'development' : 'production',
|
|
28
|
+
codeVersion: version,
|
|
29
29
|
});
|
|
30
30
|
registerInstrumentations({
|
|
31
31
|
instrumentations: [],
|
|
@@ -54,9 +54,8 @@ exports.initializeInstrumentation = initializeInstrumentation;
|
|
|
54
54
|
function setupTelemetry(config, opts) {
|
|
55
55
|
const now = new Date();
|
|
56
56
|
const cmdStartTime = now.getTime();
|
|
57
|
-
const isHelpOrVersionCmd = ((0, packageParser_1.getAllVersionFlags)().includes(opts.id) || (0, packageParser_1.getAllHelpFlags)().includes(opts.id));
|
|
58
57
|
const isRegularCmd = Boolean(opts.Command);
|
|
59
|
-
const
|
|
58
|
+
const irregularTelemetryObject = {
|
|
60
59
|
command: opts.id,
|
|
61
60
|
os: config.platform,
|
|
62
61
|
version: config.version,
|
|
@@ -72,12 +71,10 @@ function setupTelemetry(config, opts) {
|
|
|
72
71
|
},
|
|
73
72
|
isVersionOrHelp: true,
|
|
74
73
|
};
|
|
75
|
-
if (isHelpOrVersionCmd) {
|
|
76
|
-
return baseTelemetryObject;
|
|
77
|
-
}
|
|
78
74
|
if (isRegularCmd) {
|
|
79
|
-
return Object.assign(Object.assign({},
|
|
75
|
+
return Object.assign(Object.assign({}, irregularTelemetryObject), { command: opts.Command.id, isVersionOrHelp: false, lifecycleHookCompletion: Object.assign(Object.assign({}, irregularTelemetryObject.lifecycleHookCompletion), { prerun: true }) });
|
|
80
76
|
}
|
|
77
|
+
return irregularTelemetryObject;
|
|
81
78
|
}
|
|
82
79
|
exports.setupTelemetry = setupTelemetry;
|
|
83
80
|
function computeDuration(cmdStartTime) {
|
package/lib/hooks/update/brew.js
CHANGED
|
@@ -24,6 +24,7 @@ const brewHook = async function () {
|
|
|
24
24
|
let cellarPath;
|
|
25
25
|
if (binPath && binPath.startsWith(path.join(brewRoot, 'Cellar'))) {
|
|
26
26
|
cellarPath = path.resolve(binPath, path.dirname(path.relative(binPath, path.join(brewRoot, 'Cellar/heroku'))));
|
|
27
|
+
console.error('brew update path:', cellarPath);
|
|
27
28
|
}
|
|
28
29
|
const fetchInstallReceipt = async () => {
|
|
29
30
|
if (!cellarPath)
|
package/oclif.manifest.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "8.3.2-beta.
|
|
2
|
+
"version": "8.3.2-beta.3",
|
|
3
3
|
"commands": {
|
|
4
4
|
"console": {
|
|
5
5
|
"id": "console",
|
|
@@ -2860,7 +2860,7 @@
|
|
|
2860
2860
|
"name": "authorization",
|
|
2861
2861
|
"type": "option",
|
|
2862
2862
|
"char": "t",
|
|
2863
|
-
"description": "
|
|
2863
|
+
"description": "authorization header to send with webhooks",
|
|
2864
2864
|
"multiple": false
|
|
2865
2865
|
},
|
|
2866
2866
|
"url": {
|
|
@@ -3060,7 +3060,7 @@
|
|
|
3060
3060
|
"name": "authorization",
|
|
3061
3061
|
"type": "option",
|
|
3062
3062
|
"char": "t",
|
|
3063
|
-
"description": "
|
|
3063
|
+
"description": "authorization header to send with webhooks",
|
|
3064
3064
|
"multiple": false
|
|
3065
3065
|
},
|
|
3066
3066
|
"url": {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "heroku",
|
|
3
3
|
"description": "CLI to interact with Heroku",
|
|
4
|
-
"version": "8.3.2-beta.
|
|
4
|
+
"version": "8.3.2-beta.3",
|
|
5
5
|
"author": "Jeff Dickey @jdxcode",
|
|
6
6
|
"bin": "./bin/run",
|
|
7
7
|
"bugs": "https://github.com/heroku/cli/issues",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"@oclif/plugin-legacy": "^1.3.0",
|
|
30
30
|
"@oclif/plugin-not-found": "2.3.16",
|
|
31
31
|
"@oclif/plugin-plugins": "2.4.3",
|
|
32
|
-
"@oclif/plugin-update": "3.1.
|
|
32
|
+
"@oclif/plugin-update": "3.1.32",
|
|
33
33
|
"@oclif/plugin-version": "^1.2.1",
|
|
34
34
|
"@oclif/plugin-warn-if-update-available": "2.0.29",
|
|
35
35
|
"@oclif/plugin-which": "2.2.8",
|
|
@@ -338,5 +338,5 @@
|
|
|
338
338
|
"version": "oclif readme --multi && git add README.md ../../docs"
|
|
339
339
|
},
|
|
340
340
|
"types": "lib/index.d.ts",
|
|
341
|
-
"gitHead": "
|
|
341
|
+
"gitHead": "002a6f5d7fb98ee2eca1a9ababe6aaea191b2314"
|
|
342
342
|
}
|