alchemy 0.93.11 → 0.94.0
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/README.md +1 -1
- package/bin/alchemy.js +103 -103
- package/lib/aws/control/client.d.ts.map +1 -1
- package/lib/aws/control/client.js +2 -1
- package/lib/aws/control/client.js.map +1 -1
- package/lib/aws/control/resource.d.ts.map +1 -1
- package/lib/aws/control/resource.js +46 -5
- package/lib/aws/control/resource.js.map +1 -1
- package/lib/aws/ec2/utils.d.ts.map +1 -1
- package/lib/aws/ec2/utils.js +5 -3
- package/lib/aws/ec2/utils.js.map +1 -1
- package/lib/aws/utils.d.ts +8 -1
- package/lib/aws/utils.d.ts.map +1 -1
- package/lib/aws/utils.js +14 -1
- package/lib/aws/utils.js.map +1 -1
- package/lib/cloudflare/artifacts.d.ts +54 -0
- package/lib/cloudflare/artifacts.d.ts.map +1 -0
- package/lib/cloudflare/artifacts.js +14 -0
- package/lib/cloudflare/artifacts.js.map +1 -0
- package/lib/cloudflare/bindings.d.ts +16 -4
- package/lib/cloudflare/bindings.d.ts.map +1 -1
- package/lib/cloudflare/bindings.js.map +1 -1
- package/lib/cloudflare/bound.d.ts +2 -1
- package/lib/cloudflare/bound.d.ts.map +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/d1-database.d.ts.map +1 -1
- package/lib/cloudflare/d1-database.js +8 -2
- package/lib/cloudflare/d1-database.js.map +1 -1
- package/lib/cloudflare/hyperdrive.d.ts +8 -0
- package/lib/cloudflare/hyperdrive.d.ts.map +1 -1
- package/lib/cloudflare/hyperdrive.js +3 -1
- package/lib/cloudflare/hyperdrive.js.map +1 -1
- package/lib/cloudflare/index.d.ts +1 -0
- package/lib/cloudflare/index.d.ts.map +1 -1
- package/lib/cloudflare/index.js +1 -0
- package/lib/cloudflare/index.js.map +1 -1
- package/lib/cloudflare/miniflare/build-worker-options.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/build-worker-options.js +3 -0
- package/lib/cloudflare/miniflare/build-worker-options.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.js +3 -1
- package/lib/cloudflare/miniflare/miniflare-worker-proxy.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/lib/cloudflare/worker-metadata.d.ts +11 -0
- package/lib/cloudflare/worker-metadata.d.ts.map +1 -1
- package/lib/cloudflare/worker-metadata.js +20 -1
- package/lib/cloudflare/worker-metadata.js.map +1 -1
- package/lib/cloudflare/worker.d.ts +37 -0
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +1 -1
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/wrangler.json.js +11 -0
- package/lib/cloudflare/wrangler.json.js.map +1 -1
- package/lib/cloudflare/zone.js +1 -1
- package/lib/cloudflare/zone.js.map +1 -1
- package/lib/scope.js +2 -2
- package/lib/scope.js.map +1 -1
- package/package.json +4 -4
- package/src/aws/control/client.ts +2 -1
- package/src/aws/control/resource.ts +67 -8
- package/src/aws/ec2/utils.ts +5 -3
- package/src/aws/utils.ts +20 -2
- package/src/cloudflare/artifacts.ts +69 -0
- package/src/cloudflare/bindings.ts +17 -2
- package/src/cloudflare/bound.ts +68 -65
- package/src/cloudflare/bucket-custom-domain.ts +33 -7
- package/src/cloudflare/d1-database.ts +12 -2
- package/src/cloudflare/hyperdrive.ts +13 -1
- package/src/cloudflare/index.ts +1 -0
- package/src/cloudflare/miniflare/build-worker-options.ts +5 -0
- package/src/cloudflare/miniflare/miniflare-worker-proxy.ts +3 -1
- package/src/cloudflare/miniflare/remote-binding-proxy.ts +20 -43
- package/src/cloudflare/worker-metadata.ts +33 -1
- package/src/cloudflare/worker.ts +41 -1
- package/src/cloudflare/wrangler.json.ts +19 -0
- package/src/cloudflare/zone.ts +1 -1
- package/src/scope.ts +2 -2
- package/workers/cloudflare-state-store.js +57 -57
- package/workers/tunnel-proxy.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/control/client.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/aws/control/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/aws/control/resource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../../src/aws/control/resource.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAsBhD;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAElC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAqB,SAAQ,yBAAyB;IACrE;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;CACnB;AA0ED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,OAmClD;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AACH,eAAO,MAAM,oBAAoB,6GAGhC,CAAC;AAsBF,iBAAe,qBAAqB,CAClC,IAAI,EAAE,OAAO,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,EAC9D,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,yBAAyB;;;IArPhC;;OAEG;cACO,MAAM;IAEhB;;OAEG;kBACW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAEjC;;OAEG;YACK,OAAO;IAEf;;;OAGG;aACM,MAAM;IAEf;;OAEG;kBACW,MAAM;IAEpB;;OAEG;sBACe,MAAM;IAExB;;OAEG;mBACY,MAAM;GAuWtB"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import jsonpatch from "fast-json-patch";
|
|
2
2
|
import { registerDynamicResource, Resource, } from "../../resource.js";
|
|
3
3
|
import { logger } from "../../util/logger.js";
|
|
4
|
-
import { createCloudControlClient } from "./client.js";
|
|
4
|
+
import { createCloudControlClient, } from "./client.js";
|
|
5
5
|
import { AlreadyExistsError, ConcurrentOperationError, NotFoundError, UpdateFailedError, } from "./error.js";
|
|
6
6
|
import readOnlyPropertiesMap from "./properties.js";
|
|
7
7
|
import updateTypesMap from "./update-types.js";
|
|
@@ -167,8 +167,18 @@ async function CloudControlLifecycle(id, props) {
|
|
|
167
167
|
if (this.phase === "update" && this.output?.id) {
|
|
168
168
|
// Check if any immutable properties have changed
|
|
169
169
|
const currentResource = await client.getResource(props.typeName, this.output.id);
|
|
170
|
-
if (currentResource
|
|
171
|
-
|
|
170
|
+
if (!currentResource) {
|
|
171
|
+
// The physical resource no longer exists (deleted or detached out-of-band),
|
|
172
|
+
// so there is nothing to patch. Falling through to UpdateResource would fail
|
|
173
|
+
// on types with no update support (e.g. AWS::EC2::VolumeAttachment, whose
|
|
174
|
+
// properties are all Immutable). Recreate via replacement instead. Force the
|
|
175
|
+
// replacement (delete-before-create) because the old resource is already gone
|
|
176
|
+
// (delete tolerates NotFoundError) and a deferred delete would destroy the
|
|
177
|
+
// new resource if it reuses the same identifier (e.g. an unchanged BucketName).
|
|
178
|
+
logger.log(`Resource ${id} no longer exists (empty read-back on update), requiring replacement`);
|
|
179
|
+
return this.replace(true);
|
|
180
|
+
}
|
|
181
|
+
if (hasImmutablePropertyChanges(props.typeName, currentResource, props.desiredState)) {
|
|
172
182
|
logger.log(`Resource ${id} has immutable property changes, requiring replacement`);
|
|
173
183
|
return this.replace();
|
|
174
184
|
}
|
|
@@ -182,7 +192,7 @@ async function CloudControlLifecycle(id, props) {
|
|
|
182
192
|
}
|
|
183
193
|
catch (error) {
|
|
184
194
|
if (error instanceof AlreadyExistsError && props.adopt) {
|
|
185
|
-
const resource =
|
|
195
|
+
const resource = await getResourceForAdoption(client, props.typeName, error.progressEvent.Identifier, error);
|
|
186
196
|
response = await updateResourceWithPatch(client, props.typeName, error.progressEvent.Identifier, resource, props.desiredState);
|
|
187
197
|
}
|
|
188
198
|
else if (error instanceof ConcurrentOperationError) {
|
|
@@ -198,7 +208,7 @@ async function CloudControlLifecycle(id, props) {
|
|
|
198
208
|
// Poll the concurrent operation until it completes
|
|
199
209
|
const concurrentResult = await client.poll(error.requestToken);
|
|
200
210
|
// The concurrent operation succeeded, now adopt the resource
|
|
201
|
-
const resource =
|
|
211
|
+
const resource = await getResourceForAdoption(client, props.typeName, concurrentResult.Identifier);
|
|
202
212
|
// Apply our desired state as a patch to the existing resource
|
|
203
213
|
response = await updateResourceWithPatch(client, props.typeName, concurrentResult.Identifier, resource, props.desiredState);
|
|
204
214
|
}
|
|
@@ -227,6 +237,37 @@ async function CloudControlLifecycle(id, props) {
|
|
|
227
237
|
...(await client.getResource(props.typeName, response.Identifier)),
|
|
228
238
|
};
|
|
229
239
|
}
|
|
240
|
+
/**
|
|
241
|
+
* Read back a resource that Cloud Control reported as already existing so it
|
|
242
|
+
* can be adopted. The read-back is retried briefly because some services are
|
|
243
|
+
* eventually consistent between the create conflict and GetResource.
|
|
244
|
+
*
|
|
245
|
+
* If the resource still cannot be read back, adoption is impossible — most
|
|
246
|
+
* commonly the name is taken in a globally shared namespace but not visible
|
|
247
|
+
* in this account (e.g. an S3 bucket owned by another AWS account, or a
|
|
248
|
+
* recently deleted name still held by the service). Cloud Control reports
|
|
249
|
+
* both as AlreadyExists, so fail with an actionable error instead of letting
|
|
250
|
+
* `undefined` flow into the patch computation.
|
|
251
|
+
*/
|
|
252
|
+
async function getResourceForAdoption(client, typeName, identifier, cause) {
|
|
253
|
+
if (identifier) {
|
|
254
|
+
let delay = 500;
|
|
255
|
+
for (let attempt = 0; attempt < 5; attempt++) {
|
|
256
|
+
if (attempt > 0) {
|
|
257
|
+
await new Promise((resolve) => setTimeout(resolve, delay));
|
|
258
|
+
delay *= 2;
|
|
259
|
+
}
|
|
260
|
+
const resource = await client.getResource(typeName, identifier);
|
|
261
|
+
if (resource !== undefined) {
|
|
262
|
+
return resource;
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
}
|
|
266
|
+
throw new Error(`Resource ${typeName} "${identifier}" already exists but could not be read back for adoption. ` +
|
|
267
|
+
"It may belong to a different AWS account (e.g. S3 bucket names are globally unique), " +
|
|
268
|
+
"exist in a different region, or its name may still be reserved by a recent deletion. " +
|
|
269
|
+
"Choose a different name or wait for the name to become available.", { cause });
|
|
270
|
+
}
|
|
230
271
|
async function updateResourceWithPatch(client, typeName, resourceId, currentState, desiredState) {
|
|
231
272
|
// Filter out read-only properties to avoid patch conflicts
|
|
232
273
|
const filteredCurrentState = filterReadOnlyProperties(typeName, currentState);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../../src/aws/control/resource.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,iBAAiB,CAAC;AAExC,OAAO,EACL,uBAAuB,EACvB,QAAQ,GAET,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../../src/aws/control/resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAKtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/aws/ec2/utils.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAKtC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EAAe,SAAS,EAAE,MAAM,aAAa,CAAC;AAErD;;GAEG;AAEH;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,KAAK,CAAC,EAAE,cAAc,GACrB,OAAO,CAAC,SAAS,CAAC,CAoDpB;AAYD;;GAEG;AACH,wBAAsB,UAAU,CAAC,CAAC,EAChC,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,EACtC,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAM,GAC/B,OAAO,CAAC,CAAC,CAAC,CAoEZ;AAGD,OAAO,EAAE,SAAS,EAAE,CAAC"}
|
package/lib/aws/ec2/utils.js
CHANGED
|
@@ -5,7 +5,7 @@ import { Secret } from "../../secret.js";
|
|
|
5
5
|
import { logger } from "../../util/logger.js";
|
|
6
6
|
import { flattenParams } from "../../util/params.js";
|
|
7
7
|
import { resolveAwsCredentials } from "../credentials.js";
|
|
8
|
-
import { getRegion } from "../utils.js";
|
|
8
|
+
import { awsEndpoint, getRegion } from "../utils.js";
|
|
9
9
|
/**
|
|
10
10
|
* Shared EC2 utilities for all EC2 resources
|
|
11
11
|
*/
|
|
@@ -86,8 +86,10 @@ export async function callEC2Api(client, action, responseParser, params = {}) {
|
|
|
86
86
|
// Try the API call, and retry once with fresh credentials on auth failure
|
|
87
87
|
for (let attempt = 1; attempt <= 2; attempt++) {
|
|
88
88
|
try {
|
|
89
|
-
// Use the client's region instead of the global region
|
|
90
|
-
|
|
89
|
+
// Use the client's region instead of the global region.
|
|
90
|
+
// Honour AWS_ENDPOINT_URL / AWS_ENDPOINT_URL_EC2 for emulators
|
|
91
|
+
// (LocalStack, moto, etc.) — matches AWS SDK v3 behaviour.
|
|
92
|
+
const url = `${awsEndpoint("ec2", client.region ?? "us-east-1")}/`;
|
|
91
93
|
const body = new URLSearchParams({
|
|
92
94
|
Action: action,
|
|
93
95
|
Version: "2016-11-15",
|
package/lib/aws/ec2/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/aws/ec2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/aws/ec2/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/aws/utils.d.ts
CHANGED
|
@@ -4,13 +4,20 @@ import { AwsClient } from "aws4fetch";
|
|
|
4
4
|
* Get AWS region from configuration
|
|
5
5
|
*/
|
|
6
6
|
export declare const getRegion: Provider<string>;
|
|
7
|
+
/**
|
|
8
|
+
* Resolve the endpoint URL for an aws4fetch service request, honouring the
|
|
9
|
+
* same `AWS_ENDPOINT_URL_<SERVICE>` / `AWS_ENDPOINT_URL` env vars as the AWS
|
|
10
|
+
* SDK / CLI so aws4fetch-based resources can be pointed at LocalStack, moto,
|
|
11
|
+
* or any other emulator.
|
|
12
|
+
*/
|
|
13
|
+
export declare function awsEndpoint(service: string, region: string): string;
|
|
7
14
|
/**
|
|
8
15
|
* AWS Service Configuration
|
|
9
16
|
*/
|
|
10
17
|
export interface AwsServiceConfig {
|
|
11
18
|
service: string;
|
|
12
19
|
version: string;
|
|
13
|
-
endpoint
|
|
20
|
+
endpoint?: (region: string) => string;
|
|
14
21
|
}
|
|
15
22
|
/**
|
|
16
23
|
* AWS API Caller interface
|
package/lib/aws/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/aws/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,MAAM,CAKrC,CAAC;AAEH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/aws/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC;;GAEG;AACH,eAAO,MAAM,SAAS,EAAE,QAAQ,CAAC,MAAM,CAKrC,CAAC;AAEH;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAQnE;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC;CACvC;AAED;;GAEG;AACH,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,GAAG;IACnC,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IACnC,OAAO,CAAC,CAAC,GAAG,CAAC,EACX,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC3B,OAAO,CAAC,CAAC,CAAC,CAAC;CACf;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,CAAC,GAAG,GAAG,EACrC,MAAM,EAAE,gBAAgB,EACxB,cAAc,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,GACrC,YAAY,CAAC,CAAC,CAAC,CAgGjB"}
|
package/lib/aws/utils.js
CHANGED
|
@@ -10,6 +10,17 @@ export const getRegion = loadConfig({
|
|
|
10
10
|
configFileSelector: (profile) => profile.region,
|
|
11
11
|
default: "us-east-1",
|
|
12
12
|
});
|
|
13
|
+
/**
|
|
14
|
+
* Resolve the endpoint URL for an aws4fetch service request, honouring the
|
|
15
|
+
* same `AWS_ENDPOINT_URL_<SERVICE>` / `AWS_ENDPOINT_URL` env vars as the AWS
|
|
16
|
+
* SDK / CLI so aws4fetch-based resources can be pointed at LocalStack, moto,
|
|
17
|
+
* or any other emulator.
|
|
18
|
+
*/
|
|
19
|
+
export function awsEndpoint(service, region) {
|
|
20
|
+
return (process.env[`AWS_ENDPOINT_URL_${service.toUpperCase().replace(/-/g, "_")}`] ??
|
|
21
|
+
process.env.AWS_ENDPOINT_URL ??
|
|
22
|
+
`https://${service}.${region}.amazonaws.com`).replace(/\/+$/, "");
|
|
23
|
+
}
|
|
13
24
|
/**
|
|
14
25
|
* Create an AWS API caller for a specific service
|
|
15
26
|
*/
|
|
@@ -29,7 +40,9 @@ export function getAwsApiCaller(config, responseParser) {
|
|
|
29
40
|
for (let attempt = 1; attempt <= 2; attempt++) {
|
|
30
41
|
try {
|
|
31
42
|
const region = await getRegion();
|
|
32
|
-
const url = config.endpoint
|
|
43
|
+
const url = config.endpoint
|
|
44
|
+
? config.endpoint(region)
|
|
45
|
+
: `${awsEndpoint(config.service, region)}/`;
|
|
33
46
|
const body = new URLSearchParams({
|
|
34
47
|
Action: action,
|
|
35
48
|
Version: config.version,
|
package/lib/aws/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aws/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD;;GAEG;AACH,MAAM,CAAC,MAAM,SAAS,GAAqB,UAAU,CAAC;IACpD,2BAA2B,EAAE,CAAC,GAAQ,EAAE,EAAE,CACxC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,kBAAkB;IAC1C,kBAAkB,EAAE,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM;IACpD,OAAO,EAAE,WAAW;CACrB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/aws/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Properties for creating an Artifacts binding.
|
|
3
|
+
*
|
|
4
|
+
* Artifacts namespaces are created implicitly by Cloudflare when the first
|
|
5
|
+
* repository is created in the namespace, so this binding does not provision
|
|
6
|
+
* or delete a namespace resource.
|
|
7
|
+
*/
|
|
8
|
+
export interface ArtifactsProps {
|
|
9
|
+
/**
|
|
10
|
+
* Artifacts namespace name.
|
|
11
|
+
*/
|
|
12
|
+
namespace: string;
|
|
13
|
+
dev?: {
|
|
14
|
+
/**
|
|
15
|
+
* Whether to run the Artifacts binding remotely in local development.
|
|
16
|
+
*
|
|
17
|
+
* Artifacts do not have a local emulator, so generated Wrangler config
|
|
18
|
+
* defaults this binding to remote mode.
|
|
19
|
+
*
|
|
20
|
+
* @default true
|
|
21
|
+
*/
|
|
22
|
+
remote?: boolean;
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Cloudflare Artifacts binding.
|
|
27
|
+
*
|
|
28
|
+
* Artifacts namespaces are implicit containers for repositories. Use this
|
|
29
|
+
* helper to bind a Worker to a namespace; repository lifecycle should be
|
|
30
|
+
* managed through the Artifacts runtime API, REST API, or Git endpoint.
|
|
31
|
+
*
|
|
32
|
+
* @example
|
|
33
|
+
* ```ts
|
|
34
|
+
* import { Artifacts, Worker } from "alchemy/cloudflare";
|
|
35
|
+
*
|
|
36
|
+
* await Worker("site-editor", {
|
|
37
|
+
* entrypoint: "./src/worker.ts",
|
|
38
|
+
* bindings: {
|
|
39
|
+
* SITE_ARTIFACTS: Artifacts({ namespace: "my-sites" }),
|
|
40
|
+
* },
|
|
41
|
+
* });
|
|
42
|
+
* ```
|
|
43
|
+
*
|
|
44
|
+
* @see https://developers.cloudflare.com/artifacts/
|
|
45
|
+
*/
|
|
46
|
+
export interface Artifacts {
|
|
47
|
+
type: "artifacts";
|
|
48
|
+
namespace: string;
|
|
49
|
+
dev?: {
|
|
50
|
+
remote?: boolean;
|
|
51
|
+
};
|
|
52
|
+
}
|
|
53
|
+
export declare function Artifacts(props: string | ArtifactsProps): Artifacts;
|
|
54
|
+
//# sourceMappingURL=artifacts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifacts.d.ts","sourceRoot":"","sources":["../../src/cloudflare/artifacts.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB,GAAG,CAAC,EAAE;QACJ;;;;;;;WAOG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,WAAW,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE;QACJ,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAanE"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export function Artifacts(props) {
|
|
2
|
+
if (typeof props === "string") {
|
|
3
|
+
return {
|
|
4
|
+
type: "artifacts",
|
|
5
|
+
namespace: props,
|
|
6
|
+
};
|
|
7
|
+
}
|
|
8
|
+
return {
|
|
9
|
+
type: "artifacts",
|
|
10
|
+
namespace: props.namespace,
|
|
11
|
+
dev: props.dev,
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=artifacts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"artifacts.js","sourceRoot":"","sources":["../../src/cloudflare/artifacts.ts"],"names":[],"mappings":"AAuDA,MAAM,UAAU,SAAS,CAAC,KAA8B;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,KAAK;SACjB,CAAC;IACJ,CAAC;IAED,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,GAAG,EAAE,KAAK,CAAC,GAAG;KACf,CAAC;AACJ,CAAC"}
|
|
@@ -8,6 +8,7 @@ import type { Ai } from "./ai.ts";
|
|
|
8
8
|
import type { AiSearchNamespace } from "./ai-search-namespace.ts";
|
|
9
9
|
import type { AiSearch } from "./ai-search.ts";
|
|
10
10
|
import type { AnalyticsEngineDataset } from "./analytics-engine.ts";
|
|
11
|
+
import type { Artifacts } from "./artifacts.ts";
|
|
11
12
|
import type { Assets } from "./assets.ts";
|
|
12
13
|
import type { Bound } from "./bound.ts";
|
|
13
14
|
import type { BrowserRendering } from "./browser-rendering.ts";
|
|
@@ -46,7 +47,7 @@ export declare namespace Bindings {
|
|
|
46
47
|
/**
|
|
47
48
|
* L2 Binding Resources.
|
|
48
49
|
*/
|
|
49
|
-
export type Binding = Ai | AiSearch | AiSearchNamespace | Assets | Container | CloudflareSecret | CloudflareSecretRef | D1Database | DispatchNamespace | AnalyticsEngineDataset | DurableObjectNamespace<any> | Hyperdrive | HyperdriveRef | Images | KVNamespace | Pipeline | Queue | RateLimit | R2Bucket | EmailSender | {
|
|
50
|
+
export type Binding = Ai | AiSearch | AiSearchNamespace | Assets | Artifacts | Container | CloudflareSecret | CloudflareSecretRef | D1Database | DispatchNamespace | AnalyticsEngineDataset | DurableObjectNamespace<any> | Hyperdrive | HyperdriveRef | Images | KVNamespace | Pipeline | Queue | RateLimit | R2Bucket | EmailSender | {
|
|
50
51
|
type: "kv_namespace";
|
|
51
52
|
id: string;
|
|
52
53
|
} | Secret | SecretKey | string | VectorizeIndex | Worker | Worker.DevDomain | Worker.DevUrl | WorkerStub | WorkerRef | WorkerEntrypoint | WorkerLoader | Workflow | BrowserRendering | VersionMetadata | Self | Json | VpcService;
|
|
@@ -69,7 +70,7 @@ export declare function Json<const T>(value: T): Json<T>;
|
|
|
69
70
|
/**
|
|
70
71
|
* Union type for all Worker binding types (API spec)
|
|
71
72
|
*/
|
|
72
|
-
export type WorkerBindingSpec = WorkerBindingAI | WorkerBindingAiSearch | WorkerBindingAiSearchNamespace | WorkerBindingAnalyticsEngine | WorkerBindingAssets | WorkerBindingBrowserRendering | WorkerBindingD1 | WorkerBindingDispatchNamespace | WorkerBindingDurableObjectNamespace | WorkerBindingHyperdrive | WorkerBindingImages | WorkerBindingJson | WorkerBindingKVNamespace | WorkerBindingMTLSCertificate | WorkerBindingPipeline | WorkerBindingPlainText | WorkerBindingQueue | WorkerBindingRateLimit | WorkerBindingR2Bucket | WorkerBindingSendEmail | WorkerBindingSecretKey | WorkerBindingSecretText | WorkerBindingSecretsStore | WorkerBindingSecretsStoreSecret | WorkerBindingService | WorkerBindingStaticContent | WorkerBindingTailConsumer | WorkerBindingVectorize | WorkerBindingVersionMetadata | WorkerBindingWasmModule | WorkerBindingWorkerLoader | WorkerBindingWorkflow | WorkerBindingVpcService;
|
|
73
|
+
export type WorkerBindingSpec = WorkerBindingAI | WorkerBindingAiSearch | WorkerBindingAiSearchNamespace | WorkerBindingAnalyticsEngine | WorkerBindingArtifacts | WorkerBindingAssets | WorkerBindingBrowserRendering | WorkerBindingD1 | WorkerBindingDispatchNamespace | WorkerBindingDurableObjectNamespace | WorkerBindingHyperdrive | WorkerBindingImages | WorkerBindingJson | WorkerBindingKVNamespace | WorkerBindingMTLSCertificate | WorkerBindingPipeline | WorkerBindingPlainText | WorkerBindingQueue | WorkerBindingRateLimit | WorkerBindingR2Bucket | WorkerBindingSendEmail | WorkerBindingSecretKey | WorkerBindingSecretText | WorkerBindingSecretsStore | WorkerBindingSecretsStoreSecret | WorkerBindingService | WorkerBindingStaticContent | WorkerBindingTailConsumer | WorkerBindingVectorize | WorkerBindingVersionMetadata | WorkerBindingWasmModule | WorkerBindingWorkerLoader | WorkerBindingWorkflow | WorkerBindingVpcService;
|
|
73
74
|
/**
|
|
74
75
|
* AI binding type
|
|
75
76
|
*/
|
|
@@ -115,6 +116,17 @@ export interface WorkerBindingAnalyticsEngine {
|
|
|
115
116
|
/** Dataset name */
|
|
116
117
|
dataset: string;
|
|
117
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* Artifacts binding type
|
|
121
|
+
*/
|
|
122
|
+
export interface WorkerBindingArtifacts {
|
|
123
|
+
/** The name of the binding */
|
|
124
|
+
name: string;
|
|
125
|
+
/** Type identifier for Artifacts binding */
|
|
126
|
+
type: "artifacts";
|
|
127
|
+
/** Artifacts namespace name */
|
|
128
|
+
namespace: string;
|
|
129
|
+
}
|
|
118
130
|
/**
|
|
119
131
|
* Assets binding type
|
|
120
132
|
*/
|
|
@@ -198,8 +210,8 @@ export interface WorkerBindingJson {
|
|
|
198
210
|
name: string;
|
|
199
211
|
/** Type identifier for JSON binding */
|
|
200
212
|
type: "json";
|
|
201
|
-
/** JSON value */
|
|
202
|
-
json:
|
|
213
|
+
/** JSON value, sent raw (not stringified) so the runtime injects native types */
|
|
214
|
+
json: unknown;
|
|
203
215
|
}
|
|
204
216
|
/**
|
|
205
217
|
* KV Namespace binding type
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bindings.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bindings.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bindings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/cloudflare/bindings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bindings.js","sourceRoot":"","sources":["../../src/cloudflare/bindings.ts"],"names":[],"mappings":"AAuGA,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,IAAI,EAAE,0BAA0B;CACxB,CAAC;AAWX,MAAM,UAAU,IAAI,CAAU,KAAQ;IACpC,OAAO;QACL,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,KAAK;KACZ,CAAC;AACJ,CAAC"}
|
|
@@ -4,6 +4,7 @@ import type { Ai as _Ai } from "./ai.ts";
|
|
|
4
4
|
import type { AiSearchNamespace as _AiSearchNamespace } from "./ai-search-namespace.ts";
|
|
5
5
|
import type { AiSearch as _AiSearch } from "./ai-search.ts";
|
|
6
6
|
import type { AnalyticsEngineDataset as _AnalyticsEngineDataset } from "./analytics-engine.ts";
|
|
7
|
+
import type { Artifacts as _Artifacts } from "./artifacts.ts";
|
|
7
8
|
import type { Assets } from "./assets.ts";
|
|
8
9
|
import type { Binding, Json, Self } from "./bindings.ts";
|
|
9
10
|
import type { BrowserRendering } from "./browser-rendering.ts";
|
|
@@ -34,7 +35,7 @@ type BoundWorker<RPC extends Rpc.WorkerEntrypointBranded = Rpc.WorkerEntrypointB
|
|
|
34
35
|
};
|
|
35
36
|
export type Bound<T extends Binding> = T extends _AiSearch ? AiSearchInstance : T extends _AiSearchNamespace ? AiSearchNamespace : T extends _DurableObjectNamespace<infer O> ? DurableObjectNamespace<O & Rpc.DurableObjectBranded> : T extends {
|
|
36
37
|
type: "kv_namespace";
|
|
37
|
-
} ? KVNamespace : T extends WorkerStub<infer RPC> ? BoundWorker<RPC> : T extends _Worker<any, infer RPC> | WorkerRef<infer RPC> ? BoundWorker<RPC> : T extends {
|
|
38
|
+
} ? KVNamespace : T extends WorkerStub<infer RPC> ? BoundWorker<RPC> : T extends _Worker<any, infer RPC> | WorkerRef<infer RPC> ? BoundWorker<RPC> : T extends _Artifacts ? Artifacts : T extends {
|
|
38
39
|
type: "service";
|
|
39
40
|
} ? Service : T extends _R2Bucket ? R2Bucket : T extends _Hyperdrive | HyperdriveRef ? Hyperdrive : T extends Secret ? string : T extends CloudflareSecret | CloudflareSecretRef ? SecretsStoreSecret : T extends _EmailSender ? SendEmail : T extends SecretKey ? CryptoKey : T extends Assets ? Service : T extends _Workflow<infer P> ? Workflow<P> : T extends _D1Database ? D1Database : T extends DispatchNamespace ? DispatchNamespace : T extends _WorkerLoader ? WorkerLoader : T extends _VectorizeIndex ? VectorizeIndex : T extends _Queue<infer Body> ? Queue<Body> : T extends _AnalyticsEngineDataset ? AnalyticsEngineDataset : T extends _Pipeline<infer R> ? Pipeline<R> : T extends _RateLimit ? RateLimit : T extends string ? T : T extends BrowserRendering ? BrowserRun : T extends _Ai<infer M> ? Ai<M> : T extends _Images ? ImagesBinding : T extends _VersionMetadata ? WorkerVersionMetadata : T extends _Worker.DevDomain | _Worker.DevUrl ? string : T extends Self ? Service : T extends Json<infer T> ? T : T extends _Container<infer Obj> ? DurableObjectNamespace<Obj & Rpc.DurableObjectBranded> : T extends _VpcService ? Fetcher : T extends undefined ? undefined : Service;
|
|
40
41
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bound.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bound.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bound.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bound.ts"],"names":[],"mappings":"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"}
|
|
@@ -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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"}
|