alchemy 0.93.10 → 0.93.12
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/bin/alchemy.js +1 -1
- package/lib/cloudflare/bucket-custom-domain.d.ts.map +1 -1
- package/lib/cloudflare/bucket-custom-domain.js +22 -4
- package/lib/cloudflare/bucket-custom-domain.js.map +1 -1
- package/lib/cloudflare/container.d.ts +92 -8
- package/lib/cloudflare/container.d.ts.map +1 -1
- package/lib/cloudflare/container.js +10 -3
- package/lib/cloudflare/container.js.map +1 -1
- package/lib/cloudflare/miniflare/remote-binding-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/remote-binding-proxy.js +16 -30
- package/lib/cloudflare/miniflare/remote-binding-proxy.js.map +1 -1
- package/package.json +1 -1
- package/src/cloudflare/bucket-custom-domain.ts +33 -7
- package/src/cloudflare/container.ts +121 -34
- package/src/cloudflare/miniflare/remote-binding-proxy.ts +20 -43
- package/workers/tunnel-proxy.js +1 -1
package/bin/alchemy.js
CHANGED
|
@@ -37061,7 +37061,7 @@ var FileSystemStateStore = class {
|
|
|
37061
37061
|
//#endregion
|
|
37062
37062
|
//#region package.json
|
|
37063
37063
|
var name = "alchemy";
|
|
37064
|
-
var version = "0.93.
|
|
37064
|
+
var version = "0.93.12";
|
|
37065
37065
|
var homepage = "https://alchemy.run";
|
|
37066
37066
|
var license = "Apache-2.0";
|
|
37067
37067
|
var author = "Sam Goodwin <sam@alchemy.run>";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket-custom-domain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAK7C,OAAO,EACL,aAAa,EAEb,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,WAAW,yBACf,SAAQ,oBAAoB,EAAE,2BAA2B;IACzD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAEpC;;;OAGG;IACH,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAEvD;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;CACxD,CAAC;AAIF,eAAO,MAAM,oBAAoB,yFAGvB,OAAO,CAAC,oBAAoB,CAAC,OAC9B,MAAM,SACJ,yBAAyB,KAC/B,OAAO,CAAC,oBAAoB,CAAC,
|
|
1
|
+
{"version":3,"file":"bucket-custom-domain.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAK7C,OAAO,EACL,aAAa,EAEb,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAAoB,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,WAAW,yBACf,SAAQ,oBAAoB,EAAE,2BAA2B;IACzD;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAEpC;;;OAGG;IACH,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,MAAM,WAAW,2BAA2B;IAC1C;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAErB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAEnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAEvD;;;;;OAKG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;OAIG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;CACxD,CAAC;AAIF,eAAO,MAAM,oBAAoB,yFAGvB,OAAO,CAAC,oBAAoB,CAAC,OAC9B,MAAM,SACJ,yBAAyB,KAC/B,OAAO,CAAC,oBAAoB,CAAC,CAuFjC,CAAC;AAqDF,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,GAAG,SAAS,oBAa/C;AAED,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,aAAa,EAClB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,oBAAoB,GAAG,SAAS;eAI/B,MAAM;YACT;QACN,SAAS,EACL,SAAS,GACT,QAAQ,GACR,aAAa,GACb,SAAS,GACT,OAAO,GACP,SAAS,CAAC;QACd,GAAG,EACC,cAAc,GACd,SAAS,GACT,QAAQ,GACR,aAAa,GACb,OAAO,GACP,SAAS,CAAC;KACf;IAeN"}
|
|
@@ -33,10 +33,14 @@ export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain",
|
|
|
33
33
|
switch (this.phase) {
|
|
34
34
|
case "create": {
|
|
35
35
|
await createBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload).catch(async (error) => {
|
|
36
|
-
if (error instanceof CloudflareApiError &&
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
36
|
+
if (error instanceof CloudflareApiError && error.status === 409) {
|
|
37
|
+
const existing = await getBucketCustomDomain(api, props.bucketName, payload.domain, props.jurisdiction);
|
|
38
|
+
if (existing && customDomainMatches(existing, payload)) {
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
if (adopt) {
|
|
42
|
+
return await updateBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload);
|
|
43
|
+
}
|
|
40
44
|
}
|
|
41
45
|
throw error;
|
|
42
46
|
});
|
|
@@ -58,6 +62,20 @@ export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain",
|
|
|
58
62
|
}
|
|
59
63
|
}
|
|
60
64
|
});
|
|
65
|
+
function customDomainMatches(existing, payload) {
|
|
66
|
+
return (existing.domain === payload.domain &&
|
|
67
|
+
existing.zoneId === payload.zoneId &&
|
|
68
|
+
existing.enabled === payload.enabled &&
|
|
69
|
+
(existing.minTLS ?? undefined) === (payload.minTLS ?? undefined) &&
|
|
70
|
+
arraysEqual(existing.ciphers, payload.ciphers));
|
|
71
|
+
}
|
|
72
|
+
function arraysEqual(a, b) {
|
|
73
|
+
if (a === b)
|
|
74
|
+
return true;
|
|
75
|
+
if (!a || !b || a.length !== b.length)
|
|
76
|
+
return false;
|
|
77
|
+
return a.every((v, i) => v === b[i]);
|
|
78
|
+
}
|
|
61
79
|
async function createBucketCustomDomain(api, bucket, jurisdiction, payload) {
|
|
62
80
|
return await extractCloudflareResult(`create custom domain for bucket "${bucket}"`, api.post(`/accounts/${api.accountId}/r2/buckets/${bucket}/domains/custom`, payload, { headers: withJurisdiction({ jurisdiction }) }));
|
|
63
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket-custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,EAAE,uBAAuB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,aAAa,EACb,mBAAmB,GAEpB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,gBAAgB,EAA6B,MAAM,aAAa,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,YAAY,CAAC;AA2FpD,MAAM,aAAa,GAAG,WAAW,CAAC;AAElC,MAAM,CAAC,MAAM,oBAAoB,GAAG,QAAQ,CAC1C,kCAAkC,EAClC,KAAK,WAEH,GAAW,EACX,KAAgC;IAEhC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QACtE,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,KAAK;YAC/B,MAAM,EACJ,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;gBAC5B,CAAC,CAAC,KAAK,CAAC,IAAI;gBACZ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,IAAI,aAAa,CAAC;YACvC,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,MAAM,EAAE,KAAK,CAAC,MAAM;SACrB,CAAC;IACJ,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,mBAAmB,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAyB;QACpC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI;QAC9B,MAAM,EACJ,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ;YAC5B,CAAC,CAAC,KAAK,CAAC,IAAI;YACZ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE;gBACf,CAAC,MAAM,sBAAsB,CAAC,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC;IACF,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,MAAM,wBAAwB,CAC5B,GAAG,EACH,KAAK,CAAC,UAAU,EAChB,KAAK,CAAC,YAAY,EAClB,OAAO,CACR,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACtB,
|
|
1
|
+
{"version":3,"file":"bucket-custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,6 +73,13 @@ interface ContainerPropsBase extends Partial<CloudflareApiOptions> {
|
|
|
73
73
|
* Defines how updates are deployed across instances.
|
|
74
74
|
*/
|
|
75
75
|
rollout?: ContainerApplicationRollout;
|
|
76
|
+
/**
|
|
77
|
+
* Placement constraints that control which regions or jurisdictions
|
|
78
|
+
* the container is allowed to run in.
|
|
79
|
+
*
|
|
80
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
81
|
+
*/
|
|
82
|
+
constraints?: Constraints;
|
|
76
83
|
}
|
|
77
84
|
/**
|
|
78
85
|
* Container configuration using an existing image reference
|
|
@@ -134,6 +141,17 @@ interface ContainerPropsWithBuild extends ContainerPropsBase {
|
|
|
134
141
|
* dockerfile: "Dockerfile"
|
|
135
142
|
* }
|
|
136
143
|
* });
|
|
144
|
+
*
|
|
145
|
+
* @example
|
|
146
|
+
* // Restricting placement to specific regions and a compliance jurisdiction
|
|
147
|
+
* const container = await Container("my-container", {
|
|
148
|
+
* className: "MyContainer",
|
|
149
|
+
* image: "nginx:alpine",
|
|
150
|
+
* constraints: {
|
|
151
|
+
* regions: ["ENAM", "WNAM"],
|
|
152
|
+
* jurisdiction: "fedramp"
|
|
153
|
+
* }
|
|
154
|
+
* });
|
|
137
155
|
*/
|
|
138
156
|
export type ContainerProps = ContainerPropsWithImage | ContainerPropsWithBuild;
|
|
139
157
|
/**
|
|
@@ -212,6 +230,11 @@ export type Container<T = any> = {
|
|
|
212
230
|
* Defines how updates are deployed across instances.
|
|
213
231
|
*/
|
|
214
232
|
rollout?: ContainerApplicationRollout;
|
|
233
|
+
/**
|
|
234
|
+
* Placement constraints that control which regions or jurisdictions
|
|
235
|
+
* the container is allowed to run in.
|
|
236
|
+
*/
|
|
237
|
+
constraints?: Constraints;
|
|
215
238
|
/**
|
|
216
239
|
* @internal
|
|
217
240
|
* Phantom type parameter for additional type safety
|
|
@@ -337,6 +360,13 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
|
|
|
337
360
|
* Defines how updates are deployed across instances.
|
|
338
361
|
*/
|
|
339
362
|
rollout?: ContainerApplicationRollout;
|
|
363
|
+
/**
|
|
364
|
+
* Placement constraints that control which regions or jurisdictions
|
|
365
|
+
* the container is allowed to run in.
|
|
366
|
+
*
|
|
367
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
368
|
+
*/
|
|
369
|
+
constraints?: Constraints;
|
|
340
370
|
/**
|
|
341
371
|
* Whether to adopt an existing container application with the same name.
|
|
342
372
|
*
|
|
@@ -373,6 +403,32 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
|
|
|
373
403
|
* - `default`: Uses Cloudflare's standard scheduling algorithm
|
|
374
404
|
*/
|
|
375
405
|
export type SchedulingPolicy = "moon" | "gpu" | "regional" | "fill_metals" | "default" | (string & {});
|
|
406
|
+
/**
|
|
407
|
+
* Cloudflare geographic region codes for container placement.
|
|
408
|
+
*
|
|
409
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
410
|
+
*/
|
|
411
|
+
export type Region = "AFR" | "APAC" | "EEUR" | "ENAM" | "WNAM" | "ME" | "OC" | "SAM" | "WEUR" | (string & {});
|
|
412
|
+
/**
|
|
413
|
+
* Compliance jurisdiction for container placement.
|
|
414
|
+
*/
|
|
415
|
+
export type Jurisdiction = "eu" | "fedramp" | (string & {});
|
|
416
|
+
/**
|
|
417
|
+
* Placement constraints for controlling where Cloudflare Containers run.
|
|
418
|
+
*
|
|
419
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
420
|
+
*/
|
|
421
|
+
export interface Constraints {
|
|
422
|
+
/**
|
|
423
|
+
* Restrict placement to specific geographic regions (e.g. `["ENAM", "WNAM"]`).
|
|
424
|
+
* See {@link Region} for valid values.
|
|
425
|
+
*/
|
|
426
|
+
regions?: Region[];
|
|
427
|
+
/**
|
|
428
|
+
* Compliance jurisdiction restricting which regions are eligible.
|
|
429
|
+
*/
|
|
430
|
+
jurisdiction?: Jurisdiction;
|
|
431
|
+
}
|
|
376
432
|
/**
|
|
377
433
|
* A ContainerApplication resource representing a managed container deployment.
|
|
378
434
|
*
|
|
@@ -489,8 +545,17 @@ export interface ContainerApplicationData {
|
|
|
489
545
|
max_instances: number;
|
|
490
546
|
/** Resource and placement constraints for the application */
|
|
491
547
|
constraints: {
|
|
492
|
-
/**
|
|
493
|
-
|
|
548
|
+
/**
|
|
549
|
+
* Infrastructure tier level assigned by Cloudflare (higher means more resources).
|
|
550
|
+
* @deprecated The API is migrating to `tiers`; may be absent on newer applications.
|
|
551
|
+
*/
|
|
552
|
+
tier?: number;
|
|
553
|
+
/** Infrastructure tiers assigned by Cloudflare (replacement for `tier`) */
|
|
554
|
+
tiers?: number[];
|
|
555
|
+
/** Geographic regions the application is restricted to */
|
|
556
|
+
regions?: Region[];
|
|
557
|
+
/** Compliance jurisdiction */
|
|
558
|
+
jurisdiction?: Jurisdiction;
|
|
494
559
|
/** Additional constraint properties that may be added by Cloudflare */
|
|
495
560
|
[key: string]: any;
|
|
496
561
|
};
|
|
@@ -567,7 +632,19 @@ export interface CreateContainerApplicationBody {
|
|
|
567
632
|
instances?: number;
|
|
568
633
|
scheduling_policy?: string;
|
|
569
634
|
constraints?: {
|
|
570
|
-
|
|
635
|
+
/** Geographic regions the application is restricted to */
|
|
636
|
+
regions?: Region[];
|
|
637
|
+
/** City airport codes the application is restricted to (e.g. "MAD", "SFO") */
|
|
638
|
+
cities?: string[];
|
|
639
|
+
/**
|
|
640
|
+
* Infrastructure tier the application is restricted to.
|
|
641
|
+
* @deprecated The API is migrating to `tiers`; prefer `tiers` instead.
|
|
642
|
+
*/
|
|
643
|
+
tier?: number;
|
|
644
|
+
/** Infrastructure tiers the application is restricted to */
|
|
645
|
+
tiers?: number[];
|
|
646
|
+
/** Compliance jurisdiction */
|
|
647
|
+
jurisdiction?: Jurisdiction;
|
|
571
648
|
};
|
|
572
649
|
affinities?: {
|
|
573
650
|
colocation?: "datacenter";
|
|
@@ -575,8 +652,6 @@ export interface CreateContainerApplicationBody {
|
|
|
575
652
|
[key: string]: any;
|
|
576
653
|
}
|
|
577
654
|
export declare function createContainerApplication(api: CloudflareApi, adopt: boolean | undefined, body: CreateContainerApplicationBody): Promise<ContainerApplicationData>;
|
|
578
|
-
type Region = "AFR" | "APAC" | "EEUR" | "ENAM" | "WNAM" | "ME" | "OC" | "SAM" | "WEUR" | (string & {});
|
|
579
|
-
type City = "AFR" | "APAC" | "EEUR" | "ENAM" | "WNAM" | "ME" | "OC" | "SAM" | "WEUR" | (string & {});
|
|
580
655
|
export type UpdateApplicationRequestBody = {
|
|
581
656
|
/**
|
|
582
657
|
* Number of deployments to maintain within this applicaiton. This can be used to scale the appliation up/down.
|
|
@@ -588,10 +663,19 @@ export type UpdateApplicationRequestBody = {
|
|
|
588
663
|
};
|
|
589
664
|
scheduling_policy?: SchedulingPolicy;
|
|
590
665
|
constraints?: {
|
|
591
|
-
|
|
666
|
+
/** Geographic regions the application is restricted to */
|
|
667
|
+
regions?: Region[];
|
|
668
|
+
/** City airport codes the application is restricted to (e.g. "MAD", "SFO") */
|
|
669
|
+
cities?: string[];
|
|
670
|
+
/**
|
|
671
|
+
* Infrastructure tier the application is restricted to.
|
|
672
|
+
* @deprecated The API is migrating to `tiers`; prefer `tiers` instead.
|
|
673
|
+
*/
|
|
592
674
|
tier?: number;
|
|
593
|
-
|
|
594
|
-
|
|
675
|
+
/** Infrastructure tiers the application is restricted to */
|
|
676
|
+
tiers?: number[];
|
|
677
|
+
/** Compliance jurisdiction */
|
|
678
|
+
jurisdiction?: Jurisdiction;
|
|
595
679
|
};
|
|
596
680
|
/**
|
|
597
681
|
* The deployment configuration of all deployments created by this application.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/cloudflare/container.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../../src/cloudflare/container.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EACL,KAAK,EACL,KAAK,kBAAkB,EAExB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAG7D,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAElB;;GAEG;AACH,UAAU,kBAAmB,SAAQ,OAAO,CAAC,oBAAoB,CAAC;IAChE;;;OAGG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B;;;OAGG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAEpC;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,GAAG,CAAC,EAAE;QACJ;;;;;;WAMG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,CAAC;IAEtC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B;AAED;;GAEG;AACH,UAAU,uBAAwB,SAAQ,kBAAkB;IAC1D;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,WAAW,CAAC;IAEpC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED;;GAEG;AACH,UAAU,uBAAwB,SAAQ,kBAAkB;IAC1D;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,KAAK,EAAE,kBAAkB,CAAC;IAE1B,KAAK,CAAC,EAAE,KAAK,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,MAAM,MAAM,cAAc,GAAG,uBAAuB,GAAG,uBAAuB,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,KAAK,GACL,OAAO,GACP,UAAU,GACV,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,YAAY,GACZ,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO,IAAI,SAAS,CAE9D;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,SAAS,CAAC,CAAC,GAAG,GAAG,IAAI;IAC/B,kDAAkD;IAClD,IAAI,EAAE,WAAW,CAAC;IAElB,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IAEX;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,mEAAmE;IACnE,SAAS,EAAE,MAAM,CAAC;IAElB,mDAAmD;IACnD,KAAK,EAAE,KAAK,CAAC;IAEb,gEAAgE;IAChE,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB,uEAAuE;IACvE,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB,+EAA+E;IAC/E,MAAM,CAAC,EAAE,IAAI,CAAC;IAEd,sDAAsD;IACtD,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B,6DAA6D;IAC7D,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,gDAAgD;IAChD,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAEpC,qEAAqE;IACrE,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,yCAAyC;IACzC,GAAG,CAAC,EAAE;QACJ,2DAA2D;QAC3D,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,CAAC;IAEtC;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,CAAC;CACf,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAmCzE;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAiLvB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,2BAA2B;IAC1C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,SAAS,GAAG,WAAW,CAAC;IAEnC;;;;;OAKG;IACH,IAAI,CAAC,EAAE,WAAW,CAAC;IAEnB;;;;;;;;;;OAUG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,yBAA0B,SAAQ,oBAAoB;IACrE;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IAEpC;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAE5B;;;OAGG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC;;;;;OAKG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,KAAK,EAAE,KAAK,CAAC;IAEb;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,cAAc,CAAC,EAAE;QACf,gEAAgE;QAChE,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,CAAC;IAEtC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;;OAMG;IACH,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;;GASG;AACH,MAAM,MAAM,gBAAgB,GACxB,MAAM,GACN,KAAK,GACL,UAAU,GACV,aAAa,GACb,SAAS,GACT,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;;;GAIG;AACH,MAAM,MAAM,MAAM,GACd,KAAK,GACL,MAAM,GACN,MAAM,GACN,MAAM,GACN,MAAM,GACN,IAAI,GACJ,IAAI,GACJ,KAAK,GACL,MAAM,GACN,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAElB;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,GAAG,SAAS,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAE5D;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB;;OAEG;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,sDAAsD;IACtD,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoFG;AACH,eAAO,MAAM,oBAAoB,yFAGvB,OAAO,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,MAC1D,MAAM,SACH,yBAAyB,KAC/B,OAAO,CAAC,oBAAoB,CAAC,CA6JjC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,WAAW,wBAAwB;IACvC,uDAAuD;IACvD,IAAI,EAAE,MAAM,CAAC;IAEb,gFAAgF;IAChF,iBAAiB,EAAE,gBAAgB,CAAC;IAEpC,oDAAoD;IACpD,SAAS,EAAE,MAAM,CAAC;IAElB,+DAA+D;IAC/D,aAAa,EAAE,MAAM,CAAC;IAEtB,6DAA6D;IAC7D,WAAW,EAAE;QACX;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,2EAA2E;QAC3E,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,0DAA0D;QAC1D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,8BAA8B;QAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;QAC5B,uEAAuE;QACvE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IAEF;;;OAGG;IACH,aAAa,EAAE;QACb,gDAAgD;QAChD,KAAK,EAAE,MAAM,CAAC;QAEd,oDAAoD;QACpD,QAAQ,EAAE,MAAM,CAAC;QAEjB,6DAA6D;QAC7D,IAAI,EAAE,MAAM,CAAC;QAEb,2CAA2C;QAC3C,UAAU,EAAE,MAAM,CAAC;QAEnB,gDAAgD;QAChD,IAAI,EAAE,GAAG,CAAC;QAEV,yCAAyC;QACzC,OAAO,EAAE,GAAG,CAAC;QAEb,iDAAiD;QACjD,OAAO,EAAE,MAAM,EAAE,CAAC;QAElB,2CAA2C;QAC3C,UAAU,EAAE,MAAM,EAAE,CAAC;QAErB,8CAA8C;QAC9C,OAAO,EAAE,MAAM,CAAC;QAEhB,kCAAkC;QAClC,eAAe,EAAE,MAAM,CAAC;QAExB,iDAAiD;QACjD,aAAa,EAAE,GAAG,CAAC;QAEnB,uDAAuD;QACvD,MAAM,EAAE,MAAM,CAAC;QAEf,0CAA0C;QAC1C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IAEF,gDAAgD;IAChD,eAAe,EAAE;QACf,0CAA0C;QAC1C,YAAY,EAAE,MAAM,CAAC;QAErB,4CAA4C;QAC5C,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IAEF,sDAAsD;IACtD,EAAE,EAAE,MAAM,CAAC;IAEX,uDAAuD;IACvD,UAAU,EAAE,MAAM,CAAC;IAEnB,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IAEnB,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,2BAA2B,EAAE,MAAM,CAAC;IAEpC,kDAAkD;IAClD,MAAM,EAAE;QACN,kDAAkD;QAClD,SAAS,EAAE,GAAG,CAAC;QAEf,gCAAgC;QAChC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IAEF,4DAA4D;IAC5D,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,iDAKb;AAED,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,iDAatB;AAED,wBAAsB,yBAAyB,CAC7C,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,wBAAwB,EAAE,CAAC,CAcrC;AAED,wBAAsB,8BAA8B,CAClD,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAG/C;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,uBAAuB,CAAC;IACvC,eAAe,CAAC,EAAE;QAChB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE;QACZ,0DAA0D;QAC1D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,8EAA8E;QAC9E,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,4DAA4D;QAC5D,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,8BAA8B;QAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,CAAC;IACF,UAAU,CAAC,EAAE;QACX,UAAU,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,OAAO,GAAG,SAAS,EAC1B,IAAI,EAAE,8BAA8B,qCAgErC;AACD,MAAM,MAAM,4BAA4B,GAAG;IACzC;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE;QACX,UAAU,CAAC,EAAE,YAAY,CAAC;KAC3B,CAAC;IACF,iBAAiB,CAAC,EAAE,gBAAgB,CAAC;IACrC,WAAW,CAAC,EAAE;QACZ,0DAA0D;QAC1D,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,8EAA8E;QAC9E,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAClB;;;WAGG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,4DAA4D;QAC5D,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,8BAA8B;QAC9B,YAAY,CAAC,EAAE,YAAY,CAAC;KAC7B,CAAC;IACF;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;CACzC,CAAC;AAEF,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,4BAA4B,qCAgBnC;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,gBActB;AAED,UAAU,+BAA+B;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,SAAS,CAAC;IACpB,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,oBAAoB,EAAE,uBAAuB,CAAC;CAC/C;AAED,UAAU,gCAAgC;IACxC,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,aAAa,GAAG,WAAW,GAAG,QAAQ,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAC/D,MAAM,EAAE;QACN,SAAS,EAAE;YACT,OAAO,EAAE,MAAM,CAAC;YAChB,MAAM,EAAE,MAAM,CAAC;YACf,QAAQ,EAAE,MAAM,CAAC;YACjB,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC;KACH,CAAC;IACF,IAAI,EAAE,WAAW,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IAClC,QAAQ,EAAE,SAAS,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;IACpC,qBAAqB,EAAE;QACrB,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,CAAC,EAAE;YACd,IAAI,CAAC,EAAE;gBACL,OAAO,EAAE,OAAO,CAAC;aAClB,CAAC;SACH,CAAC;KACH,CAAC;IACF,oBAAoB,EAAE,uBAAuB,CAAC;IAC9C,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,KAAK,EAAE,KAAK,CAAC;QACX,EAAE,EAAE,MAAM,CAAC;QACX,MAAM,EAAE,aAAa,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;QAC3E,SAAS,EAAE;YACT,UAAU,EAAE,MAAM,CAAC;SACpB,CAAC;QACF,WAAW,EAAE,MAAM,CAAC;QACpB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,CAAC,CAAC;IACH,QAAQ,EAAE;QACR,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,iBAAiB,EAAE,MAAM,CAAC;QAC1B,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAED,wBAAsB,iCAAiC,CACrD,GAAG,EAAE,aAAa,EAClB,aAAa,EAAE,MAAM,EACrB,IAAI,EAAE,+BAA+B,6CAgBtC;AAED,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACpC,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,wBAAsB,uBAAuB,CAC3C,GAAG,EAAE,aAAa,EAClB,UAAU,SAA4B;WAW3B,MAAM;eACF,MAAM;cACP,MAAM;GAUrB;AAKD,eAAO,MAAM,yCAAyC,GACpD,WAAW,MAAM,EACjB,KAAK,MAAM,KACV,MAEF,CAAC;AAGF,eAAO,MAAM,8BAA8B,cAG1C,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,WAGrD;AAED,6HAA6H;AAC7H,eAAO,MAAM,wBAAwB,GAAI,MAAM,MAAM,EAAE,KAAK,MAAM,WAEjE,CAAC;AAEF,eAAO,MAAM,uBAAuB,mBAAmB,CAAC;AAExD,MAAM,WAAW,iBAAiB;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,EAAE;QACN,UAAU,EAAE,MAAM,CAAC;QACnB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,yBAAyB,EAAE,MAAM,CAAC;QAClC,qBAAqB,EAAE,MAAM,CAAC;QAC9B,mBAAmB,EAAE,MAAM,CAAC;QAC5B,sBAAsB,EAAE,MAAM,CAAC;QAC/B,UAAU,EAAE,MAAM,CAAC;QACnB,gBAAgB,EAAE,MAAM,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,aAAa,EAAE,MAAM,EAAE,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,SAAS,EAAE,GAAG,EAAE,CAAC;IACjB,QAAQ,EAAE;QACR,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,MAAM,EAAE,MAAM,CAAC;QACf,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,wBAAsB,oBAAoB,CAAC,GAAG,EAAE,aAAa,8BAY5D;AAED;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC;AAE9B,UAAU,uBAAuB;IAC/B,IAAI,CAAC,EAAE;QACL,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,aAAa,CAAC,EAAE,YAAY,CAAC;IAC7B;;OAEG;IACH,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC;;OAEG;IACH,kBAAkB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACnC;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;QACd;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,KAAK,CAAC;QACZ;;WAEG;QACH,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC,CAAC;IACH;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE;QACL,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF;;OAEG;IACH,qBAAqB,CAAC,EAAE,KAAK,CAAC;QAC5B,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH,OAAO,CAAC,EAAE;QACR;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;QAChD;;;WAGG;QACH,WAAW,CAAC,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;QAChD,IAAI,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;KAC7B,CAAC;IACF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,GAAG,CAAC,EAAE;QACJ;;WAEG;QACH,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;QACxB;;;;WAIG;QACH,QAAQ,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;KAC1B,CAAC;IACF,KAAK,CAAC,EAAE,KAAK,CAAC;QACZ;;;;;;;WAOG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC,CAAC;IACH;;OAEG;IACH,MAAM,CAAC,EAAE,KAAK,CAAC;QACb;;WAEG;QACH,IAAI,CAAC,EAAE,MAAM,CAAC;QACd;;WAEG;QACH,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;QACrB;;WAEG;QACH,GAAG,CAAC,EAAE,OAAO,CAAC;QACd;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;WAEG;QACH,IAAI,CAAC,EAAE;YACL,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;YAC1E;;eAEG;YACH,IAAI,CAAC,EAAE,MAAM,CAAC;YACd;;eAEG;YACH,IAAI,CAAC,EAAE,MAAM,CAAC;YACd;;eAEG;YACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SAC/B,CAAC;QACF;;WAEG;QACH,QAAQ,EAAE,QAAQ,CAAC;QACnB;;WAEG;QACH,OAAO,EAAE,QAAQ,CAAC;QAClB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB;;WAEG;QACH,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC;KAC1B,CAAC,CAAC;CACJ,CAAC"}
|
|
@@ -74,6 +74,7 @@ export async function Container(id, props) {
|
|
|
74
74
|
dev: props.dev,
|
|
75
75
|
adopt: props.adopt,
|
|
76
76
|
rollout: props.rollout,
|
|
77
|
+
constraints: props.constraints,
|
|
77
78
|
};
|
|
78
79
|
const isDev = scope.local && !props.dev?.remote;
|
|
79
80
|
// Prebuilt image path: use as-is, no Docker pull/push
|
|
@@ -311,11 +312,18 @@ export const ContainerApplication = Resource("cloudflare::ContainerApplication",
|
|
|
311
312
|
},
|
|
312
313
|
},
|
|
313
314
|
};
|
|
315
|
+
const constraints = props.constraints
|
|
316
|
+
? {
|
|
317
|
+
regions: props.constraints.regions,
|
|
318
|
+
jurisdiction: props.constraints.jurisdiction,
|
|
319
|
+
}
|
|
320
|
+
: undefined;
|
|
314
321
|
if (this.phase === "update" && this.output?.id) {
|
|
315
322
|
const application = await updateContainerApplication(api, this.output.id, {
|
|
316
323
|
instances: props.instances ?? 1,
|
|
317
324
|
max_instances: props.maxInstances ?? 10,
|
|
318
325
|
scheduling_policy: props.schedulingPolicy ?? "default",
|
|
326
|
+
constraints,
|
|
319
327
|
configuration,
|
|
320
328
|
});
|
|
321
329
|
// TODO(sam): should we wait for the rollout to complete?
|
|
@@ -349,9 +357,7 @@ export const ContainerApplication = Resource("cloudflare::ContainerApplication",
|
|
|
349
357
|
namespace_id: props.durableObjects.namespaceId,
|
|
350
358
|
}
|
|
351
359
|
: undefined,
|
|
352
|
-
constraints
|
|
353
|
-
tier: 1,
|
|
354
|
-
},
|
|
360
|
+
constraints,
|
|
355
361
|
configuration: {
|
|
356
362
|
image: imageReference,
|
|
357
363
|
instance_type: props.instanceType ?? "dev",
|
|
@@ -378,6 +384,7 @@ export const ContainerApplication = Resource("cloudflare::ContainerApplication",
|
|
|
378
384
|
instances: props.instances ?? existingApplication.instances,
|
|
379
385
|
max_instances: props.maxInstances ?? existingApplication.max_instances,
|
|
380
386
|
scheduling_policy: props.schedulingPolicy ?? existingApplication.scheduling_policy,
|
|
387
|
+
constraints,
|
|
381
388
|
configuration,
|
|
382
389
|
});
|
|
383
390
|
// Create a rollout for the updated configuration
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/cloudflare/container.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"container.js","sourceRoot":"","sources":["../../src/cloudflare/container.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-binding-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-binding-proxy.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,WAAW,CAAC;AAG7D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAGhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAgBxD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,iBAAiB,EAAE,CAAC;IAC9B,gBAAgB,EAAE,2BAA2B,CAAC;CAC/C;AAED,wBAAsB,uBAAuB,CAAC,KAAK,EAAE;IACnD,GAAG,EAAE,aAAa,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,iBAAiB,EAAE,CAAC;CAC/B,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAuF9B"}
|
|
@@ -88,51 +88,37 @@ export async function createRemoteProxyWorker(input) {
|
|
|
88
88
|
};
|
|
89
89
|
}
|
|
90
90
|
async function createWorkersPreviewToken(api, input) {
|
|
91
|
-
const
|
|
91
|
+
const previewUploadToken = await createPreviewUploadToken(api);
|
|
92
92
|
const formData = await WorkerBundle.toFormData(input.bundle);
|
|
93
93
|
formData.append("metadata", JSON.stringify(input.metadata));
|
|
94
94
|
formData.append("wrangler-session-config", JSON.stringify(input.session));
|
|
95
95
|
const res = await extractCloudflareResult("create workers preview token", api.post(`/accounts/${api.accountId}/workers/scripts/${input.name}/edge-preview`, formData, {
|
|
96
96
|
headers: {
|
|
97
|
-
"cf-preview-upload-config-token":
|
|
97
|
+
"cf-preview-upload-config-token": previewUploadToken,
|
|
98
98
|
},
|
|
99
99
|
}));
|
|
100
|
-
// Fire and forget prewarm call
|
|
101
|
-
// (see https://github.com/cloudflare/workers-sdk/blob/6c6afbd6072b96e78e67d3a863ed849c6aa49472/packages/wrangler/src/dev/create-worker-preview.ts#L338)
|
|
102
|
-
void prewarm(session.prewarm, res.preview_token);
|
|
103
100
|
return res.preview_token;
|
|
104
101
|
}
|
|
105
|
-
async function
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
// the preview token.
|
|
110
|
-
const accessToken = await getAccessToken(new URL(url).hostname, previewToken);
|
|
111
|
-
await fetch(url, {
|
|
112
|
-
method: "POST",
|
|
113
|
-
headers: {
|
|
114
|
-
"cf-workers-preview-token": previewToken,
|
|
115
|
-
...(accessToken ? { cookie: `CF_Authorization=${accessToken}` } : {}),
|
|
116
|
-
},
|
|
117
|
-
});
|
|
102
|
+
async function createPreviewUploadToken(api) {
|
|
103
|
+
const { token, exchange_url } = await extractCloudflareResult("create workers preview session", api.get(`/accounts/${api.accountId}/workers/subdomain/edge-preview`));
|
|
104
|
+
if (!exchange_url) {
|
|
105
|
+
return token;
|
|
118
106
|
}
|
|
119
|
-
catch {
|
|
120
|
-
// Ignore prewarm errors
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
async function createWorkersPreviewSession(api) {
|
|
124
|
-
const { exchange_url } = await extractCloudflareResult("create workers preview session", api.get(`/accounts/${api.accountId}/workers/subdomain/edge-preview`));
|
|
125
107
|
const accessToken = await getAccessToken(new URL(exchange_url).hostname);
|
|
126
|
-
const
|
|
108
|
+
const json = await fetch(exchange_url, {
|
|
127
109
|
headers: {
|
|
128
110
|
...(accessToken ? { cookie: `CF_Authorization=${accessToken}` } : {}),
|
|
129
111
|
},
|
|
130
|
-
})
|
|
131
|
-
|
|
132
|
-
|
|
112
|
+
})
|
|
113
|
+
.then((res) => res.json())
|
|
114
|
+
.catch(() => undefined);
|
|
115
|
+
if (typeof json === "object" &&
|
|
116
|
+
json !== null &&
|
|
117
|
+
"token" in json &&
|
|
118
|
+
typeof json.token === "string") {
|
|
119
|
+
return json.token;
|
|
133
120
|
}
|
|
134
|
-
|
|
135
|
-
return json;
|
|
121
|
+
return token;
|
|
136
122
|
}
|
|
137
123
|
/**
|
|
138
124
|
* If the given domain uses Cloudflare Access, fetches the access token for the domain.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAC/B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAG7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,qCAAqC,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-binding-proxy.js","sourceRoot":"","sources":["../../../src/cloudflare/miniflare/remote-binding-proxy.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -142,17 +142,24 @@ export const R2BucketCustomDomain = Resource(
|
|
|
142
142
|
props.jurisdiction,
|
|
143
143
|
payload,
|
|
144
144
|
).catch(async (error) => {
|
|
145
|
-
if (
|
|
146
|
-
|
|
147
|
-
error.status === 409 &&
|
|
148
|
-
adopt
|
|
149
|
-
) {
|
|
150
|
-
return await updateBucketCustomDomain(
|
|
145
|
+
if (error instanceof CloudflareApiError && error.status === 409) {
|
|
146
|
+
const existing = await getBucketCustomDomain(
|
|
151
147
|
api,
|
|
152
148
|
props.bucketName,
|
|
149
|
+
payload.domain,
|
|
153
150
|
props.jurisdiction,
|
|
154
|
-
payload,
|
|
155
151
|
);
|
|
152
|
+
if (existing && customDomainMatches(existing, payload)) {
|
|
153
|
+
return;
|
|
154
|
+
}
|
|
155
|
+
if (adopt) {
|
|
156
|
+
return await updateBucketCustomDomain(
|
|
157
|
+
api,
|
|
158
|
+
props.bucketName,
|
|
159
|
+
props.jurisdiction,
|
|
160
|
+
payload,
|
|
161
|
+
);
|
|
162
|
+
}
|
|
156
163
|
}
|
|
157
164
|
throw error;
|
|
158
165
|
});
|
|
@@ -190,6 +197,25 @@ export const R2BucketCustomDomain = Resource(
|
|
|
190
197
|
},
|
|
191
198
|
);
|
|
192
199
|
|
|
200
|
+
function customDomainMatches(
|
|
201
|
+
existing: R2BucketCustomDomain,
|
|
202
|
+
payload: R2BucketCustomDomain,
|
|
203
|
+
) {
|
|
204
|
+
return (
|
|
205
|
+
existing.domain === payload.domain &&
|
|
206
|
+
existing.zoneId === payload.zoneId &&
|
|
207
|
+
existing.enabled === payload.enabled &&
|
|
208
|
+
(existing.minTLS ?? undefined) === (payload.minTLS ?? undefined) &&
|
|
209
|
+
arraysEqual(existing.ciphers, payload.ciphers)
|
|
210
|
+
);
|
|
211
|
+
}
|
|
212
|
+
|
|
213
|
+
function arraysEqual(a: string[] | undefined, b: string[] | undefined) {
|
|
214
|
+
if (a === b) return true;
|
|
215
|
+
if (!a || !b || a.length !== b.length) return false;
|
|
216
|
+
return a.every((v, i) => v === b[i]);
|
|
217
|
+
}
|
|
218
|
+
|
|
193
219
|
async function createBucketCustomDomain(
|
|
194
220
|
api: CloudflareApi,
|
|
195
221
|
bucket: string,
|
|
@@ -95,6 +95,14 @@ interface ContainerPropsBase extends Partial<CloudflareApiOptions> {
|
|
|
95
95
|
* Defines how updates are deployed across instances.
|
|
96
96
|
*/
|
|
97
97
|
rollout?: ContainerApplicationRollout;
|
|
98
|
+
|
|
99
|
+
/**
|
|
100
|
+
* Placement constraints that control which regions or jurisdictions
|
|
101
|
+
* the container is allowed to run in.
|
|
102
|
+
*
|
|
103
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
104
|
+
*/
|
|
105
|
+
constraints?: Constraints;
|
|
98
106
|
}
|
|
99
107
|
|
|
100
108
|
/**
|
|
@@ -163,6 +171,17 @@ interface ContainerPropsWithBuild extends ContainerPropsBase {
|
|
|
163
171
|
* dockerfile: "Dockerfile"
|
|
164
172
|
* }
|
|
165
173
|
* });
|
|
174
|
+
*
|
|
175
|
+
* @example
|
|
176
|
+
* // Restricting placement to specific regions and a compliance jurisdiction
|
|
177
|
+
* const container = await Container("my-container", {
|
|
178
|
+
* className: "MyContainer",
|
|
179
|
+
* image: "nginx:alpine",
|
|
180
|
+
* constraints: {
|
|
181
|
+
* regions: ["ENAM", "WNAM"],
|
|
182
|
+
* jurisdiction: "fedramp"
|
|
183
|
+
* }
|
|
184
|
+
* });
|
|
166
185
|
*/
|
|
167
186
|
export type ContainerProps = ContainerPropsWithImage | ContainerPropsWithBuild;
|
|
168
187
|
|
|
@@ -269,6 +288,12 @@ export type Container<T = any> = {
|
|
|
269
288
|
*/
|
|
270
289
|
rollout?: ContainerApplicationRollout;
|
|
271
290
|
|
|
291
|
+
/**
|
|
292
|
+
* Placement constraints that control which regions or jurisdictions
|
|
293
|
+
* the container is allowed to run in.
|
|
294
|
+
*/
|
|
295
|
+
constraints?: Constraints;
|
|
296
|
+
|
|
272
297
|
/**
|
|
273
298
|
* @internal
|
|
274
299
|
* Phantom type parameter for additional type safety
|
|
@@ -351,6 +376,7 @@ export async function Container<T>(
|
|
|
351
376
|
dev: props.dev,
|
|
352
377
|
adopt: props.adopt,
|
|
353
378
|
rollout: props.rollout,
|
|
379
|
+
constraints: props.constraints,
|
|
354
380
|
};
|
|
355
381
|
|
|
356
382
|
const isDev = scope.local && !props.dev?.remote;
|
|
@@ -624,6 +650,14 @@ export interface ContainerApplicationProps extends CloudflareApiOptions {
|
|
|
624
650
|
*/
|
|
625
651
|
rollout?: ContainerApplicationRollout;
|
|
626
652
|
|
|
653
|
+
/**
|
|
654
|
+
* Placement constraints that control which regions or jurisdictions
|
|
655
|
+
* the container is allowed to run in.
|
|
656
|
+
*
|
|
657
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
658
|
+
*/
|
|
659
|
+
constraints?: Constraints;
|
|
660
|
+
|
|
627
661
|
/**
|
|
628
662
|
* Whether to adopt an existing container application with the same name.
|
|
629
663
|
*
|
|
@@ -670,6 +704,45 @@ export type SchedulingPolicy =
|
|
|
670
704
|
| "default"
|
|
671
705
|
| (string & {});
|
|
672
706
|
|
|
707
|
+
/**
|
|
708
|
+
* Cloudflare geographic region codes for container placement.
|
|
709
|
+
*
|
|
710
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
711
|
+
*/
|
|
712
|
+
export type Region =
|
|
713
|
+
| "AFR"
|
|
714
|
+
| "APAC"
|
|
715
|
+
| "EEUR"
|
|
716
|
+
| "ENAM"
|
|
717
|
+
| "WNAM"
|
|
718
|
+
| "ME"
|
|
719
|
+
| "OC"
|
|
720
|
+
| "SAM"
|
|
721
|
+
| "WEUR"
|
|
722
|
+
| (string & {});
|
|
723
|
+
|
|
724
|
+
/**
|
|
725
|
+
* Compliance jurisdiction for container placement.
|
|
726
|
+
*/
|
|
727
|
+
export type Jurisdiction = "eu" | "fedramp" | (string & {});
|
|
728
|
+
|
|
729
|
+
/**
|
|
730
|
+
* Placement constraints for controlling where Cloudflare Containers run.
|
|
731
|
+
*
|
|
732
|
+
* @see https://developers.cloudflare.com/containers/platform-details/placement/
|
|
733
|
+
*/
|
|
734
|
+
export interface Constraints {
|
|
735
|
+
/**
|
|
736
|
+
* Restrict placement to specific geographic regions (e.g. `["ENAM", "WNAM"]`).
|
|
737
|
+
* See {@link Region} for valid values.
|
|
738
|
+
*/
|
|
739
|
+
regions?: Region[];
|
|
740
|
+
/**
|
|
741
|
+
* Compliance jurisdiction restricting which regions are eligible.
|
|
742
|
+
*/
|
|
743
|
+
jurisdiction?: Jurisdiction;
|
|
744
|
+
}
|
|
745
|
+
|
|
673
746
|
/**
|
|
674
747
|
* A ContainerApplication resource representing a managed container deployment.
|
|
675
748
|
*
|
|
@@ -808,6 +881,13 @@ export const ContainerApplication = Resource(
|
|
|
808
881
|
},
|
|
809
882
|
},
|
|
810
883
|
};
|
|
884
|
+
const constraints = props.constraints
|
|
885
|
+
? {
|
|
886
|
+
regions: props.constraints.regions,
|
|
887
|
+
jurisdiction: props.constraints.jurisdiction,
|
|
888
|
+
}
|
|
889
|
+
: undefined;
|
|
890
|
+
|
|
811
891
|
if (this.phase === "update" && this.output?.id) {
|
|
812
892
|
const application = await updateContainerApplication(
|
|
813
893
|
api,
|
|
@@ -816,6 +896,7 @@ export const ContainerApplication = Resource(
|
|
|
816
896
|
instances: props.instances ?? 1,
|
|
817
897
|
max_instances: props.maxInstances ?? 10,
|
|
818
898
|
scheduling_policy: props.schedulingPolicy ?? "default",
|
|
899
|
+
constraints,
|
|
819
900
|
configuration,
|
|
820
901
|
},
|
|
821
902
|
);
|
|
@@ -852,9 +933,7 @@ export const ContainerApplication = Resource(
|
|
|
852
933
|
namespace_id: props.durableObjects.namespaceId,
|
|
853
934
|
}
|
|
854
935
|
: undefined,
|
|
855
|
-
constraints
|
|
856
|
-
tier: 1,
|
|
857
|
-
},
|
|
936
|
+
constraints,
|
|
858
937
|
configuration: {
|
|
859
938
|
image: imageReference,
|
|
860
939
|
instance_type: props.instanceType ?? "dev",
|
|
@@ -894,6 +973,7 @@ export const ContainerApplication = Resource(
|
|
|
894
973
|
props.maxInstances ?? existingApplication.max_instances,
|
|
895
974
|
scheduling_policy:
|
|
896
975
|
props.schedulingPolicy ?? existingApplication.scheduling_policy,
|
|
976
|
+
constraints,
|
|
897
977
|
configuration,
|
|
898
978
|
},
|
|
899
979
|
);
|
|
@@ -949,9 +1029,17 @@ export interface ContainerApplicationData {
|
|
|
949
1029
|
|
|
950
1030
|
/** Resource and placement constraints for the application */
|
|
951
1031
|
constraints: {
|
|
952
|
-
/**
|
|
953
|
-
|
|
954
|
-
|
|
1032
|
+
/**
|
|
1033
|
+
* Infrastructure tier level assigned by Cloudflare (higher means more resources).
|
|
1034
|
+
* @deprecated The API is migrating to `tiers`; may be absent on newer applications.
|
|
1035
|
+
*/
|
|
1036
|
+
tier?: number;
|
|
1037
|
+
/** Infrastructure tiers assigned by Cloudflare (replacement for `tier`) */
|
|
1038
|
+
tiers?: number[];
|
|
1039
|
+
/** Geographic regions the application is restricted to */
|
|
1040
|
+
regions?: Region[];
|
|
1041
|
+
/** Compliance jurisdiction */
|
|
1042
|
+
jurisdiction?: Jurisdiction;
|
|
955
1043
|
/** Additional constraint properties that may be added by Cloudflare */
|
|
956
1044
|
[key: string]: any;
|
|
957
1045
|
};
|
|
@@ -1099,7 +1187,21 @@ export interface CreateContainerApplicationBody {
|
|
|
1099
1187
|
};
|
|
1100
1188
|
instances?: number;
|
|
1101
1189
|
scheduling_policy?: string;
|
|
1102
|
-
constraints?: {
|
|
1190
|
+
constraints?: {
|
|
1191
|
+
/** Geographic regions the application is restricted to */
|
|
1192
|
+
regions?: Region[];
|
|
1193
|
+
/** City airport codes the application is restricted to (e.g. "MAD", "SFO") */
|
|
1194
|
+
cities?: string[];
|
|
1195
|
+
/**
|
|
1196
|
+
* Infrastructure tier the application is restricted to.
|
|
1197
|
+
* @deprecated The API is migrating to `tiers`; prefer `tiers` instead.
|
|
1198
|
+
*/
|
|
1199
|
+
tier?: number;
|
|
1200
|
+
/** Infrastructure tiers the application is restricted to */
|
|
1201
|
+
tiers?: number[];
|
|
1202
|
+
/** Compliance jurisdiction */
|
|
1203
|
+
jurisdiction?: Jurisdiction;
|
|
1204
|
+
};
|
|
1103
1205
|
affinities?: {
|
|
1104
1206
|
colocation?: "datacenter";
|
|
1105
1207
|
};
|
|
@@ -1174,30 +1276,6 @@ export async function createContainerApplication(
|
|
|
1174
1276
|
`Failed to create container application: ${result.errors?.map((e) => `[${e.code}] ${e.message}`).join(", ") ?? "Unknown error"}`,
|
|
1175
1277
|
);
|
|
1176
1278
|
}
|
|
1177
|
-
type Region =
|
|
1178
|
-
| "AFR"
|
|
1179
|
-
| "APAC"
|
|
1180
|
-
| "EEUR"
|
|
1181
|
-
| "ENAM"
|
|
1182
|
-
| "WNAM"
|
|
1183
|
-
| "ME"
|
|
1184
|
-
| "OC"
|
|
1185
|
-
| "SAM"
|
|
1186
|
-
| "WEUR"
|
|
1187
|
-
| (string & {});
|
|
1188
|
-
|
|
1189
|
-
type City =
|
|
1190
|
-
| "AFR"
|
|
1191
|
-
| "APAC"
|
|
1192
|
-
| "EEUR"
|
|
1193
|
-
| "ENAM"
|
|
1194
|
-
| "WNAM"
|
|
1195
|
-
| "ME"
|
|
1196
|
-
| "OC"
|
|
1197
|
-
| "SAM"
|
|
1198
|
-
| "WEUR"
|
|
1199
|
-
| (string & {});
|
|
1200
|
-
|
|
1201
1279
|
export type UpdateApplicationRequestBody = {
|
|
1202
1280
|
/**
|
|
1203
1281
|
* Number of deployments to maintain within this applicaiton. This can be used to scale the appliation up/down.
|
|
@@ -1209,10 +1287,19 @@ export type UpdateApplicationRequestBody = {
|
|
|
1209
1287
|
};
|
|
1210
1288
|
scheduling_policy?: SchedulingPolicy;
|
|
1211
1289
|
constraints?: {
|
|
1212
|
-
|
|
1290
|
+
/** Geographic regions the application is restricted to */
|
|
1291
|
+
regions?: Region[];
|
|
1292
|
+
/** City airport codes the application is restricted to (e.g. "MAD", "SFO") */
|
|
1293
|
+
cities?: string[];
|
|
1294
|
+
/**
|
|
1295
|
+
* Infrastructure tier the application is restricted to.
|
|
1296
|
+
* @deprecated The API is migrating to `tiers`; prefer `tiers` instead.
|
|
1297
|
+
*/
|
|
1213
1298
|
tier?: number;
|
|
1214
|
-
|
|
1215
|
-
|
|
1299
|
+
/** Infrastructure tiers the application is restricted to */
|
|
1300
|
+
tiers?: number[];
|
|
1301
|
+
/** Compliance jurisdiction */
|
|
1302
|
+
jurisdiction?: Jurisdiction;
|
|
1216
1303
|
};
|
|
1217
1304
|
/**
|
|
1218
1305
|
* The deployment configuration of all deployments created by this application.
|
|
@@ -21,12 +21,6 @@ type WranglerSessionConfig =
|
|
|
21
21
|
minimal_mode: boolean;
|
|
22
22
|
};
|
|
23
23
|
|
|
24
|
-
interface WorkersPreviewSession {
|
|
25
|
-
inspector_websocket: string;
|
|
26
|
-
prewarm: string;
|
|
27
|
-
token: string;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
24
|
export interface RemoteBindingProxy {
|
|
31
25
|
server: HTTPServer;
|
|
32
26
|
bindings: WorkerBindingSpec[];
|
|
@@ -135,7 +129,7 @@ async function createWorkersPreviewToken(
|
|
|
135
129
|
session: WranglerSessionConfig;
|
|
136
130
|
},
|
|
137
131
|
) {
|
|
138
|
-
const
|
|
132
|
+
const previewUploadToken = await createPreviewUploadToken(api);
|
|
139
133
|
const formData = await WorkerBundle.toFormData(input.bundle);
|
|
140
134
|
formData.append("metadata", JSON.stringify(input.metadata));
|
|
141
135
|
formData.append("wrangler-session-config", JSON.stringify(input.session));
|
|
@@ -146,59 +140,42 @@ async function createWorkersPreviewToken(
|
|
|
146
140
|
formData,
|
|
147
141
|
{
|
|
148
142
|
headers: {
|
|
149
|
-
"cf-preview-upload-config-token":
|
|
143
|
+
"cf-preview-upload-config-token": previewUploadToken,
|
|
150
144
|
},
|
|
151
145
|
},
|
|
152
146
|
),
|
|
153
147
|
);
|
|
154
|
-
// Fire and forget prewarm call
|
|
155
|
-
// (see https://github.com/cloudflare/workers-sdk/blob/6c6afbd6072b96e78e67d3a863ed849c6aa49472/packages/wrangler/src/dev/create-worker-preview.ts#L338)
|
|
156
|
-
void prewarm(session.prewarm, res.preview_token);
|
|
157
148
|
return res.preview_token;
|
|
158
149
|
}
|
|
159
150
|
|
|
160
|
-
async function
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
// worker URL, which only surfaces an Access 302 when the request carries
|
|
164
|
-
// the preview token.
|
|
165
|
-
const accessToken = await getAccessToken(
|
|
166
|
-
new URL(url).hostname,
|
|
167
|
-
previewToken,
|
|
168
|
-
);
|
|
169
|
-
await fetch(url, {
|
|
170
|
-
method: "POST",
|
|
171
|
-
headers: {
|
|
172
|
-
"cf-workers-preview-token": previewToken,
|
|
173
|
-
...(accessToken ? { cookie: `CF_Authorization=${accessToken}` } : {}),
|
|
174
|
-
},
|
|
175
|
-
});
|
|
176
|
-
} catch {
|
|
177
|
-
// Ignore prewarm errors
|
|
178
|
-
}
|
|
179
|
-
}
|
|
180
|
-
|
|
181
|
-
async function createWorkersPreviewSession(api: CloudflareApi) {
|
|
182
|
-
const { exchange_url } = await extractCloudflareResult<{
|
|
183
|
-
exchange_url: string;
|
|
151
|
+
async function createPreviewUploadToken(api: CloudflareApi) {
|
|
152
|
+
const { token, exchange_url } = await extractCloudflareResult<{
|
|
153
|
+
exchange_url: string | null | undefined;
|
|
184
154
|
token: string;
|
|
185
155
|
}>(
|
|
186
156
|
"create workers preview session",
|
|
187
157
|
api.get(`/accounts/${api.accountId}/workers/subdomain/edge-preview`),
|
|
188
158
|
);
|
|
159
|
+
if (!exchange_url) {
|
|
160
|
+
return token;
|
|
161
|
+
}
|
|
189
162
|
const accessToken = await getAccessToken(new URL(exchange_url).hostname);
|
|
190
|
-
const
|
|
163
|
+
const json = await fetch(exchange_url, {
|
|
191
164
|
headers: {
|
|
192
165
|
...(accessToken ? { cookie: `CF_Authorization=${accessToken}` } : {}),
|
|
193
166
|
},
|
|
194
|
-
})
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
167
|
+
})
|
|
168
|
+
.then((res) => res.json())
|
|
169
|
+
.catch(() => undefined);
|
|
170
|
+
if (
|
|
171
|
+
typeof json === "object" &&
|
|
172
|
+
json !== null &&
|
|
173
|
+
"token" in json &&
|
|
174
|
+
typeof json.token === "string"
|
|
175
|
+
) {
|
|
176
|
+
return json.token;
|
|
199
177
|
}
|
|
200
|
-
|
|
201
|
-
return json;
|
|
178
|
+
return token;
|
|
202
179
|
}
|
|
203
180
|
|
|
204
181
|
/**
|
package/workers/tunnel-proxy.js
CHANGED
|
@@ -85,7 +85,7 @@ const renderErrorHtml = (props) => `
|
|
|
85
85
|
Alchemy</a>.</p>
|
|
86
86
|
</div>
|
|
87
87
|
<div class="bg-slate-200 px-5 py-3 flex flex-col w-full max-w-lg">
|
|
88
|
-
<p class="text-sm text-slate-500">Alchemy 0.93.
|
|
88
|
+
<p class="text-sm text-slate-500">Alchemy 0.93.12</p>
|
|
89
89
|
</div>
|
|
90
90
|
</div>
|
|
91
91
|
</body>
|