@heroku/plugin-compute 0.3.1 → 0.3.2
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.
- package/lib/commands/compute/create/telemetry-drain.d.ts +1 -0
- package/lib/commands/compute/create/telemetry-drain.js +2 -1
- package/lib/commands/compute/create/telemetry-drain.js.map +1 -1
- package/lib/commands/compute/delete/telemetry-drain.d.ts +20 -0
- package/lib/commands/compute/delete/telemetry-drain.js +60 -0
- package/lib/commands/compute/delete/telemetry-drain.js.map +1 -0
- package/lib/commands/compute/deploy.d.ts +5 -11
- package/lib/commands/compute/deploy.js +7 -65
- package/lib/commands/compute/deploy.js.map +1 -1
- package/lib/commands/compute/display/telemetry-drain.d.ts +1 -0
- package/lib/commands/compute/display/telemetry-drain.js +4 -3
- package/lib/commands/compute/display/telemetry-drain.js.map +1 -1
- package/lib/commands/compute/display.d.ts +1 -0
- package/lib/commands/compute/display.js +2 -1
- package/lib/commands/compute/display.js.map +1 -1
- package/lib/commands/compute/get/build-log.d.ts +1 -0
- package/lib/commands/compute/get/build-log.js +2 -1
- package/lib/commands/compute/get/build-log.js.map +1 -1
- package/lib/commands/compute/get/config.d.ts +1 -0
- package/lib/commands/compute/get/config.js +2 -1
- package/lib/commands/compute/get/config.js.map +1 -1
- package/lib/commands/compute/get/runtime-log.d.ts +1 -0
- package/lib/commands/compute/get/runtime-log.js +14 -3
- package/lib/commands/compute/get/runtime-log.js.map +1 -1
- package/lib/commands/compute/list/config.d.ts +1 -0
- package/lib/commands/compute/list/config.js +2 -1
- package/lib/commands/compute/list/config.js.map +1 -1
- package/lib/commands/compute/list/telemetry-drain.d.ts +1 -0
- package/lib/commands/compute/list/telemetry-drain.js +2 -1
- package/lib/commands/compute/list/telemetry-drain.js.map +1 -1
- package/lib/commands/compute/list.d.ts +1 -0
- package/lib/commands/compute/list.js +2 -1
- package/lib/commands/compute/list.js.map +1 -1
- package/lib/commands/compute/scale.d.ts +1 -0
- package/lib/commands/compute/scale.js +2 -1
- package/lib/commands/compute/scale.js.map +1 -1
- package/lib/commands/compute/set/config.d.ts +1 -0
- package/lib/commands/compute/set/config.js +2 -1
- package/lib/commands/compute/set/config.js.map +1 -1
- package/lib/commands/compute/source/retrieve.d.ts +1 -0
- package/lib/commands/compute/source/retrieve.js +2 -1
- package/lib/commands/compute/source/retrieve.js.map +1 -1
- package/lib/commands/compute/tail/runtime-log.d.ts +1 -0
- package/lib/commands/compute/tail/runtime-log.js +22 -6
- package/lib/commands/compute/tail/runtime-log.js.map +1 -1
- package/lib/commands/compute/unset/config.d.ts +1 -0
- package/lib/commands/compute/unset/config.js +2 -1
- package/lib/commands/compute/unset/config.js.map +1 -1
- package/lib/commands/compute/update/telemetry-drain.d.ts +1 -0
- package/lib/commands/compute/update/telemetry-drain.js +2 -1
- package/lib/commands/compute/update/telemetry-drain.js.map +1 -1
- package/lib/shared/computeGenerateSkeletons.js +4 -2
- package/lib/shared/computeGenerateSkeletons.js.map +1 -1
- package/lib/shared/computeLogStream.d.ts +6 -1
- package/lib/shared/computeLogStream.js +30 -3
- package/lib/shared/computeLogStream.js.map +1 -1
- package/lib/shared/computeTelemetryDrain.d.ts +1 -0
- package/lib/shared/computeTelemetryDrain.js +5 -8
- package/lib/shared/computeTelemetryDrain.js.map +1 -1
- package/messages/compute.create.telemetry-drain.md +1 -1
- package/messages/compute.delete.telemetry-drain.md +41 -0
- package/messages/compute.deploy.md +12 -70
- package/messages/compute.display.telemetry-drain.md +1 -0
- package/messages/compute.errors.md +15 -5
- package/messages/compute.get.runtime-log.md +19 -0
- package/messages/compute.source.retrieve.md +1 -1
- package/messages/compute.update.telemetry-drain.md +1 -1
- package/npm-shrinkwrap.json +147 -504
- package/oclif.manifest.json +202 -19
- package/package.json +4 -4
- package/schemas/compute-delete-telemetry__drain.json +22 -0
- package/schemas/compute-deploy.json +0 -30
|
@@ -56,6 +56,7 @@ export default class TelemetryDrainList extends SfCommand {
|
|
|
56
56
|
summary: messages.getMessage('flags.name.summary'),
|
|
57
57
|
}),
|
|
58
58
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
59
|
+
'api-version': Flags.orgApiVersion(),
|
|
59
60
|
};
|
|
60
61
|
// Org-mediated lookup by --name -- no local project files are read.
|
|
61
62
|
static requiresProject = false;
|
|
@@ -64,7 +65,7 @@ export default class TelemetryDrainList extends SfCommand {
|
|
|
64
65
|
const { flags } = await this.parse(TelemetryDrainList);
|
|
65
66
|
const name = requireAppName(flags.name ?? (await resolveComputeAppNameFromDir(process.cwd())));
|
|
66
67
|
validateName(name);
|
|
67
|
-
const connection = flags['target-org'].getConnection();
|
|
68
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
68
69
|
const appId = await resolveHerokuAppId(connection, name);
|
|
69
70
|
const fetched = await listTelemetryDrainsViaProxy(connection, { name, appId });
|
|
70
71
|
// The API order is unspecified, so sort client-side by endpoint for a stable, scannable table.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry-drain.js","sourceRoot":"","sources":["../../../../src/commands/compute/list/telemetry-drain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAC,2BAA2B,EAAC,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,8BAA8B,CAAC,CAAC;AAEpF,iGAAiG;AACjG,MAAM,IAAI,GAAG,GAAG,CAAC;AAYjB,iGAAiG;AACjG,wEAAwE;AACxE,SAAS,eAAe,CAAC,CAAqB,EAAE,CAAqB;IACnE,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC,CAAC;IAC/B,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC;AAED,kGAAkG;AAClG,gGAAgG;AAChG,SAAS,gBAAgB,CACvB,CAAoD,EACpD,CAAoD;IAEpD,OAAO,eAAe,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,SAAS,KAAK,CAAC,KAAwD;IACrE,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,IAAI;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI;QACnE,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;KACjC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,kBAAmB,SAAQ,SAA0C;IACjF,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,kBAAkB;YACvB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACnD,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry-drain.js","sourceRoot":"","sources":["../../../../src/commands/compute/list/telemetry-drain.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export default class List extends SfCommand<ComputeListResult> {
|
|
|
6
6
|
static readonly examples: string[];
|
|
7
7
|
static readonly flags: {
|
|
8
8
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
9
10
|
};
|
|
10
11
|
static readonly requiresProject = false;
|
|
11
12
|
static readonly summary: string;
|
|
@@ -32,13 +32,14 @@ export default class List extends SfCommand {
|
|
|
32
32
|
static examples = messages.getMessages('examples');
|
|
33
33
|
static flags = {
|
|
34
34
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
35
|
+
'api-version': Flags.orgApiVersion(),
|
|
35
36
|
};
|
|
36
37
|
// Pure org-side lookup -- no local project files are read.
|
|
37
38
|
static requiresProject = false;
|
|
38
39
|
static summary = messages.getMessage('summary');
|
|
39
40
|
async run() {
|
|
40
41
|
const { flags } = await this.parse(List);
|
|
41
|
-
const connection = flags['target-org'].getConnection();
|
|
42
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
42
43
|
const records = await listComputeApps(connection);
|
|
43
44
|
const results = records.map(record => toComputeAppSummary(record));
|
|
44
45
|
if (results.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/compute/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAyB,eAAe,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAC1G,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAWpE,SAAS,KAAK,CAAC,GAAsB;IACnC,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,GAAG;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,SAA4B;IACrD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/compute/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAyB,eAAe,EAAE,mBAAmB,EAAC,MAAM,8BAA8B,CAAC;AAC1G,OAAO,EAAC,WAAW,EAAC,MAAM,6BAA6B,CAAC;AAExD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;AAWpE,SAAS,KAAK,CAAC,GAAsB;IACnC,OAAO;QACL,IAAI,EAAE,GAAG,CAAC,IAAI;QACd,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,YAAY,EAAE,GAAG,CAAC,YAAY,IAAI,GAAG;KACtC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,OAAO,IAAK,SAAQ,SAA4B;IACrD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;QAC5C,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE;KACrC,CAAC;IAEF,2DAA2D;IACpD,MAAM,CAAU,eAAe,GAAG,KAAK,CAAC;IAExC,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAEzD,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC;YACnD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QAClD,MAAM,OAAO,GAAqB,CAAC,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;QACpF,IAAI,CAAC,KAAK,CAAC,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC;QAE5B,OAAO,OAAO,CAAC;IACjB,CAAC"}
|
|
@@ -13,6 +13,7 @@ export default class Scale extends SfCommand<ComputeScaleResult> {
|
|
|
13
13
|
static readonly flags: {
|
|
14
14
|
name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
15
15
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
17
|
'process-type': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
18
|
quantity: import("@oclif/core/interfaces").OptionFlag<number | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
18
19
|
size: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
@@ -59,6 +59,7 @@ export default class Scale extends SfCommand {
|
|
|
59
59
|
summary: messages.getMessage('flags.name.summary'),
|
|
60
60
|
}),
|
|
61
61
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
62
|
+
'api-version': Flags.orgApiVersion(),
|
|
62
63
|
'process-type': Flags.string({
|
|
63
64
|
required: true,
|
|
64
65
|
summary: messages.getMessage('flags.process-type.summary'),
|
|
@@ -93,7 +94,7 @@ export default class Scale extends SfCommand {
|
|
|
93
94
|
throw messages.createError('error.scaleInvalidSize', [flags.size, VALID_SIZES.join(', ')]);
|
|
94
95
|
}
|
|
95
96
|
}
|
|
96
|
-
const connection = flags['target-org'].getConnection();
|
|
97
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
97
98
|
const appId = await resolveHerokuAppId(connection, name);
|
|
98
99
|
this.spinner.start('Scaling dynos');
|
|
99
100
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scale.js","sourceRoot":"","sources":["../../../src/commands/compute/scale.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"scale.js","sourceRoot":"","sources":["../../../src/commands/compute/scale.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export default class ConfigSet extends SfCommand<ComputeConfigSetResult> {
|
|
|
14
14
|
static readonly flags: {
|
|
15
15
|
name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
16
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
18
|
};
|
|
18
19
|
static readonly hiddenAliases: string[];
|
|
19
20
|
static readonly requiresProject = false;
|
|
@@ -42,6 +42,7 @@ export default class ConfigSet extends SfCommand {
|
|
|
42
42
|
summary: messages.getMessage('flags.name.summary'),
|
|
43
43
|
}),
|
|
44
44
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
45
|
+
'api-version': Flags.orgApiVersion(),
|
|
45
46
|
};
|
|
46
47
|
// Back-compat: the command was `compute config set` before the verb-noun migration (W-24542276).
|
|
47
48
|
// Kept as a hidden deprecated alias -- deprecateAliases above still prints a one-line warning
|
|
@@ -76,7 +77,7 @@ export default class ConfigSet extends SfCommand {
|
|
|
76
77
|
}
|
|
77
78
|
// No existence check first, unlike get/unset -- set is also how a brand-new config var gets
|
|
78
79
|
// created, so a nonexistent key here isn't an error, it's the normal creation path.
|
|
79
|
-
const connection = flags['target-org'].getConnection();
|
|
80
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
80
81
|
const appId = await resolveHerokuAppId(connection, name);
|
|
81
82
|
this.spinner.start(`Setting config vars and restarting ${name}`);
|
|
82
83
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/commands/compute/set/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAC,iCAAiC,EAAE,+BAA+B,EAAC,MAAM,mCAAmC,CAAC;AACrH,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;AAE1E,8FAA8F;AAC9F,2DAA2D;AAC3D,MAAM,YAAY,GAAG,iBAAiB,CAAC;AAQvC,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,SAAiC;IAC/D,MAAM,CAAU,IAAI,GAAG;QAC5B,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;YAChB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;SAClD,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IACxC,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,kBAAkB;YACvB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACnD,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/commands/compute/set/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ export default class Retrieve extends SfCommand<ComputeSourceRetrieveResult> {
|
|
|
10
10
|
static readonly flags: {
|
|
11
11
|
name: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
12
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
14
|
'output-dir': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
15
|
};
|
|
15
16
|
static readonly requiresProject = true;
|
|
@@ -33,6 +33,7 @@ export default class Retrieve extends SfCommand {
|
|
|
33
33
|
summary: messages.getMessage('flags.name.summary'),
|
|
34
34
|
}),
|
|
35
35
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
36
|
+
'api-version': Flags.orgApiVersion(),
|
|
36
37
|
'output-dir': Flags.directory({
|
|
37
38
|
char: 'd',
|
|
38
39
|
summary: messages.getMessage('flags.output-dir.summary'),
|
|
@@ -50,7 +51,7 @@ export default class Retrieve extends SfCommand {
|
|
|
50
51
|
if (await pathExists(appDir)) {
|
|
51
52
|
throw messages.createError('error.appAlreadyExists', [name, appDir]);
|
|
52
53
|
}
|
|
53
|
-
const connection = flags['target-org'].getConnection();
|
|
54
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
54
55
|
const username = connection.getUsername() ?? flags['target-org'].getUsername() ?? '<org>';
|
|
55
56
|
this.log(messages.getMessage('info.retrieving', [name, username]));
|
|
56
57
|
// No rollback on failure below -- if either API call fails, appDir is left in place,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../../src/commands/compute/source/retrieve.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,KAAK,EAAC,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAC,UAAU,EAAE,aAAa,EAAE,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAC,mBAAmB,EAAC,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAC,qBAAqB,EAAC,MAAM,sCAAsC,CAAC;AAC3E,OAAO,EAAC,uBAAuB,EAAC,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,yBAAyB,CAAC,CAAC;AAQ/E,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,SAAsC;IACnE,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACnD,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;QAC5C,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC;YAC5B,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACxD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,8BAA8B,CAAC;YAChE,OAAO,EAAE,4CAA4C;SACtD,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,eAAe,GAAG,IAAI,CAAC;IAEvC,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAEzD,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,EAAC,IAAI,EAAC,GAAG,KAAK,CAAC;QACrB,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,CAAC,CAAC;QACxD,IAAI,MAAM,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7B,MAAM,QAAQ,CAAC,WAAW,CAAC,wBAAwB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"retrieve.js","sourceRoot":"","sources":["../../../../src/commands/compute/source/retrieve.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export default class TailRuntimeLog extends SfCommand<ComputeTailRuntimeLogResul
|
|
|
9
9
|
static readonly flags: {
|
|
10
10
|
name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
11
11
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
12
13
|
num: import("@oclif/core/interfaces").OptionFlag<number, import("@oclif/core/interfaces").CustomOptions>;
|
|
13
14
|
};
|
|
14
15
|
static readonly requiresProject = false;
|
|
@@ -35,6 +35,7 @@ export default class TailRuntimeLog extends SfCommand {
|
|
|
35
35
|
summary: messages.getMessage('flags.name.summary'),
|
|
36
36
|
}),
|
|
37
37
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
38
|
+
'api-version': Flags.orgApiVersion(),
|
|
38
39
|
num: Flags.integer({
|
|
39
40
|
default: 100,
|
|
40
41
|
summary: messages.getMessage('flags.num.summary'),
|
|
@@ -48,7 +49,7 @@ export default class TailRuntimeLog extends SfCommand {
|
|
|
48
49
|
const { num } = flags;
|
|
49
50
|
const name = requireAppName(flags.name ?? (await resolveComputeAppNameFromDir(process.cwd())));
|
|
50
51
|
validateName(name);
|
|
51
|
-
const connection = flags['target-org'].getConnection();
|
|
52
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
52
53
|
const record = await queryComputeApp(connection, name);
|
|
53
54
|
const { currentBuild } = toComputeAppSummary(record);
|
|
54
55
|
if (!currentBuild) {
|
|
@@ -61,20 +62,35 @@ export default class TailRuntimeLog extends SfCommand {
|
|
|
61
62
|
});
|
|
62
63
|
this.info(messages.getMessage('info.tailStarting', [name]));
|
|
63
64
|
const controller = new AbortController();
|
|
64
|
-
|
|
65
|
+
// SfCommand._run() registers SIGINT listeners that throw ExitError from inside the signal
|
|
66
|
+
// event, ahead of any listener added here, so they would kill the process (exit 1, stack
|
|
67
|
+
// trace) before ours could abort the stream. Take over SIGINT for the stream's duration,
|
|
68
|
+
// deliberately displacing every inherited listener (under sf that is SfCommand's own) and
|
|
69
|
+
// restoring them afterwards.
|
|
70
|
+
const inherited = process.listeners('SIGINT');
|
|
71
|
+
process.removeAllListeners('SIGINT');
|
|
72
|
+
process.once('SIGINT', () => {
|
|
65
73
|
controller.abort();
|
|
66
|
-
};
|
|
67
|
-
|
|
74
|
+
});
|
|
75
|
+
let wasAborted;
|
|
68
76
|
try {
|
|
69
77
|
const reason = await streamLogplexOutput(session.logplexUrl, line => {
|
|
70
78
|
this.log(line);
|
|
71
79
|
}, controller.signal);
|
|
72
|
-
|
|
80
|
+
wasAborted = reason === 'aborted';
|
|
81
|
+
this.info(wasAborted
|
|
73
82
|
? messages.getMessage('info.tailStopped', [name])
|
|
74
83
|
: messages.getMessage('info.tailStreamEnded', [name]));
|
|
75
84
|
}
|
|
76
85
|
finally {
|
|
77
|
-
process.
|
|
86
|
+
process.removeAllListeners('SIGINT');
|
|
87
|
+
for (const listener of inherited) {
|
|
88
|
+
process.on('SIGINT', listener);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
// 130 = 128 + SIGINT. Set rather than thrown so the quiet stop still exits like an interrupt.
|
|
92
|
+
if (wasAborted) {
|
|
93
|
+
process.exitCode = 130;
|
|
78
94
|
}
|
|
79
95
|
return { name };
|
|
80
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime-log.js","sourceRoot":"","sources":["../../../../src/commands/compute/tail/runtime-log.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAC,mBAAmB,EAAC,MAAM,qCAAqC,CAAC;AACxE,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAE,mBAAmB,EAAC,MAAM,iCAAiC,CAAC;AACzG,OAAO,EAAC,+BAA+B,EAAC,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC;AAMhF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,SAAsC;IACzE,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAExE,sFAAsF;IACtF,wFAAwF;IACjF,MAAM,CAAU,cAAc,GAAG,KAAK,CAAC;IAEvC,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,kBAAkB;YACvB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACnD,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;QAC5C,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC;YACjB,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC;SAClD,CAAC;KACH,CAAC;IAEF,oEAAoE;IAC7D,MAAM,CAAU,eAAe,GAAG,KAAK,CAAC;IAExC,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAEzD,KAAK,CAAC,GAAG;QACd,MAAM,EAAC,KAAK,EAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,EAAC,GAAG,EAAC,GAAG,KAAK,CAAC;QACpB,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,4BAA4B,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/F,YAAY,CAAC,IAAI,CAAC,CAAC;QAEnB,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"runtime-log.js","sourceRoot":"","sources":["../../../../src/commands/compute/tail/runtime-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,7 @@ export default class ConfigUnset extends SfCommand<ComputeConfigUnsetResult> {
|
|
|
14
14
|
static readonly flags: {
|
|
15
15
|
name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
16
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
17
18
|
};
|
|
18
19
|
static readonly hiddenAliases: string[];
|
|
19
20
|
static readonly requiresProject = false;
|
|
@@ -40,6 +40,7 @@ export default class ConfigUnset extends SfCommand {
|
|
|
40
40
|
summary: messages.getMessage('flags.name.summary'),
|
|
41
41
|
}),
|
|
42
42
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
43
|
+
'api-version': Flags.orgApiVersion(),
|
|
43
44
|
};
|
|
44
45
|
// Back-compat: the command was `compute config unset` before the verb-noun migration (W-24542276).
|
|
45
46
|
// Kept as a hidden deprecated alias -- deprecateAliases above still prints a one-line warning
|
|
@@ -62,7 +63,7 @@ export default class ConfigUnset extends SfCommand {
|
|
|
62
63
|
throw messages.createError('error.configUnsetNoKeysSpecified');
|
|
63
64
|
}
|
|
64
65
|
const keys = [...new Set(tokens)];
|
|
65
|
-
const connection = flags['target-org'].getConnection();
|
|
66
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
66
67
|
const appId = await resolveHerokuAppId(connection, name);
|
|
67
68
|
// Heroku's own PATCH is idempotent about unsetting a key that's already absent -- it
|
|
68
69
|
// wouldn't error -- but the CLI UX wants a hard error for that case, so it's checked
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/commands/compute/unset/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EAAC,cAAc,EAAE,4BAA4B,EAAE,YAAY,EAAC,MAAM,+BAA+B,CAAC;AACzG,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnE,OAAO,EACL,8BAA8B,EAC9B,iCAAiC,EACjC,+BAA+B,GAChC,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC;AAQ5E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAmC;IACnE,MAAM,CAAU,IAAI,GAAG;QAC5B,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,kBAAkB,CAAC;SACjD,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,gBAAgB,GAAG,IAAI,CAAC;IACxC,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC;YACjB,IAAI,EAAE,GAAG;YACT,GAAG,EAAE,kBAAkB;YACvB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC;SACnD,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../src/commands/compute/unset/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export default class TelemetryDrainUpdate extends SfCommand<ComputeTelemetryDrai
|
|
|
13
13
|
transport: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
14
14
|
header: import("@oclif/core/interfaces").OptionFlag<string[] | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
15
15
|
'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
|
+
'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
|
|
16
17
|
};
|
|
17
18
|
static readonly requiresProject = false;
|
|
18
19
|
static readonly summary: string;
|
|
@@ -42,6 +42,7 @@ export default class TelemetryDrainUpdate extends SfCommand {
|
|
|
42
42
|
description: messages.getMessage('flags.header.description'),
|
|
43
43
|
}),
|
|
44
44
|
'target-org': Flags.requiredOrg({ char: 'o' }),
|
|
45
|
+
'api-version': Flags.orgApiVersion(),
|
|
45
46
|
};
|
|
46
47
|
static requiresProject = false;
|
|
47
48
|
static summary = messages.getMessage('summary');
|
|
@@ -57,7 +58,7 @@ export default class TelemetryDrainUpdate extends SfCommand {
|
|
|
57
58
|
const endpoint = flags.url;
|
|
58
59
|
const hasExporterChange = endpoint !== undefined || type !== undefined || headers !== undefined;
|
|
59
60
|
const exporter = hasExporterChange ? { endpoint, type, headers } : undefined;
|
|
60
|
-
const connection = flags['target-org'].getConnection();
|
|
61
|
+
const connection = flags['target-org'].getConnection(flags['api-version']);
|
|
61
62
|
const drain = await updateTelemetryDrainViaProxy(connection, { drainId: args.id, signals, exporter });
|
|
62
63
|
// Fall back to the requested ID if the response omits it, so --json never reports an empty id.
|
|
63
64
|
const drainResult = toTelemetryDrainResult(drain);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry-drain.js","sourceRoot":"","sources":["../../../../src/commands/compute/update/telemetry-drain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,IAAI,EAAC,MAAM,aAAa,CAAC;AACjC,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAC,KAAK,EAAE,SAAS,EAAC,MAAM,6BAA6B,CAAC;AAE7D,OAAO,EACL,wBAAwB,EACxB,gBAAgB,EAEhB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAC,4BAA4B,EAAC,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAC,WAAW,EAAC,MAAM,gCAAgC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,gCAAgC,CAAC,CAAC;AAItF,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,SAA4C;IAC5F,6EAA6E;IACtE,MAAM,CAAU,IAAI,GAAG;QAC5B,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC;YACd,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,iBAAiB,CAAC;SAChD,CAAC;KACH,CAAC;IAEK,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,KAAK,GAAG;QAC7B,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAC,CAAC;QACtE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAC,CAAC;QAC9E,kEAAkE;QAClE,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,EAAC,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,yBAAyB,CAAC,EAAC,CAAC;QAClF,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC;YACnB,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;YACpD,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;SAC7D,CAAC;QACF,YAAY,EAAE,KAAK,CAAC,WAAW,CAAC,EAAC,IAAI,EAAE,GAAG,EAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry-drain.js","sourceRoot":"","sources":["../../../../src/commands/compute/update/telemetry-drain.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,7 +115,8 @@ npm run dev
|
|
|
115
115
|
## Deploy
|
|
116
116
|
|
|
117
117
|
\`\`\`
|
|
118
|
-
sf
|
|
118
|
+
sf plugins install @salesforce/plugin-deploy-retrieve@compute
|
|
119
|
+
sf project deploy start --metadata PlatformComputeApp:__APP_NAME__ --target-org <org>
|
|
119
120
|
\`\`\`
|
|
120
121
|
`,
|
|
121
122
|
},
|
|
@@ -254,7 +255,8 @@ uvicorn app.main:app --reload
|
|
|
254
255
|
## Deploy
|
|
255
256
|
|
|
256
257
|
\`\`\`
|
|
257
|
-
sf
|
|
258
|
+
sf plugins install @salesforce/plugin-deploy-retrieve@compute
|
|
259
|
+
sf project deploy start --metadata PlatformComputeApp:__APP_NAME__ --target-org <org>
|
|
258
260
|
\`\`\`
|
|
259
261
|
`,
|
|
260
262
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeGenerateSkeletons.js","sourceRoot":"","sources":["../../src/shared/computeGenerateSkeletons.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,6FAA6F;AAC7F,0FAA0F;AAC1F,8FAA8F;AAC9F,+FAA+F;AAC/F,iGAAiG;AACjG,+FAA+F;AAC/F,+CAA+C;AAC/C,EAAE;AACF,sFAAsF;AACtF,0FAA0F;AAC1F,MAAM,CAAC,MAAM,mBAAmB,GAA6C;IAC3E,IAAI,EAAE;QACJ,cAAc,EAAE;;;;;;;;;;;CAWnB;QACG,eAAe,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB;QACG,qBAAqB,EAAE;;;;;;;;;;;;;;CAc1B;QACG,iCAAiC,EAAE;;;;;;;;;;;;CAYtC;QACG,WAAW,EAAE
|
|
1
|
+
{"version":3,"file":"computeGenerateSkeletons.js","sourceRoot":"","sources":["../../src/shared/computeGenerateSkeletons.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,6FAA6F;AAC7F,0FAA0F;AAC1F,8FAA8F;AAC9F,+FAA+F;AAC/F,iGAAiG;AACjG,+FAA+F;AAC/F,+CAA+C;AAC/C,EAAE;AACF,sFAAsF;AACtF,0FAA0F;AAC1F,MAAM,CAAC,MAAM,mBAAmB,GAA6C;IAC3E,IAAI,EAAE;QACJ,cAAc,EAAE;;;;;;;;;;;CAWnB;QACG,eAAe,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB;QACG,qBAAqB,EAAE;;;;;;;;;;;;;;CAc1B;QACG,iCAAiC,EAAE;;;;;;;;;;;;CAYtC;QACG,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BhB;KACE;IACD,MAAM,EAAE;QACN,cAAc,EAAE;;;;;;;;;;;CAWnB;QACG,eAAe,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;CAyBpB;QACG,aAAa,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkElB;QACG,WAAW,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgChB;KACE;CACF,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare const LOGPLEX_FETCH_TIMEOUT_MS = 30000;
|
|
2
|
+
export type LogplexSnapshot = {
|
|
3
|
+
output: string;
|
|
4
|
+
timedOut: boolean;
|
|
5
|
+
};
|
|
6
|
+
export declare function fetchLogplexOutput(logplexUrl: string, timeoutMs?: number): Promise<LogplexSnapshot>;
|
|
2
7
|
export declare function fetchBuildOutputStream(outputStreamUrl: string): Promise<string>;
|
|
3
8
|
export type StreamEndReason = 'aborted' | 'eof';
|
|
4
9
|
export declare function streamLogplexOutput(logplexUrl: string, onLine: (line: string) => void, signal?: AbortSignal): Promise<StreamEndReason>;
|
|
@@ -21,15 +21,42 @@ const messages = Messages.loadMessages(PLUGIN_NAME, 'compute.errors');
|
|
|
21
21
|
// handed back by a Heroku proxy call) -- these calls are raw fetch against the URL Heroku gave
|
|
22
22
|
// us, not connection.request() (wrong host, no Salesforce bearer token applies) and not a
|
|
23
23
|
// Heroku-token-bearing client (wrong host, no Heroku bearer token held client-side).
|
|
24
|
-
|
|
24
|
+
// Fir apps keep no log history, so their session URL streams and never closes; the timeout also
|
|
25
|
+
// covers a Cedar logplex that stalls, so the one-shot fetch can never wait indefinitely.
|
|
26
|
+
export const LOGPLEX_FETCH_TIMEOUT_MS = 30_000;
|
|
27
|
+
// On timeout, returns the partial output if any arrived rather than discarding it; throws only
|
|
28
|
+
// when nothing arrived before the deadline.
|
|
29
|
+
export async function fetchLogplexOutput(logplexUrl, timeoutMs = LOGPLEX_FETCH_TIMEOUT_MS) {
|
|
30
|
+
const signal = AbortSignal.timeout(timeoutMs);
|
|
31
|
+
let output = '';
|
|
25
32
|
try {
|
|
26
|
-
const response = await fetch(logplexUrl);
|
|
33
|
+
const response = await fetch(logplexUrl, { signal });
|
|
27
34
|
if (!response.ok) {
|
|
28
35
|
throw new Error(`HTTP ${response.status}`);
|
|
29
36
|
}
|
|
30
|
-
|
|
37
|
+
if (!response.body) {
|
|
38
|
+
return { output: await response.text(), timedOut: false };
|
|
39
|
+
}
|
|
40
|
+
const reader = response.body.getReader();
|
|
41
|
+
const decoder = new TextDecoder();
|
|
42
|
+
while (true) {
|
|
43
|
+
// Sequential reads of one ordered stream -- there's nothing to parallelize.
|
|
44
|
+
// eslint-disable-next-line no-await-in-loop
|
|
45
|
+
const { done, value } = await reader.read();
|
|
46
|
+
if (done) {
|
|
47
|
+
break;
|
|
48
|
+
}
|
|
49
|
+
output += decoder.decode(value, { stream: true });
|
|
50
|
+
}
|
|
51
|
+
return { output: output + decoder.decode(), timedOut: false };
|
|
31
52
|
}
|
|
32
53
|
catch (error) {
|
|
54
|
+
if (signal.aborted) {
|
|
55
|
+
if (output.length > 0) {
|
|
56
|
+
return { output, timedOut: true };
|
|
57
|
+
}
|
|
58
|
+
throw messages.createError('error.logFetchTimedOut', [String(Math.round(timeoutMs / 1000))]);
|
|
59
|
+
}
|
|
33
60
|
throw messages.createError('error.logStreamFailed', [error.message]);
|
|
34
61
|
}
|
|
35
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeLogStream.js","sourceRoot":"","sources":["../../src/shared/computeLogStream.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAEtE,iGAAiG;AACjG,+FAA+F;AAC/F,0FAA0F;AAC1F,qFAAqF;AAErF,MAAM,CAAC,KAAK,UAAU,kBAAkB,
|
|
1
|
+
{"version":3,"file":"computeLogStream.js","sourceRoot":"","sources":["../../src/shared/computeLogStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { components } from '../generated/heroku-platform-api.js';
|
|
2
2
|
import type { TelemetryExporterType, TelemetrySignal } from './herokuProxyApi.js';
|
|
3
|
+
export declare function maskHeaderValues(headers: Record<string, string>): Record<string, string>;
|
|
3
4
|
export declare const TELEMETRY_SIGNALS: readonly TelemetrySignal[];
|
|
4
5
|
export declare const TELEMETRY_TRANSPORTS: readonly string[];
|
|
5
6
|
export declare const PUBLIC_TRANSPORTS: readonly string[];
|
|
@@ -20,13 +20,10 @@ const messages = Messages.loadMessages(PLUGIN_NAME, 'compute.errors');
|
|
|
20
20
|
// Placeholder for a drain field the platform left unset -- matches the dash the other compute
|
|
21
21
|
// tables use so single-drain display reads consistently.
|
|
22
22
|
const DASH = '-';
|
|
23
|
-
// Exporter
|
|
24
|
-
//
|
|
25
|
-
// can't leak into terminal scrollback, screen-shares, or screenshots. The machine-readable --json
|
|
26
|
-
// result keeps them verbatim -- same trust boundary as the authenticated caller (see
|
|
27
|
-
// display/telemetry-drain.ts). Masks a copy; never mutates the caller's drain object.
|
|
23
|
+
// Exporter headers routinely carry credentials, so both human and JSON output mask every value.
|
|
24
|
+
// Mask a copy to preserve credentials in API requests and the caller's drain object.
|
|
28
25
|
const REDACTED = '<redacted>';
|
|
29
|
-
function maskHeaderValues(headers) {
|
|
26
|
+
export function maskHeaderValues(headers) {
|
|
30
27
|
return Object.fromEntries(Object.keys(headers).map(key => [key, REDACTED]));
|
|
31
28
|
}
|
|
32
29
|
// The three OpenTelemetry signal categories a drain can forward. Order matches the
|
|
@@ -96,7 +93,7 @@ export function parseHeaderFlags(inputs) {
|
|
|
96
93
|
const entries = inputs.map((input) => {
|
|
97
94
|
const match = HEADER_PATTERN.exec(input);
|
|
98
95
|
if (!match) {
|
|
99
|
-
throw messages.createError('error.invalidHeader'
|
|
96
|
+
throw messages.createError('error.invalidHeader');
|
|
100
97
|
}
|
|
101
98
|
return [match[1], match[2]];
|
|
102
99
|
});
|
|
@@ -109,7 +106,7 @@ export function toTelemetryDrainResult(drain) {
|
|
|
109
106
|
endpoint: drain.exporter?.endpoint,
|
|
110
107
|
exporterType: drain.exporter?.type,
|
|
111
108
|
transport: drain.exporter?.type ? transportLabelForExporterType(drain.exporter.type) : undefined,
|
|
112
|
-
headers: drain.exporter?.headers,
|
|
109
|
+
headers: drain.exporter?.headers === undefined ? undefined : maskHeaderValues(drain.exporter.headers),
|
|
113
110
|
};
|
|
114
111
|
}
|
|
115
112
|
//# sourceMappingURL=computeTelemetryDrain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"computeTelemetryDrain.js","sourceRoot":"","sources":["../../src/shared/computeTelemetryDrain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAK1C,OAAO,EAAC,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAE7C,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAC;AAEtE,8FAA8F;AAC9F,yDAAyD;AACzD,MAAM,IAAI,GAAG,GAAG,CAAC;AAEjB,
|
|
1
|
+
{"version":3,"file":"computeTelemetryDrain.js","sourceRoot":"","sources":["../../src/shared/computeTelemetryDrain.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ Header to send with each export, as key=value.
|
|
|
36
36
|
|
|
37
37
|
Repeat the flag to send more than one header. Header values often carry
|
|
38
38
|
credentials; they are sent to the endpoint and are never printed to the
|
|
39
|
-
terminal
|
|
39
|
+
terminal or --json output; header keys are preserved with redacted values.
|
|
40
40
|
|
|
41
41
|
# info.created
|
|
42
42
|
|