@heroku/sdk 0.11.1 → 0.11.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/dist/core/extensions-proxy.js +51 -1
- package/dist/core/with-signal.d.ts +19 -0
- package/dist/core/with-signal.js +20 -0
- package/dist/resources/data/database.js +19 -6
- package/dist/resources/data/internal/resolve-pg-database.js +4 -7
- package/dist/resources/data/maintenance.js +4 -1
- package/dist/resources/data/postgres-database.js +4 -1
- package/dist/resources/data/redis/resolve-by-app.js +2 -1
- package/dist/resources/data/redis/wait-for-ready.d.ts +1 -1
- package/dist/resources/data/redis/wait-for-ready.js +3 -2
- package/dist/resources/data/transfer/capture-and-wait.js +4 -1
- package/dist/resources/data/transfer/restore-and-wait.js +4 -1
- package/dist/resources/data/transfer/wait-for-transfer.js +8 -1
- package/dist/resources/data/transfer-schedule.js +10 -3
- package/dist/resources/extensions/platform.d.ts +3 -0
- package/dist/resources/extensions/platform.js +3 -0
- package/dist/resources/platform/account.d.ts +22 -0
- package/dist/resources/platform/account.js +34 -0
- package/dist/resources/platform/add-on/create-and-wait.js +5 -1
- package/dist/resources/platform/add-on/describe.js +5 -2
- package/dist/resources/platform/add-on/destroy-and-wait.js +2 -3
- package/dist/resources/platform/add-on/list-plans.js +8 -2
- package/dist/resources/platform/add-on/resolve.js +5 -1
- package/dist/resources/platform/add-on/upgrade.js +5 -2
- package/dist/resources/platform/add-on/wait-for-provisioning.js +4 -1
- package/dist/resources/platform/add-on-attachment/resolve.js +2 -3
- package/dist/resources/platform/app/create-and-setup.d.ts +3 -4
- package/dist/resources/platform/app/create-and-setup.js +5 -5
- package/dist/resources/platform/app/diff.js +2 -3
- package/dist/resources/platform/app/index.js +9 -3
- package/dist/resources/platform/app/info.d.ts +4 -0
- package/dist/resources/platform/app/info.js +21 -7
- package/dist/resources/platform/app/transfer.js +2 -1
- package/dist/resources/platform/app/wait-for-acm-certificates.js +2 -1
- package/dist/resources/platform/container/ensure-container-stack.js +2 -1
- package/dist/resources/platform/container/release-images.js +2 -1
- package/dist/resources/platform/container/remove-process-types.js +2 -1
- package/dist/resources/platform/delinquency.d.ts +23 -0
- package/dist/resources/platform/delinquency.js +41 -0
- package/dist/resources/platform/domain/clear-custom-domains.js +2 -1
- package/dist/resources/platform/domain/create-and-wait.js +2 -1
- package/dist/resources/platform/domain/wait-for-ready.js +2 -1
- package/dist/resources/platform/dyno/exec.js +4 -3
- package/dist/resources/platform/dyno/index.js +6 -3
- package/dist/resources/platform/dyno/run.js +2 -1
- package/dist/resources/platform/dyno/wait-for-info.js +2 -1
- package/dist/resources/platform/dyno/wait-for-release.js +2 -1
- package/dist/resources/platform/log-session/index.js +6 -1
- package/dist/resources/platform/pipeline/coupling.js +5 -2
- package/dist/resources/platform/pipeline/index.js +4 -1
- package/dist/resources/platform/pipeline/promotion.js +15 -7
- package/dist/resources/platform/review-app-config/resolve-repo-name.js +4 -3
- package/dist/resources/platform/sni-endpoint/create-and-associate.js +2 -1
- package/dist/resources/platform/space/wait-for-allocated.js +2 -4
- package/dist/resources/platform/team.d.ts +22 -0
- package/dist/resources/platform/team.js +34 -0
- package/dist/resources/platform/telemetry-drain/remove-drains-for-target.js +2 -1
- package/dist/resources/platform/test-run/wait-for-state.js +2 -1
- package/dist/resources/platform/vpn-connection/wait-for-active.js +2 -1
- package/dist/utils/is-abort-error.d.ts +11 -0
- package/dist/utils/is-abort-error.js +14 -0
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import createDebug from 'debug';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
const debug = createDebug('heroku:sdk:resources:add-on-attachment');
|
|
3
4
|
export class AddonAttachmentNotFoundError extends Error {
|
|
4
5
|
resource;
|
|
@@ -47,9 +48,7 @@ export async function resolveAddonAttachment(ctx, appIdentity, attachmentName, o
|
|
|
47
48
|
const { addonService, signal } = options;
|
|
48
49
|
signal?.throwIfAborted();
|
|
49
50
|
debug('resolve app=%s attachment=%s service=%s', appIdentity ?? '<global>', attachmentName, addonService ?? '<any>');
|
|
50
|
-
const platform = ctx.platform
|
|
51
|
-
.withHeaders({ 'Accept-Inclusion': 'addon:plan,config_vars' })
|
|
52
|
-
.withOptions({ signal });
|
|
51
|
+
const platform = withSignal(ctx.platform.withHeaders({ 'Accept-Inclusion': 'addon:plan,config_vars' }), signal);
|
|
53
52
|
const matches = await platform.addOnAttachment.resolution({
|
|
54
53
|
// eslint-disable-next-line camelcase
|
|
55
54
|
addon_attachment: attachmentName,
|
|
@@ -39,10 +39,9 @@ export type CreateAndSetupInput = {
|
|
|
39
39
|
* spinner. Per the poller contract, `onStart` fires BEFORE any request is
|
|
40
40
|
* dispatched, and `onStop` fires ONLY on success — if a step rejects, the
|
|
41
41
|
* error propagates and `onStop` is never called (there is no try/finally, so
|
|
42
|
-
* the caller's error path stops the spinner). Signal threading
|
|
43
|
-
*
|
|
44
|
-
*
|
|
45
|
-
* pre-flight `throwIfAborted()`.
|
|
42
|
+
* the caller's error path stops the spinner). Signal threading binds the
|
|
43
|
+
* signal to a scoped client (via `withSignal`) so an abort cancels in-flight
|
|
44
|
+
* requests, not just the pre-flight `throwIfAborted()`.
|
|
46
45
|
*
|
|
47
46
|
* The CLI parses flags / heroku.yml into `input` and owns git-remote setup
|
|
48
47
|
* and rendering; this method owns the API orchestration only.
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
/**
|
|
2
3
|
* Create an app and run its post-create setup in one call.
|
|
3
4
|
*
|
|
@@ -13,17 +14,16 @@
|
|
|
13
14
|
* spinner. Per the poller contract, `onStart` fires BEFORE any request is
|
|
14
15
|
* dispatched, and `onStop` fires ONLY on success — if a step rejects, the
|
|
15
16
|
* error propagates and `onStop` is never called (there is no try/finally, so
|
|
16
|
-
* the caller's error path stops the spinner). Signal threading
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
* pre-flight `throwIfAborted()`.
|
|
17
|
+
* the caller's error path stops the spinner). Signal threading binds the
|
|
18
|
+
* signal to a scoped client (via `withSignal`) so an abort cancels in-flight
|
|
19
|
+
* requests, not just the pre-flight `throwIfAborted()`.
|
|
20
20
|
*
|
|
21
21
|
* The CLI parses flags / heroku.yml into `input` and owns git-remote setup
|
|
22
22
|
* and rendering; this method owns the API orchestration only.
|
|
23
23
|
*/
|
|
24
24
|
export async function createAndSetup(ctx, input, options = {}) {
|
|
25
25
|
options.signal?.throwIfAborted();
|
|
26
|
-
const platform =
|
|
26
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
27
27
|
const { addons, buildpack, configVars, ...createParams } = input;
|
|
28
28
|
const app = (createParams.space || createParams.team)
|
|
29
29
|
? (await platform.teamApp.create(createParams))
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { NotFoundError } from '@heroku/heroku-fetch';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
async function checksum(platform, app) {
|
|
3
4
|
try {
|
|
4
5
|
const releases = await platform.withHeaders({ Range: 'version ..; max=1, order=desc' }).release.list(app);
|
|
@@ -95,9 +96,7 @@ async function diffFeatures(platform, app1, app2) {
|
|
|
95
96
|
*/
|
|
96
97
|
export async function diffApps(ctx, app1, app2, options = {}) {
|
|
97
98
|
options.signal?.throwIfAborted();
|
|
98
|
-
const platform = options.signal
|
|
99
|
-
? ctx.platform.withOptions({ signal: options.signal })
|
|
100
|
-
: ctx.platform;
|
|
99
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
101
100
|
const files = await diffFiles(platform, app1, app2);
|
|
102
101
|
const [env, stack, bp, addons, features] = await Promise.all([
|
|
103
102
|
diffEnv(platform, app1, app2),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
import { createAndSetup } from './create-and-setup.js';
|
|
3
4
|
import { diffApps } from './diff.js';
|
|
4
5
|
import { describeApp } from './info.js';
|
|
@@ -11,11 +12,15 @@ export { transferApp } from './transfer.js';
|
|
|
11
12
|
export { waitForACMCertificates } from './wait-for-acm-certificates.js';
|
|
12
13
|
export async function enableMaintenance(ctx, appIdentity, options = {}) {
|
|
13
14
|
options.signal?.throwIfAborted();
|
|
14
|
-
|
|
15
|
+
// Bind the signal so the request aborts in flight.
|
|
16
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
17
|
+
return platform.app.update(appIdentity, { maintenance: true });
|
|
15
18
|
}
|
|
16
19
|
export async function disableMaintenance(ctx, appIdentity, options = {}) {
|
|
17
20
|
options.signal?.throwIfAborted();
|
|
18
|
-
|
|
21
|
+
// Bind the signal so the request aborts in flight.
|
|
22
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
23
|
+
return platform.app.update(appIdentity, { maintenance: false });
|
|
19
24
|
}
|
|
20
25
|
/**
|
|
21
26
|
* Look up the platform generation (`cedar` or `fir`) of an app.
|
|
@@ -28,7 +33,8 @@ export async function disableMaintenance(ctx, appIdentity, options = {}) {
|
|
|
28
33
|
*/
|
|
29
34
|
export async function getGeneration(ctx, appIdentity, options = {}) {
|
|
30
35
|
options.signal?.throwIfAborted();
|
|
31
|
-
|
|
36
|
+
// Bind the signal so the request aborts in flight.
|
|
37
|
+
const platform = withSignal(ctx.platform, options.signal).withHeaders({
|
|
32
38
|
Accept: 'application/vnd.heroku+json; version=3.sdk',
|
|
33
39
|
});
|
|
34
40
|
const app = await platform.app.info(appIdentity);
|
|
@@ -26,5 +26,9 @@ export type AppInfo = {
|
|
|
26
26
|
* any error collapses to an empty default. The broad .catch is
|
|
27
27
|
* intentional v1 fidelity with the Heroku CLI's apps:info; a future
|
|
28
28
|
* tightening to specific status codes is non-breaking.
|
|
29
|
+
*
|
|
30
|
+
* Cancellation is exempt from the soft-fail: an aborted sub-request
|
|
31
|
+
* rethrows so the whole describe rejects instead of silently returning a
|
|
32
|
+
* partial view when the caller cancelled.
|
|
29
33
|
*/
|
|
30
34
|
export declare function describeApp(ctx: Pick<ResourceCtx, 'platform'>, appIdentity: string, options?: DescribeAppOptions): Promise<AppInfo>;
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
|
+
import { isAbortError } from '../../../utils/is-abort-error.js';
|
|
1
3
|
/**
|
|
2
4
|
* Composite "describe this app" view: parallel-fetches add-ons, the app
|
|
3
5
|
* itself, dynos, collaborators, and the pipeline coupling.
|
|
@@ -7,19 +9,31 @@
|
|
|
7
9
|
* any error collapses to an empty default. The broad .catch is
|
|
8
10
|
* intentional v1 fidelity with the Heroku CLI's apps:info; a future
|
|
9
11
|
* tightening to specific status codes is non-breaking.
|
|
12
|
+
*
|
|
13
|
+
* Cancellation is exempt from the soft-fail: an aborted sub-request
|
|
14
|
+
* rethrows so the whole describe rejects instead of silently returning a
|
|
15
|
+
* partial view when the caller cancelled.
|
|
10
16
|
*/
|
|
11
17
|
export async function describeApp(ctx, appIdentity, options = {}) {
|
|
12
|
-
options
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
18
|
+
const { signal } = options;
|
|
19
|
+
signal?.throwIfAborted();
|
|
20
|
+
const platform = withSignal(ctx.platform, signal);
|
|
21
|
+
// Collapse an expected soft error to a default, but never swallow an abort.
|
|
22
|
+
// Checks the signal's `aborted` flag as well as the error shape so a
|
|
23
|
+
// custom-reason abort (`controller.abort(reason)`), which `isAbortError`
|
|
24
|
+
// alone can't detect, still rejects instead of returning a partial view.
|
|
25
|
+
const softFail = (fallback) => (error) => {
|
|
26
|
+
if (signal?.aborted || isAbortError(error))
|
|
27
|
+
throw error;
|
|
28
|
+
return fallback;
|
|
29
|
+
};
|
|
16
30
|
const [addons, app, dynos, collaborators, pipelineCoupling] = await Promise.all([
|
|
17
31
|
platform.addOn.listByApp(appIdentity),
|
|
18
32
|
platform.app.info(appIdentity),
|
|
19
|
-
platform.dyno.list(appIdentity).catch((
|
|
20
|
-
platform.collaborator.list(appIdentity).catch((
|
|
33
|
+
platform.dyno.list(appIdentity).catch(softFail([])),
|
|
34
|
+
platform.collaborator.list(appIdentity).catch(softFail([])),
|
|
21
35
|
platform.pipelineCoupling.infoByApp(appIdentity)
|
|
22
|
-
.catch((
|
|
36
|
+
.catch(softFail(null)),
|
|
23
37
|
]);
|
|
24
38
|
return {
|
|
25
39
|
addons, app, collaborators, dynos, pipelineCoupling,
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
/**
|
|
2
3
|
* Transfer an app to another user or team.
|
|
3
4
|
*
|
|
@@ -15,7 +16,7 @@
|
|
|
15
16
|
*/
|
|
16
17
|
export async function transferApp(ctx, appIdentity, recipient, options = {}) {
|
|
17
18
|
options.signal?.throwIfAborted();
|
|
18
|
-
const platform =
|
|
19
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
19
20
|
if (options.personalToPersonal) {
|
|
20
21
|
const body = { app: appIdentity, recipient };
|
|
21
22
|
if (options.silent !== undefined)
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { wait } from '../../../utils/wait.js';
|
|
2
3
|
const DEFAULT_WAIT_INTERVAL_MS = 15_000;
|
|
3
4
|
/**
|
|
@@ -16,7 +17,7 @@ const DEFAULT_WAIT_INTERVAL_MS = 15_000;
|
|
|
16
17
|
export async function waitForACMCertificates(ctx, appIdentity, options = {}) {
|
|
17
18
|
const { intervalMs = DEFAULT_WAIT_INTERVAL_MS, signal, timeoutMs } = options;
|
|
18
19
|
signal?.throwIfAborted();
|
|
19
|
-
const platform =
|
|
20
|
+
const platform = withSignal(ctx.platform, signal);
|
|
20
21
|
function terminal(domains) {
|
|
21
22
|
return domains
|
|
22
23
|
.filter(domain => domain.kind === 'custom')
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
export class NotAContainerAppError extends Error {
|
|
2
3
|
app;
|
|
3
4
|
id = 'not_a_container_app';
|
|
@@ -14,7 +15,7 @@ export class NotAContainerAppError extends Error {
|
|
|
14
15
|
export async function ensureContainerStack(ctx, appIdentity, options = {}) {
|
|
15
16
|
const { signal } = options;
|
|
16
17
|
signal?.throwIfAborted();
|
|
17
|
-
const platform =
|
|
18
|
+
const platform = withSignal(ctx.platform, signal);
|
|
18
19
|
const app = await platform.app.info(appIdentity);
|
|
19
20
|
const allowedStack = 'container';
|
|
20
21
|
if (app.build_stack.name !== allowedStack && app.stack.name !== allowedStack) {
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { ensureContainerStack } from './ensure-container-stack.js';
|
|
2
3
|
/**
|
|
3
4
|
* Release Docker images to a container app.
|
|
4
5
|
*/
|
|
5
6
|
export async function releaseDockerImages(ctx, appIdentity, imagesByProcessType, options = {}) {
|
|
6
7
|
await ensureContainerStack(ctx, appIdentity, options);
|
|
7
|
-
const platform =
|
|
8
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
8
9
|
const oldReleases = await platform
|
|
9
10
|
.withHeaders({ Range: 'version ..; max=1, order=desc' })
|
|
10
11
|
.release.list(appIdentity);
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { ensureContainerStack } from './ensure-container-stack.js';
|
|
2
3
|
/**
|
|
3
4
|
* Remove one or more process types from a container app
|
|
4
5
|
*/
|
|
5
6
|
export async function removeProcessTypes(ctx, appIdentity, processTypes, options = {}) {
|
|
6
7
|
await ensureContainerStack(ctx, appIdentity, options);
|
|
7
|
-
const platform =
|
|
8
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
8
9
|
// eslint-disable-next-line camelcase
|
|
9
10
|
const requestBody = { docker_image: null };
|
|
10
11
|
const updatedFormations = [];
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared shape of the platform's delinquency payloads. `AccountDelinquency`
|
|
3
|
+
* and `TeamDelinquency` are structurally identical — each carries the two
|
|
4
|
+
* scheduled timestamps (or `null` when nothing is scheduled) — so a single
|
|
5
|
+
* formatter serves both.
|
|
6
|
+
*/
|
|
7
|
+
export interface DelinquencySchedule {
|
|
8
|
+
scheduled_deletion_time: null | string;
|
|
9
|
+
scheduled_suspension_time: null | string;
|
|
10
|
+
}
|
|
11
|
+
/** The kind of resource a delinquency applies to; used in the message text. */
|
|
12
|
+
export type DelinquencyResource = 'account' | 'team';
|
|
13
|
+
/**
|
|
14
|
+
* Format the delinquency warning sentence for a resource, or `undefined` when
|
|
15
|
+
* there is nothing to say. Pure — formatting only; the caller emits it.
|
|
16
|
+
*
|
|
17
|
+
* Produces a message for an upcoming suspension, a past suspension with an
|
|
18
|
+
* upcoming deletion, or an upcoming deletion. Returns `undefined` when neither
|
|
19
|
+
* timestamp is set, or when a suspension is already past with no deletion
|
|
20
|
+
* scheduled. Dates render in UTC so the message reads the same for every
|
|
21
|
+
* consumer. `now` defaults to the wall clock and is injectable for testing.
|
|
22
|
+
*/
|
|
23
|
+
export declare function formatDelinquencyWarning(resource: DelinquencyResource, delinquency: DelinquencySchedule | null | undefined, now?: number): string | undefined;
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Format the delinquency warning sentence for a resource, or `undefined` when
|
|
3
|
+
* there is nothing to say. Pure — formatting only; the caller emits it.
|
|
4
|
+
*
|
|
5
|
+
* Produces a message for an upcoming suspension, a past suspension with an
|
|
6
|
+
* upcoming deletion, or an upcoming deletion. Returns `undefined` when neither
|
|
7
|
+
* timestamp is set, or when a suspension is already past with no deletion
|
|
8
|
+
* scheduled. Dates render in UTC so the message reads the same for every
|
|
9
|
+
* consumer. `now` defaults to the wall clock and is injectable for testing.
|
|
10
|
+
*/
|
|
11
|
+
export function formatDelinquencyWarning(resource, delinquency, now = Date.now()) {
|
|
12
|
+
const suspension = parseTime(delinquency?.scheduled_suspension_time);
|
|
13
|
+
const deletion = parseTime(delinquency?.scheduled_deletion_time);
|
|
14
|
+
if (!suspension && !deletion)
|
|
15
|
+
return undefined;
|
|
16
|
+
if (suspension) {
|
|
17
|
+
if (suspension > now) {
|
|
18
|
+
return `This ${resource} is delinquent with payment and we'll suspend it on ${new Date(suspension).toUTCString()}.`;
|
|
19
|
+
}
|
|
20
|
+
if (deletion) {
|
|
21
|
+
return `This ${resource} is delinquent with payment and we suspended it on ${new Date(suspension).toUTCString()}.`
|
|
22
|
+
+ ` If the ${resource} is still delinquent, we'll delete it on ${new Date(deletion).toUTCString()}.`;
|
|
23
|
+
}
|
|
24
|
+
return undefined;
|
|
25
|
+
}
|
|
26
|
+
if (deletion) {
|
|
27
|
+
return `This ${resource} is delinquent with payment and we'll delete it on ${new Date(deletion).toUTCString()}.`;
|
|
28
|
+
}
|
|
29
|
+
return undefined;
|
|
30
|
+
}
|
|
31
|
+
/**
|
|
32
|
+
* Parse an ISO timestamp to epoch ms, or `undefined` when it is absent or
|
|
33
|
+
* unparseable. A `0`/`NaN` result is treated as absent so it never trips the
|
|
34
|
+
* truthiness checks above.
|
|
35
|
+
*/
|
|
36
|
+
function parseTime(time) {
|
|
37
|
+
if (!time)
|
|
38
|
+
return undefined;
|
|
39
|
+
const ms = Date.parse(time);
|
|
40
|
+
return Number.isNaN(ms) || ms === 0 ? undefined : ms;
|
|
41
|
+
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
/**
|
|
2
3
|
* Delete all custom domains from an app.
|
|
3
4
|
*
|
|
@@ -7,7 +8,7 @@
|
|
|
7
8
|
export async function clearCustomDomains(ctx, appIdentity, options = {}) {
|
|
8
9
|
const { signal } = options;
|
|
9
10
|
signal?.throwIfAborted();
|
|
10
|
-
const platform =
|
|
11
|
+
const platform = withSignal(ctx.platform, signal);
|
|
11
12
|
// List and filter to custom domains
|
|
12
13
|
const domains = await platform.domain.list(appIdentity);
|
|
13
14
|
const customDomains = domains.filter(d => d.kind === 'custom');
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { waitForReady } from './wait-for-ready.js';
|
|
2
3
|
/**
|
|
3
4
|
* Create a domain with SNI endpoint resolution and optional waiting.
|
|
@@ -11,7 +12,7 @@ import { waitForReady } from './wait-for-ready.js';
|
|
|
11
12
|
export async function createAndWait(ctx, appIdentity, hostname, options = {}) {
|
|
12
13
|
const { poller, resolveSniEndpoint, signal, sniEndpoint, timeoutMs, wait: shouldWait, waitIntervalMs, } = options;
|
|
13
14
|
signal?.throwIfAborted();
|
|
14
|
-
const platform =
|
|
15
|
+
const platform = withSignal(ctx.platform, signal);
|
|
15
16
|
let resolvedSniEndpoint = null;
|
|
16
17
|
if (sniEndpoint) {
|
|
17
18
|
// Explicit SNI endpoint provided
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { wait } from '../../../utils/wait.js';
|
|
2
3
|
const DEFAULT_WAIT_INTERVAL_MS = 5000;
|
|
3
4
|
/**
|
|
@@ -11,7 +12,7 @@ const DEFAULT_WAIT_INTERVAL_MS = 5000;
|
|
|
11
12
|
export async function waitForReady(ctx, appIdentity, options = {}) {
|
|
12
13
|
const { domain, hostname, poller, signal, timeoutMs, waitIntervalMs = DEFAULT_WAIT_INTERVAL_MS, } = options;
|
|
13
14
|
signal?.throwIfAborted();
|
|
14
|
-
const platform =
|
|
15
|
+
const platform = withSignal(ctx.platform, signal);
|
|
15
16
|
let domains;
|
|
16
17
|
if (domain) {
|
|
17
18
|
domains = [domain];
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HerokuApiClient, NotFoundError } from '@heroku/heroku-fetch';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
import { wait } from '../../../utils/wait.js';
|
|
3
4
|
import { waitForInfo } from './wait-for-info.js';
|
|
4
5
|
/** The app feature that gates Heroku Exec. */
|
|
@@ -20,7 +21,7 @@ const DEFAULT_SETTLE_MS = 2000;
|
|
|
20
21
|
*/
|
|
21
22
|
export async function execPrereqs(ctx, appIdentity, options = {}) {
|
|
22
23
|
options.signal?.throwIfAborted();
|
|
23
|
-
const platform =
|
|
24
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
24
25
|
const [app, buildpacks, configVars, feature] = await Promise.all([
|
|
25
26
|
platform.app.info(appIdentity),
|
|
26
27
|
platform.buildpackInstallation.list(appIdentity),
|
|
@@ -51,7 +52,7 @@ export async function execPrereqs(ctx, appIdentity, options = {}) {
|
|
|
51
52
|
*/
|
|
52
53
|
export async function enableExec(ctx, appIdentity, options = {}) {
|
|
53
54
|
options.signal?.throwIfAborted();
|
|
54
|
-
const platform =
|
|
55
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
55
56
|
await platform.appFeature.update(appIdentity, EXEC_FEATURE, { enabled: true });
|
|
56
57
|
}
|
|
57
58
|
/**
|
|
@@ -82,7 +83,7 @@ export async function restartForExec(ctx, appIdentity, dynoIdentity, options = {
|
|
|
82
83
|
const { settleMs = DEFAULT_SETTLE_MS, ...waitOptions } = options;
|
|
83
84
|
const { signal } = waitOptions;
|
|
84
85
|
signal?.throwIfAborted();
|
|
85
|
-
const platform =
|
|
86
|
+
const platform = withSignal(ctx.platform, signal);
|
|
86
87
|
await wait(settleMs, signal);
|
|
87
88
|
await platform.dyno.restartAll(appIdentity);
|
|
88
89
|
return waitForInfo(ctx, appIdentity, dynoIdentity, {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
import { enableExec, exchangeExecCredentials, execPrereqs, execStatus, restartForExec, } from './exec.js';
|
|
3
4
|
import { listExtended } from './list-extended.js';
|
|
4
5
|
import { runDyno } from './run.js';
|
|
@@ -20,15 +21,17 @@ export async function scaleDynos(ctx, appIdentity, updates, options = {}) {
|
|
|
20
21
|
}
|
|
21
22
|
export async function restartDynos(ctx, appIdentity, target, options = {}) {
|
|
22
23
|
options.signal?.throwIfAborted();
|
|
24
|
+
// Bind the signal so the request aborts in flight.
|
|
25
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
23
26
|
if (!target) {
|
|
24
|
-
await
|
|
27
|
+
await platform.dyno.restartAll(appIdentity);
|
|
25
28
|
return;
|
|
26
29
|
}
|
|
27
30
|
if ('dyno' in target) {
|
|
28
|
-
await
|
|
31
|
+
await platform.dyno.restart(appIdentity, target.dyno);
|
|
29
32
|
return;
|
|
30
33
|
}
|
|
31
|
-
await
|
|
34
|
+
await platform.dyno.restartFormation(appIdentity, target.type);
|
|
32
35
|
}
|
|
33
36
|
export const dynoExtensions = extendResource('platform', 'dyno', ctx => ({
|
|
34
37
|
enableExec: (appIdentity, options) => (enableExec(ctx, appIdentity, options)),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HerokuApiClient, HerokuApiError } from '@heroku/heroku-fetch';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
const DEFAULT_RUN_RETRIES = 2;
|
|
3
4
|
const ACCEPT_RUN_INSIDE = 'application/vnd.heroku+json; version=3.sdk';
|
|
4
5
|
/**
|
|
@@ -69,6 +70,6 @@ async function postRun(ctx, appIdentity, body, options) {
|
|
|
69
70
|
});
|
|
70
71
|
return (await response.json());
|
|
71
72
|
}
|
|
72
|
-
const platform =
|
|
73
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
73
74
|
return platform.dyno.create(appIdentity, body);
|
|
74
75
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HerokuApiError, NotFoundError, RateLimitError } from '@heroku/heroku-fetch';
|
|
2
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
2
3
|
import { wait } from '../../../utils/wait.js';
|
|
3
4
|
const DEFAULT_ATTEMPTS = 20;
|
|
4
5
|
const DEFAULT_DELAY_MS = 1000;
|
|
@@ -62,7 +63,7 @@ export async function waitForInfo(ctx, appIdentity, dynoIdentity, options = {})
|
|
|
62
63
|
signal?.throwIfAborted();
|
|
63
64
|
// Scope the in-flight info call to the caller's signal so an abort
|
|
64
65
|
// takes effect during the API call, not just during the backoff.
|
|
65
|
-
const platform =
|
|
66
|
+
const platform = withSignal(ctx.platform, signal);
|
|
66
67
|
let lastError;
|
|
67
68
|
let lastDyno;
|
|
68
69
|
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
1
2
|
import { wait } from '../../../utils/wait.js';
|
|
2
3
|
const DEFAULT_DELAY_MS = 10_000;
|
|
3
4
|
const LATEST_RELEASE_RANGE = 'version ..; max=1, order=desc';
|
|
@@ -45,7 +46,7 @@ export class ReleaseNotConvergedError extends Error {
|
|
|
45
46
|
export async function waitForRelease(ctx, appIdentity, options = {}) {
|
|
46
47
|
const { attempts, delayMs = DEFAULT_DELAY_MS, onPoll, signal, type, withRun, } = options;
|
|
47
48
|
signal?.throwIfAborted();
|
|
48
|
-
const platform =
|
|
49
|
+
const platform = withSignal(ctx.platform, signal);
|
|
49
50
|
const releases = await platform
|
|
50
51
|
.withHeaders({ Range: LATEST_RELEASE_RANGE })
|
|
51
52
|
.release.list(appIdentity);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { HerokuApiClient } from '@heroku/heroku-fetch';
|
|
2
2
|
import createDebug from 'debug';
|
|
3
3
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
4
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
4
5
|
import { getGeneration } from '../app/index.js';
|
|
5
6
|
import { parseHerokuLogLine } from './parser.js';
|
|
6
7
|
export { parseHerokuLogLine, } from './parser.js';
|
|
@@ -37,6 +38,9 @@ const TRANSPORT_RETRY_MAX_DELAY_MS = 5000;
|
|
|
37
38
|
export async function* streamLogs(ctx, appIdentity, options = {}) {
|
|
38
39
|
const { dyno, lines, maxConsecutiveTransportErrors = MAX_CONSECUTIVE_TRANSPORT_ERRORS, maxRetryDelayMs = TRANSPORT_RETRY_MAX_DELAY_MS, retryBaseDelayMs = TRANSPORT_RETRY_BASE_DELAY_MS, sessionTimeoutMs = DEFAULT_FIR_SESSION_TIMEOUT_MS, signal, source, tail = false, type, } = options;
|
|
39
40
|
signal?.throwIfAborted();
|
|
41
|
+
// Bind the caller's signal to the platform client so the session-create
|
|
42
|
+
// request below aborts in flight, not merely between reads of the stream.
|
|
43
|
+
const platform = withSignal(ctx.platform, signal);
|
|
40
44
|
const generation = await getGeneration(ctx, appIdentity, { signal });
|
|
41
45
|
const isFir = generation === 'fir';
|
|
42
46
|
// Fir doesn't support a bounded session; the platform always streams.
|
|
@@ -52,7 +56,7 @@ export async function* streamLogs(ctx, appIdentity, options = {}) {
|
|
|
52
56
|
let consecutiveTransportErrors = 0;
|
|
53
57
|
while (true) {
|
|
54
58
|
debug('streamLogs creating session app=%s generation=%s tail=%s', appIdentity, generation ?? '<unknown>', effectiveTail);
|
|
55
|
-
const session = await
|
|
59
|
+
const session = await platform.logSession.create(appIdentity, createOpts);
|
|
56
60
|
if (!session.logplex_url) {
|
|
57
61
|
throw new Error('Log session response did not include a logplex_url.');
|
|
58
62
|
}
|
|
@@ -81,6 +85,7 @@ export async function* streamLogs(ctx, appIdentity, options = {}) {
|
|
|
81
85
|
// header and keeps sending `text/plain`).
|
|
82
86
|
const response = await logplexClient.stream(`${parsed.pathname}${parsed.search}`, {
|
|
83
87
|
headers: { Accept: 'text/event-stream' },
|
|
88
|
+
signal,
|
|
84
89
|
});
|
|
85
90
|
if (!response.body) {
|
|
86
91
|
throw new Error('Logplex stream returned no body.');
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import createDebug from 'debug';
|
|
2
2
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
3
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
3
4
|
const debug = createDebug('heroku:sdk:resources:pipeline-coupling');
|
|
4
5
|
const APPS_FILTER_LIMIT = 1000;
|
|
5
6
|
/**
|
|
@@ -13,7 +14,9 @@ const APPS_FILTER_LIMIT = 1000;
|
|
|
13
14
|
*/
|
|
14
15
|
export async function listPipelineApps(ctx, pipelineId, options = {}) {
|
|
15
16
|
options.signal?.throwIfAborted();
|
|
16
|
-
|
|
17
|
+
// Bind the signal so both requests abort in flight, not just at the checkpoints.
|
|
18
|
+
const platform = withSignal(ctx.platform, options.signal);
|
|
19
|
+
const allCouplings = await platform.pipelineCoupling.listByPipeline(pipelineId);
|
|
17
20
|
// Drop malformed couplings (no app id) before issuing the bulk filter call.
|
|
18
21
|
const couplings = allCouplings.filter(coupling => coupling.app?.id);
|
|
19
22
|
const skipped = allCouplings.length - couplings.length;
|
|
@@ -35,7 +38,7 @@ export async function listPipelineApps(ctx, pipelineId, options = {}) {
|
|
|
35
38
|
}
|
|
36
39
|
options.signal?.throwIfAborted();
|
|
37
40
|
const ids = couplingsToResolve.map(coupling => coupling.app.id);
|
|
38
|
-
const apps = await
|
|
41
|
+
const apps = await platform
|
|
39
42
|
.withHeaders({ Range: `id ..; max=${APPS_FILTER_LIMIT};` })
|
|
40
43
|
.filterApps.apps({ in: { id: ids } });
|
|
41
44
|
if (apps.length !== ids.length) {
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { HerokuApiClient } from '@heroku/heroku-fetch';
|
|
2
2
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
3
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
3
4
|
export class PipelineNotFoundError extends Error {
|
|
4
5
|
identity;
|
|
5
6
|
id = 'not_found';
|
|
@@ -52,7 +53,8 @@ const UUID_RE = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/i;
|
|
|
52
53
|
export async function resolvePipeline(ctx, identity, options = {}) {
|
|
53
54
|
options.signal?.throwIfAborted();
|
|
54
55
|
if (UUID_RE.test(identity)) {
|
|
55
|
-
|
|
56
|
+
// Bind the signal so the lookup aborts in flight.
|
|
57
|
+
return withSignal(ctx.platform, options.signal).pipeline.info(identity);
|
|
56
58
|
}
|
|
57
59
|
const apiClient = new HerokuApiClient({
|
|
58
60
|
...options.clientOptions,
|
|
@@ -60,6 +62,7 @@ export async function resolvePipeline(ctx, identity, options = {}) {
|
|
|
60
62
|
});
|
|
61
63
|
const response = await apiClient.get('/pipelines', {
|
|
62
64
|
searchParams: { 'eq[name]': identity },
|
|
65
|
+
signal: options.signal,
|
|
63
66
|
});
|
|
64
67
|
const matches = (await response.json());
|
|
65
68
|
if (matches.length === 0) {
|
|
@@ -1,28 +1,33 @@
|
|
|
1
1
|
import { HerokuApiClient } from '@heroku/heroku-fetch';
|
|
2
2
|
import createDebug from 'debug';
|
|
3
3
|
import { extendResource } from '../../../core/extend-resource.js';
|
|
4
|
+
import { withSignal } from '../../../core/with-signal.js';
|
|
5
|
+
import { isAbortError } from '../../../utils/is-abort-error.js';
|
|
4
6
|
import { wait } from '../../../utils/wait.js';
|
|
5
7
|
const debug = createDebug('heroku:sdk:resources:pipeline-promotion');
|
|
6
8
|
const DEFAULT_INTERVAL_MS = 1000;
|
|
7
9
|
const DEFAULT_RELEASE_STREAM_MAX_ATTEMPTS = 100;
|
|
8
10
|
export async function promotePipeline(ctx, body, options = {}) {
|
|
9
11
|
const { intervalMs = DEFAULT_INTERVAL_MS, onReleaseStream, releaseStreamMaxAttempts = DEFAULT_RELEASE_STREAM_MAX_ATTEMPTS, signal, timeoutMs, } = options;
|
|
12
|
+
// Bind the signal to the client so the create/poll/release-info requests
|
|
13
|
+
// abort in flight, not just the delay between polls.
|
|
14
|
+
const platform = withSignal(ctx.platform, signal);
|
|
10
15
|
debug('promote source=%s targets=%d', body.source?.app?.id ?? '<unknown>', body.targets?.length ?? 0);
|
|
11
|
-
const promotion = await
|
|
16
|
+
const promotion = await platform.pipelinePromotion.create(body);
|
|
12
17
|
if (!promotion.id) {
|
|
13
18
|
throw new Error('Pipeline promotion response did not include an id');
|
|
14
19
|
}
|
|
15
20
|
debug('promote created promotion=%s intervalMs=%d timeoutMs=%s', promotion.id, intervalMs, timeoutMs ?? '<none>');
|
|
16
21
|
const deadline = timeoutMs === undefined ? undefined : Date.now() + timeoutMs;
|
|
17
22
|
const streamRunner = onReleaseStream
|
|
18
|
-
? createReleaseStreamRunner(
|
|
23
|
+
? createReleaseStreamRunner(platform, onReleaseStream, releaseStreamMaxAttempts, intervalMs, signal)
|
|
19
24
|
: undefined;
|
|
20
25
|
let poll = 0;
|
|
21
26
|
while (true) {
|
|
22
27
|
signal?.throwIfAborted();
|
|
23
28
|
poll++;
|
|
24
29
|
// eslint-disable-next-line no-await-in-loop
|
|
25
|
-
const targets = await
|
|
30
|
+
const targets = await platform.pipelinePromotionTarget.list(promotion.id);
|
|
26
31
|
debug('promote poll=%d promotion=%s statuses=%o', poll, promotion.id, targets.map(target => target.status));
|
|
27
32
|
if (targets.every(target => target.status !== 'pending')) {
|
|
28
33
|
debug('promote terminal promotion=%s polls=%d', promotion.id, poll);
|
|
@@ -43,7 +48,7 @@ export async function promotePipeline(ctx, body, options = {}) {
|
|
|
43
48
|
* output stream and hands it to `onReleaseStream`. Subsequent calls are
|
|
44
49
|
* no-ops; the stream is one-shot per promotion.
|
|
45
50
|
*/
|
|
46
|
-
function createReleaseStreamRunner(
|
|
51
|
+
function createReleaseStreamRunner(platform, onReleaseStream, releaseStreamMaxAttempts, intervalMs, signal) {
|
|
47
52
|
let handled = false;
|
|
48
53
|
return async (targets) => {
|
|
49
54
|
if (handled || targets.length !== 1)
|
|
@@ -53,7 +58,7 @@ function createReleaseStreamRunner(ctx, onReleaseStream, releaseStreamMaxAttempt
|
|
|
53
58
|
return;
|
|
54
59
|
handled = true;
|
|
55
60
|
debug('promote release-stream lookup app=%s release=%s', target.app.id, target.release.id);
|
|
56
|
-
const release = await
|
|
61
|
+
const release = await platform.release.info(target.app.id, target.release.id);
|
|
57
62
|
if (!release.output_stream_url) {
|
|
58
63
|
debug('promote release-stream skipped reason=no-output-stream-url');
|
|
59
64
|
return;
|
|
@@ -84,9 +89,12 @@ async function fetchReleaseOutput(url, maxAttempts, intervalMs, signal) {
|
|
|
84
89
|
let response;
|
|
85
90
|
try {
|
|
86
91
|
// eslint-disable-next-line no-await-in-loop
|
|
87
|
-
response = await buslClient.stream(path);
|
|
92
|
+
response = await buslClient.stream(path, { signal });
|
|
88
93
|
}
|
|
89
|
-
catch {
|
|
94
|
+
catch (error) {
|
|
95
|
+
// An abort is terminal, not a retryable miss — let it propagate.
|
|
96
|
+
if (signal?.aborted || isAbortError(error))
|
|
97
|
+
throw error;
|
|
90
98
|
// Treat HTTP errors thrown by the api-client as a retryable miss.
|
|
91
99
|
response = undefined;
|
|
92
100
|
}
|