alchemy 0.85.0 → 0.85.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/bin/alchemy.js +32 -23
- package/lib/cloudflare/account-api-token.d.ts +5 -0
- package/lib/cloudflare/account-api-token.d.ts.map +1 -1
- package/lib/cloudflare/account-api-token.js +13 -2
- package/lib/cloudflare/account-api-token.js.map +1 -1
- package/lib/cloudflare/ai-crawler.d.ts +27 -0
- package/lib/cloudflare/ai-crawler.d.ts.map +1 -0
- package/lib/cloudflare/ai-crawler.js +75 -0
- package/lib/cloudflare/ai-crawler.js.map +1 -0
- package/lib/cloudflare/ai-search-token.d.ts +150 -0
- package/lib/cloudflare/ai-search-token.d.ts.map +1 -0
- package/lib/cloudflare/ai-search-token.js +171 -0
- package/lib/cloudflare/ai-search-token.js.map +1 -0
- package/lib/cloudflare/ai-search.d.ts +397 -0
- package/lib/cloudflare/ai-search.d.ts.map +1 -0
- package/lib/cloudflare/ai-search.js +307 -0
- package/lib/cloudflare/ai-search.js.map +1 -0
- package/lib/cloudflare/auth.d.ts +3 -2
- package/lib/cloudflare/auth.d.ts.map +1 -1
- package/lib/cloudflare/auth.js +17 -14
- package/lib/cloudflare/auth.js.map +1 -1
- package/lib/cloudflare/bucket-custom-domain.d.ts.map +1 -1
- package/lib/cloudflare/bucket-custom-domain.js +4 -2
- package/lib/cloudflare/bucket-custom-domain.js.map +1 -1
- package/lib/cloudflare/bucket.d.ts.map +1 -1
- package/lib/cloudflare/bucket.js +8 -2
- package/lib/cloudflare/bucket.js.map +1 -1
- package/lib/cloudflare/index.d.ts +3 -0
- package/lib/cloudflare/index.d.ts.map +1 -1
- package/lib/cloudflare/index.js +3 -0
- package/lib/cloudflare/index.js.map +1 -1
- package/lib/cloudflare/permission-groups.d.ts +5 -0
- package/lib/cloudflare/permission-groups.d.ts.map +1 -1
- package/lib/cloudflare/permission-groups.js +6 -0
- package/lib/cloudflare/permission-groups.js.map +1 -1
- package/lib/cloudflare/sveltekit/plugin.d.ts.map +1 -1
- package/lib/cloudflare/sveltekit/plugin.js +11 -5
- package/lib/cloudflare/sveltekit/plugin.js.map +1 -1
- package/lib/cloudflare/vite/vite.d.ts.map +1 -1
- package/lib/cloudflare/vite/vite.js +2 -1
- package/lib/cloudflare/vite/vite.js.map +1 -1
- package/lib/docker/api.d.ts +33 -2
- package/lib/docker/api.d.ts.map +1 -1
- package/lib/docker/api.js +8 -4
- package/lib/docker/api.js.map +1 -1
- package/lib/docker/container.d.ts +1 -1
- package/lib/docker/container.d.ts.map +1 -1
- package/lib/docker/container.js +244 -15
- package/lib/docker/container.js.map +1 -1
- package/lib/scope.d.ts +1 -1
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +10 -5
- package/lib/scope.js.map +1 -1
- package/lib/test/bun.d.ts +17 -0
- package/lib/test/bun.d.ts.map +1 -1
- package/lib/test/bun.js +2 -1
- package/lib/test/bun.js.map +1 -1
- package/lib/test/vitest.d.ts +17 -0
- package/lib/test/vitest.d.ts.map +1 -1
- package/lib/test/vitest.js +4 -1
- package/lib/test/vitest.js.map +1 -1
- package/lib/util/snake-to-camel.d.ts +21 -0
- package/lib/util/snake-to-camel.d.ts.map +1 -0
- package/lib/util/snake-to-camel.js +34 -0
- package/lib/util/snake-to-camel.js.map +1 -0
- package/package.json +1 -1
- package/src/cloudflare/account-api-token.ts +23 -6
- package/src/cloudflare/ai-crawler.ts +89 -0
- package/src/cloudflare/ai-search-token.ts +324 -0
- package/src/cloudflare/ai-search.ts +952 -0
- package/src/cloudflare/auth.ts +17 -14
- package/src/cloudflare/bucket-custom-domain.ts +4 -1
- package/src/cloudflare/bucket.ts +9 -2
- package/src/cloudflare/index.ts +3 -0
- package/src/cloudflare/permission-groups.ts +6 -0
- package/src/cloudflare/sveltekit/plugin.ts +17 -8
- package/src/cloudflare/vite/vite.ts +4 -2
- package/src/docker/api.ts +47 -4
- package/src/docker/container.ts +318 -18
- package/src/scope.ts +14 -5
- package/src/test/bun.ts +26 -1
- package/src/test/vitest.ts +34 -1
- package/src/util/snake-to-camel.ts +59 -0
- package/workers/tunnel-proxy.js +1 -1
|
@@ -0,0 +1,307 @@
|
|
|
1
|
+
import { Resource } from "../resource.js";
|
|
2
|
+
import { logger } from "../util/logger.js";
|
|
3
|
+
import { poll } from "../util/poll.js";
|
|
4
|
+
import { sleep } from "../util/sleep.js";
|
|
5
|
+
import { snakeToCamelObjectDeep, } from "../util/snake-to-camel.js";
|
|
6
|
+
import { AiSearchToken } from "./ai-search-token.js";
|
|
7
|
+
import { CloudflareApiError, isCloudflareApiError } from "./api-error.js";
|
|
8
|
+
import { extractCloudflareResult, } from "./api-response.js";
|
|
9
|
+
import { createCloudflareApi, } from "./api.js";
|
|
10
|
+
import { getBucket, isBucket, } from "./bucket.js";
|
|
11
|
+
import { deleteIndex } from "./vectorize-index.js";
|
|
12
|
+
export const AiSearch = Resource("cloudflare::AiSearch", async function (id, props) {
|
|
13
|
+
const api = await createCloudflareApi(props);
|
|
14
|
+
const adopt = props.adopt ?? this.scope.adopt;
|
|
15
|
+
const validateBucketSource = async (bucket, jurisdiction = "default") => {
|
|
16
|
+
let name;
|
|
17
|
+
if (typeof bucket === "string") {
|
|
18
|
+
name = bucket;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
if (this.scope.local && !bucket.dev?.remote) {
|
|
22
|
+
throw new Error([
|
|
23
|
+
`AI Search "${id}" depends on an R2Bucket that is running locally, but AI Search requires the bucket to be deployed.`,
|
|
24
|
+
"Add `dev: { remote: true }` to the R2Bucket to use it with AI Search.",
|
|
25
|
+
].join("\n"));
|
|
26
|
+
}
|
|
27
|
+
name = bucket.name;
|
|
28
|
+
}
|
|
29
|
+
try {
|
|
30
|
+
await getBucket(api, name, { jurisdiction });
|
|
31
|
+
}
|
|
32
|
+
catch (error) {
|
|
33
|
+
throw new Error(`Failed to validate R2 bucket "${name}" (${jurisdiction}) for AI search "${id}": ${error instanceof Error ? error.message : String(error)}`, { cause: error });
|
|
34
|
+
}
|
|
35
|
+
};
|
|
36
|
+
const normalizeSource = async (source) => {
|
|
37
|
+
if (isBucket(source)) {
|
|
38
|
+
await validateBucketSource(source, source.jurisdiction);
|
|
39
|
+
return {
|
|
40
|
+
type: "r2",
|
|
41
|
+
bucket: source.name,
|
|
42
|
+
jurisdiction: source.jurisdiction,
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
else if (source.type === "r2" && isBucket(source.bucket)) {
|
|
46
|
+
await validateBucketSource(source.bucket, source.bucket.jurisdiction);
|
|
47
|
+
return {
|
|
48
|
+
...source,
|
|
49
|
+
type: "r2",
|
|
50
|
+
bucket: source.bucket.name,
|
|
51
|
+
jurisdiction: source.bucket.jurisdiction,
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
else if (source.type === "web-crawler") {
|
|
55
|
+
await validateWebCrawlerSourceDomain(api, source.domain);
|
|
56
|
+
return source;
|
|
57
|
+
}
|
|
58
|
+
else {
|
|
59
|
+
await validateBucketSource(source.bucket, source.jurisdiction);
|
|
60
|
+
return source;
|
|
61
|
+
}
|
|
62
|
+
};
|
|
63
|
+
const validateTokenId = (id) => {
|
|
64
|
+
if (!/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(id)) {
|
|
65
|
+
throw new Error(`Invalid token ID: "${id}"\n` +
|
|
66
|
+
"The token ID must be a valid UUID for an AI Search service token.\n" +
|
|
67
|
+
"See https://developers.cloudflare.com/ai-search/get-started/api/#2-create-a-service-api-token");
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
const normalizeTokenId = async () => {
|
|
71
|
+
if ("tokenId" in props) {
|
|
72
|
+
validateTokenId(props.tokenId);
|
|
73
|
+
return props.tokenId;
|
|
74
|
+
}
|
|
75
|
+
else if (props.token) {
|
|
76
|
+
validateTokenId(props.token.tokenId);
|
|
77
|
+
return props.token.tokenId;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
const token = await AiSearchToken("token", {
|
|
81
|
+
baseUrl: props.baseUrl,
|
|
82
|
+
profile: props.profile,
|
|
83
|
+
apiKey: props.apiKey,
|
|
84
|
+
apiToken: props.apiToken,
|
|
85
|
+
accountId: props.accountId,
|
|
86
|
+
email: props.email,
|
|
87
|
+
adopt: props.adopt,
|
|
88
|
+
delete: props.delete,
|
|
89
|
+
});
|
|
90
|
+
return token.tokenId;
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
if (this.phase === "delete") {
|
|
94
|
+
if (props.delete !== false && this.output?.id) {
|
|
95
|
+
await deleteIndex(api, this.output.vectorizeName);
|
|
96
|
+
await deleteAiSearchInstance(api, this.output.id);
|
|
97
|
+
}
|
|
98
|
+
return this.destroy();
|
|
99
|
+
}
|
|
100
|
+
const name = props.name ?? this.scope.createPhysicalName(id, "-", 32);
|
|
101
|
+
if (name.length < 1 || name.length > 32) {
|
|
102
|
+
throw new Error(`AI Search instance name must be 1-32 characters, got ${name.length} ("${name}")`);
|
|
103
|
+
}
|
|
104
|
+
const [source, tokenId] = await Promise.all([
|
|
105
|
+
normalizeSource(props.source),
|
|
106
|
+
normalizeTokenId(),
|
|
107
|
+
]);
|
|
108
|
+
const payload = {
|
|
109
|
+
id: name,
|
|
110
|
+
source: source.type === "r2" ? source.bucket : source.domain,
|
|
111
|
+
type: source.type,
|
|
112
|
+
ai_search_model: props.aiSearchModel,
|
|
113
|
+
source_params: {
|
|
114
|
+
include_items: source.includePaths,
|
|
115
|
+
exclude_items: source.excludePaths,
|
|
116
|
+
...(source.type === "r2"
|
|
117
|
+
? {
|
|
118
|
+
r2_jurisdiction: source.jurisdiction !== "default"
|
|
119
|
+
? source.jurisdiction
|
|
120
|
+
: undefined,
|
|
121
|
+
prefix: source.prefix,
|
|
122
|
+
}
|
|
123
|
+
: {
|
|
124
|
+
web_crawler: {
|
|
125
|
+
parse_type: source.parseType,
|
|
126
|
+
parse_options: source.parseOptions,
|
|
127
|
+
store_options: source.storeOptions,
|
|
128
|
+
},
|
|
129
|
+
}),
|
|
130
|
+
},
|
|
131
|
+
embedding_model: props.embeddingModel,
|
|
132
|
+
chunk: props.chunk,
|
|
133
|
+
chunk_size: props.chunkSize,
|
|
134
|
+
chunk_overlap: props.chunkOverlap,
|
|
135
|
+
max_num_results: props.maxNumResults,
|
|
136
|
+
score_threshold: props.scoreThreshold,
|
|
137
|
+
reranking: props.reranking,
|
|
138
|
+
reranking_model: props.rerankingModel,
|
|
139
|
+
rewrite_query: props.rewriteQuery,
|
|
140
|
+
rewrite_model: props.rewriteModel,
|
|
141
|
+
cache: props.cache,
|
|
142
|
+
cache_threshold: props.cacheThreshold,
|
|
143
|
+
metadata: props.metadata,
|
|
144
|
+
token_id: tokenId,
|
|
145
|
+
};
|
|
146
|
+
let instance;
|
|
147
|
+
if (this.phase === "update" && this.output?.id) {
|
|
148
|
+
const replace = "source" in this.output &&
|
|
149
|
+
(payload.type !== this.output.type ||
|
|
150
|
+
payload.source !== this.output.source);
|
|
151
|
+
// the development version of this resource had different properties, so check those to avoid an unnecessary replacement
|
|
152
|
+
const replaceLegacy = "sourceType" in this.output &&
|
|
153
|
+
(payload.type !== this.output.sourceType ||
|
|
154
|
+
(payload.type === "r2" &&
|
|
155
|
+
"sourceBucket" in this.output &&
|
|
156
|
+
payload.source !== this.output.sourceBucket) ||
|
|
157
|
+
(payload.type === "web-crawler" &&
|
|
158
|
+
"sourceDomain" in this.output &&
|
|
159
|
+
payload.source !== this.output.sourceDomain));
|
|
160
|
+
if (replace || replaceLegacy) {
|
|
161
|
+
return this.replace(true);
|
|
162
|
+
}
|
|
163
|
+
instance = await updateAiSearchInstance(api, this.output.id, payload);
|
|
164
|
+
}
|
|
165
|
+
else {
|
|
166
|
+
try {
|
|
167
|
+
instance = await createAiSearchInstance(api, payload);
|
|
168
|
+
}
|
|
169
|
+
catch (error) {
|
|
170
|
+
const isAlreadyExistsError = error instanceof CloudflareApiError &&
|
|
171
|
+
error.status === 400 &&
|
|
172
|
+
error.errorData.some((error) => error.code === 7022);
|
|
173
|
+
if (isAlreadyExistsError && adopt) {
|
|
174
|
+
instance = await getAiSearchInstance(api, name);
|
|
175
|
+
instance = await updateAiSearchInstance(api, instance.id, payload);
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
throw error;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
if (props.indexOnCreate !== false) {
|
|
182
|
+
await runAiSearchJob(api, instance.id, (message) => logger.task(id, {
|
|
183
|
+
prefix: "index",
|
|
184
|
+
prefixColor: "gray",
|
|
185
|
+
resource: id,
|
|
186
|
+
message,
|
|
187
|
+
}));
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
return {
|
|
191
|
+
...snakeToCamelObjectDeep(instance),
|
|
192
|
+
name: instance.id,
|
|
193
|
+
};
|
|
194
|
+
});
|
|
195
|
+
/**
|
|
196
|
+
* Validate that a domain string is a valid domain format (not a URL).
|
|
197
|
+
* Throws a helpful error if the input looks like a URL.
|
|
198
|
+
*/
|
|
199
|
+
async function validateWebCrawlerSourceDomain(api, domain) {
|
|
200
|
+
if (domain.includes("://")) {
|
|
201
|
+
throw new Error(`Invalid domain format "${domain}". Provide just the domain (e.g., "docs.example.com"), not a URL. ` +
|
|
202
|
+
`For URL-based crawling, use AiCrawler instead of AiSearch.`);
|
|
203
|
+
}
|
|
204
|
+
if (domain.includes("/")) {
|
|
205
|
+
throw new Error(`Invalid domain format "${domain}". Provide just the domain without paths (e.g., "docs.example.com"). ` +
|
|
206
|
+
`Use includePaths to filter specific paths, or use AiCrawler for URL-based crawling.`);
|
|
207
|
+
}
|
|
208
|
+
// The Cloudflare dashboard uses this undocumented endpoint to validate domains.
|
|
209
|
+
// If we don't validate here, the create request fails with a 500 error.
|
|
210
|
+
const response = await api.post(`/accounts/${api.accountId}/ai-search/domains`, {
|
|
211
|
+
domain,
|
|
212
|
+
});
|
|
213
|
+
// The error message is more like an error code. This mapping is from the Cloudflare dashboard.
|
|
214
|
+
const errorMap = {
|
|
215
|
+
not_a_valid_domain: "Not a valid domain.",
|
|
216
|
+
invalid_domain: "Invalid domain. The domain needs to belong to this account.",
|
|
217
|
+
fail_to_find_domain_info: "Failed to find domain information.",
|
|
218
|
+
missing_sitemap: "Sitemap not found. Please check your robots.txt.",
|
|
219
|
+
domain_not_owned_by_user: "The domain needs to belong to this account.",
|
|
220
|
+
forbidden_robots_txt: "Failed to fetch robots.txt: The file is inaccessible.",
|
|
221
|
+
forbidden_sitemap: "Failed to fetch your sitemap: The file is inaccessible.",
|
|
222
|
+
};
|
|
223
|
+
const json = (await response.json());
|
|
224
|
+
if (json.success)
|
|
225
|
+
return;
|
|
226
|
+
throw new Error([
|
|
227
|
+
`Failed to validate domain "${domain}" (${response.status}):`,
|
|
228
|
+
...json.errors.map((e) => `- [${e.code}] ${e.message in errorMap
|
|
229
|
+
? errorMap[e.message]
|
|
230
|
+
: e.message}`),
|
|
231
|
+
"Learn more: https://developers.cloudflare.com/ai-search/configuration/data-source/website/",
|
|
232
|
+
].join("\n"));
|
|
233
|
+
}
|
|
234
|
+
export async function listAiSearchInstances(api) {
|
|
235
|
+
return await extractCloudflareResult("list AI Search instances", api.get(`/accounts/${api.accountId}/ai-search/instances`));
|
|
236
|
+
}
|
|
237
|
+
export async function createAiSearchInstance(api, payload) {
|
|
238
|
+
return await extractCloudflareResult(`create AI Search instance "${payload.id}"`, api.post(`/accounts/${api.accountId}/ai-search/instances`, payload));
|
|
239
|
+
}
|
|
240
|
+
export async function getAiSearchInstance(api, id) {
|
|
241
|
+
return await extractCloudflareResult(`get AI Search instance "${id}"`, api.get(`/accounts/${api.accountId}/ai-search/instances/${id}`));
|
|
242
|
+
}
|
|
243
|
+
export async function updateAiSearchInstance(api, id, payload) {
|
|
244
|
+
return await extractCloudflareResult(`update AI Search instance "${id}"`, api.put(`/accounts/${api.accountId}/ai-search/instances/${id}`, payload));
|
|
245
|
+
}
|
|
246
|
+
export async function deleteAiSearchInstance(api, id) {
|
|
247
|
+
try {
|
|
248
|
+
await extractCloudflareResult(`delete AI Search instance "${id}"`, api.delete(`/accounts/${api.accountId}/ai-search/instances/${id}`));
|
|
249
|
+
}
|
|
250
|
+
catch (error) {
|
|
251
|
+
if (error instanceof CloudflareApiError && error.status === 404) {
|
|
252
|
+
return;
|
|
253
|
+
}
|
|
254
|
+
throw error;
|
|
255
|
+
}
|
|
256
|
+
}
|
|
257
|
+
export async function listAiSearchJobs(api, aiSearchId) {
|
|
258
|
+
return await extractCloudflareResult(`list AI Search jobs for instance "${aiSearchId}"`, api.get(`/accounts/${api.accountId}/ai-search/instances/${aiSearchId}/jobs`));
|
|
259
|
+
}
|
|
260
|
+
export async function createAiSearchJob(api, aiSearchId) {
|
|
261
|
+
return await extractCloudflareResult(`create AI Search job for instance "${aiSearchId}"`, api.post(`/accounts/${api.accountId}/ai-search/instances/${aiSearchId}/jobs`, {}));
|
|
262
|
+
}
|
|
263
|
+
export async function getAiSearchJob(api, aiSearchId, jobId) {
|
|
264
|
+
return await extractCloudflareResult(`get AI Search job "${jobId}" for instance "${aiSearchId}"`, api.get(`/accounts/${api.accountId}/ai-search/instances/${aiSearchId}/jobs/${jobId}`));
|
|
265
|
+
}
|
|
266
|
+
export async function listAiSearchJobLogs(api, aiSearchId, jobId) {
|
|
267
|
+
try {
|
|
268
|
+
return await extractCloudflareResult(`list AI Search job logs for job "${jobId}" for instance "${aiSearchId}"`, api.get(`/accounts/${api.accountId}/ai-search/instances/${aiSearchId}/jobs/${jobId}/logs?per_page=500`));
|
|
269
|
+
}
|
|
270
|
+
catch (error) {
|
|
271
|
+
if (isCloudflareApiError(error, { code: 7002 }) // ai_search_not_found
|
|
272
|
+
) {
|
|
273
|
+
return [];
|
|
274
|
+
}
|
|
275
|
+
throw error;
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
export async function runAiSearchJob(api, aiSearchId, log) {
|
|
279
|
+
log("Preparing to index...");
|
|
280
|
+
const job = await createAiSearchJob(api, aiSearchId);
|
|
281
|
+
let lastLogId = 0;
|
|
282
|
+
let done = false;
|
|
283
|
+
const resultPromise = poll({
|
|
284
|
+
description: `run AI Search job "${job.id}" for instance "${aiSearchId}"`,
|
|
285
|
+
fn: () => getAiSearchJob(api, aiSearchId, job.id),
|
|
286
|
+
predicate: (result) => result.ended_at !== null,
|
|
287
|
+
});
|
|
288
|
+
pollLogs();
|
|
289
|
+
const result = await resultPromise;
|
|
290
|
+
done = true;
|
|
291
|
+
log(`Sync completed: ${result.end_reason}`);
|
|
292
|
+
async function pollLogs() {
|
|
293
|
+
const logs = await listAiSearchJobLogs(api, aiSearchId, job.id);
|
|
294
|
+
for (let i = logs.length - 1; i >= 0; i--) {
|
|
295
|
+
const item = logs[i];
|
|
296
|
+
if (item.id > lastLogId) {
|
|
297
|
+
lastLogId = item.id;
|
|
298
|
+
log(item.message);
|
|
299
|
+
}
|
|
300
|
+
}
|
|
301
|
+
if (!done) {
|
|
302
|
+
await sleep(3000);
|
|
303
|
+
await pollLogs();
|
|
304
|
+
}
|
|
305
|
+
}
|
|
306
|
+
}
|
|
307
|
+
//# sourceMappingURL=ai-search.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ai-search.js","sourceRoot":"","sources":["../../src/cloudflare/ai-search.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/auth.d.ts
CHANGED
|
@@ -53,8 +53,9 @@ export declare namespace CloudflareAuth {
|
|
|
53
53
|
readonly "queues:write": "See and change Cloudflare Queues settings and data";
|
|
54
54
|
readonly "r2_catalog:write": "Grants write level access to R2 Data Catalog";
|
|
55
55
|
readonly "radar:read": "Grants access to read Cloudflare Radar data";
|
|
56
|
-
readonly "
|
|
57
|
-
readonly "
|
|
56
|
+
readonly "ai-search:read": "Grants read level access to AI Search";
|
|
57
|
+
readonly "ai-search:write": "Grants write level access to AI Search";
|
|
58
|
+
readonly "ai-search:run": "Grants run level access to AI Search";
|
|
58
59
|
readonly "secrets_store:read": "Grants read level access to Secrets Store";
|
|
59
60
|
readonly "secrets_store:write": "Grants write level access to Secrets Store";
|
|
60
61
|
readonly "ssl_certs:write": "Grants read and write access to SSL MTLS certificates or Certificate Store";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM,aAQjB,CAAC;IAEH,KAAY,QAAQ,GAAG;QACrB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACK,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAoGb,CAAC;IACX,KAAY,KAAK,GAAG,MAAM,OAAO,UAAU,CAAC;IACrC,MAAM,cAAc,UAsB1B,CAAC;IAEF;;;OAGG;IACI,MAAM,wBAAwB,GAAU,OAAO;QACpD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;QAC5B,WAAW,EAAE,WAAW,CAAC;KAC1B,oCAgBA,CAAC;IAEF;;OAEG;IACI,MAAM,aAAa,GACxB,aAAa,WAAW,KACvB,MAAM,CAAC,MAAM,EAAE,MAAM,CAYvB,CAAC;CACH"}
|
package/lib/cloudflare/auth.js
CHANGED
|
@@ -59,8 +59,9 @@ export var CloudflareAuth;
|
|
|
59
59
|
"queues:write": "See and change Cloudflare Queues settings and data",
|
|
60
60
|
"r2_catalog:write": "Grants write level access to R2 Data Catalog",
|
|
61
61
|
"radar:read": "Grants access to read Cloudflare Radar data",
|
|
62
|
-
"
|
|
63
|
-
"
|
|
62
|
+
"ai-search:read": "Grants read level access to AI Search",
|
|
63
|
+
"ai-search:write": "Grants write level access to AI Search",
|
|
64
|
+
"ai-search:run": "Grants run level access to AI Search",
|
|
64
65
|
"secrets_store:read": "Grants read level access to Secrets Store",
|
|
65
66
|
"secrets_store:write": "Grants write level access to Secrets Store",
|
|
66
67
|
"ssl_certs:write": "Grants read and write access to SSL MTLS certificates or Certificate Store",
|
|
@@ -88,24 +89,26 @@ export var CloudflareAuth;
|
|
|
88
89
|
};
|
|
89
90
|
CloudflareAuth.DEFAULT_SCOPES = [
|
|
90
91
|
"account:read",
|
|
92
|
+
"ai-search:write",
|
|
93
|
+
"ai-search:run",
|
|
94
|
+
"ai:write",
|
|
95
|
+
"cloudchamber:write",
|
|
96
|
+
"connectivity:admin",
|
|
97
|
+
"containers:write",
|
|
98
|
+
"d1:write",
|
|
99
|
+
"pages:write",
|
|
100
|
+
"pipelines:write",
|
|
101
|
+
"queues:write",
|
|
102
|
+
"secrets_store:write",
|
|
103
|
+
"ssl_certs:write",
|
|
91
104
|
"user:read",
|
|
92
|
-
"
|
|
105
|
+
"vectorize:write",
|
|
93
106
|
"workers_kv:write",
|
|
94
107
|
"workers_routes:write",
|
|
95
108
|
"workers_scripts:write",
|
|
96
109
|
"workers_tail:read",
|
|
97
|
-
"
|
|
98
|
-
"pages:write",
|
|
110
|
+
"workers:write",
|
|
99
111
|
"zone:read",
|
|
100
|
-
"ssl_certs:write",
|
|
101
|
-
"ai:write",
|
|
102
|
-
"queues:write",
|
|
103
|
-
"pipelines:write",
|
|
104
|
-
"secrets_store:write",
|
|
105
|
-
"containers:write",
|
|
106
|
-
"cloudchamber:write",
|
|
107
|
-
"vectorize:write",
|
|
108
|
-
"connectivity:admin",
|
|
109
112
|
];
|
|
110
113
|
/**
|
|
111
114
|
* Format Cloudflare credentials as headers, refreshing OAuth credentials if expired.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cloudflare/auth.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,MAAM,KAAW,cAAc,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/cloudflare/auth.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;
|
|
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,CAgFjC,CAAC;AAkCF,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"}
|
|
@@ -5,6 +5,7 @@ import { extractCloudflareResult } from "./api-response.js";
|
|
|
5
5
|
import { CloudflareApi, createCloudflareApi, } from "./api.js";
|
|
6
6
|
import { withJurisdiction } from "./bucket.js";
|
|
7
7
|
import { inferZoneIdFromPattern } from "./route.js";
|
|
8
|
+
const DEV_NOOP_ZONE = "noop-zone";
|
|
8
9
|
export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain", async function (_id, props) {
|
|
9
10
|
if (this.scope.local && !props.dev?.remote && this.phase !== "delete") {
|
|
10
11
|
return {
|
|
@@ -12,7 +13,7 @@ export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain",
|
|
|
12
13
|
enabled: props.enabled ?? false,
|
|
13
14
|
zoneId: typeof props.zone === "string"
|
|
14
15
|
? props.zone
|
|
15
|
-
: (props.zone?.id ??
|
|
16
|
+
: (props.zone?.id ?? DEV_NOOP_ZONE),
|
|
16
17
|
ciphers: props.ciphers,
|
|
17
18
|
minTLS: props.minTLS,
|
|
18
19
|
};
|
|
@@ -42,7 +43,8 @@ export const R2BucketCustomDomain = Resource("cloudflare::R2BucketCustomDomain",
|
|
|
42
43
|
return payload;
|
|
43
44
|
}
|
|
44
45
|
case "update": {
|
|
45
|
-
if (
|
|
46
|
+
if (this.output.zoneId !== DEV_NOOP_ZONE && // dev mode placeholder should not trigger replacement
|
|
47
|
+
diff(this.output, payload).some((property) => property === "domain" || property === "zoneId")) {
|
|
46
48
|
return this.replace();
|
|
47
49
|
}
|
|
48
50
|
await updateBucketCustomDomain(api, props.bucketName, props.jurisdiction, payload);
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"bucket-custom-domain.js","sourceRoot":"","sources":["../../src/cloudflare/bucket-custom-domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iDAAiD,CAAC;AAGpF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAW7C,OAAO,EAEL,KAAK,aAAa,EAClB,KAAK,oBAAoB,EAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EAEL,KAAK,2BAA2B,EACjC,MAAM,2BAA2B,CAAC;AAInC,MAAM,MAAM,oBAAoB,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;AAEhE;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACvD;;;;;;OAMG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;OAGG;IACH,YAAY,CAAC,EAAE,UAAU,GAAG,kBAAkB,CAAC;IAE/C;;;OAGG;IACH,YAAY,CAAC,EAAE,oBAAoB,CAAC;IAEpC;;;;OAIG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,OAAO,CAAC,EACJ,MAAM,GACN,2BAA2B,GAC3B,MAAM,EAAE,GACR,2BAA2B,EAAE,CAAC;IAElC;;;;;OAKG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE1B;;OAEG;IACH,SAAS,CAAC,EAAE,qBAAqB,EAAE,CAAC;IAEpC;;OAEG;IACH,IAAI,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE1B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB;;OAEG;IACH,GAAG,CAAC,EAAE;QACJ;;;WAGG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;QAEjB;;;WAGG;QACH,KAAK,CAAC,EAAE,OAAO,CAAC;KACjB,CAAC;CACH;AAED,UAAU,qBAAqB;IAC7B;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,UAAU,CAAC,EAAE;QACX;;WAEG;QACH,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;IAEF;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,+BAA+B,CAAC,EAAE;QAChC;;WAEG;QACH,SAAS,EAAE;YACT;;;;eAIG;YACH,MAAM,EAAE,MAAM,CAAC;YAEf;;eAEG;YACH,IAAI,EAAE,KAAK,CAAC;SACb,CAAC;KACH,CAAC;IAEF;;OAEG;IACH,uBAAuB,CAAC,EAAE;QACxB;;WAEG;QACH,SAAS,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,KAAK,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;KAC7E,CAAC;IAEF;;OAEG;IACH,uBAAuB,CAAC,EAAE;QACxB;;WAEG;QACH,SAAS,EAAE;YAAE,MAAM,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,KAAK,CAAA;SAAE,GAAG;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QAE5E;;WAEG;QACH,YAAY,EAAE,kBAAkB,CAAC;KAClC,EAAE,CAAC;CACL;AAED,UAAU,gBAAgB;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,SAAS,EACL;QAAE,aAAa,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE,GACtC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAC9B;QAAE,IAAI,EAAE,YAAY,CAAA;KAAE,CAAC;IAE3B;;;OAGG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,gBAAgB;IACxB;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IAEZ;;OAEG;IACH,OAAO,EAAE;QACP;;WAEG;QACH,OAAO,EAAE,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,GAAG,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;QAExD;;WAEG;QACH,OAAO,EAAE,MAAM,EAAE,CAAC;QAElB;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;KACpB,CAAC;IAEF;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IAEzB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,IAAI,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,cAAc,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG;IAC/C,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC,CAAC;IACpC,KAAK,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAC7B,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;IACxB,IAAI,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,IAAI,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,EAAE,CAAC;CACnD,GAAG,CACA;IACE,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB,GACD;IACE,SAAS,EAAE,KAAK,CAAC;IACjB,MAAM,CAAC,EAAE,KAAK,CAAC;CAChB,CACJ,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,SAAS,GAAG;IACjC,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACpD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAAC;IAClD,GAAG,CACD,GAAG,EAAE,MAAM,EACX,KAAK,EACD,cAAc,GACd,WAAW,GACX,eAAe,GACf,MAAM,GACN,IAAI,GACJ,IAAI,EACR,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,EAAE,cAAc,CAAC,GAC3C,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAChC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC,OAAO,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;CACnD,CAAC;AAEF;;GAEG;AACH,KAAK,SAAS,GAAG,IAAI,CACnB,WAAW,EACX,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,WAAW,CAC3C,GAAG;IACF;;OAEG;IACH,IAAI,EAAE,WAAW,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,YAAY,EAAE,IAAI,CAAC;IAEnB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAE9B;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IAE9B;;;OAGG;IACH,GAAG,EAAE;QACH;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QAEX;;WAEG;QACH,MAAM,EAAE,OAAO,CAAC;QAEhB;;;;WAIG;QACH,UAAU,CAAC,EAAE,OAAO,CAAC;KACtB,CAAC;IAEF;;OAEG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,EAAE,EAAE,MAAM,CAAC;QACX;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;QACb;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,GAAG,QAAQ,IAAI,QAAQ,CAE5D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAsB,QAAQ,CAC5B,EAAE,EAAE,MAAM,EACV,KAAK,GAAE,WAAgB,GACtB,OAAO,CAAC,QAAQ,CAAC,CAyInB;AAkBD,QAAA,MAAM,SAAS,yFAGL,OAAO,CAAC,SAAS,CAAC,MACpB,MAAM,UACH,WAAW,KACjB,OAAO,CAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../src/cloudflare/bucket.ts"],"names":[],"mappings":"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"}
|
package/lib/cloudflare/bucket.js
CHANGED
|
@@ -247,6 +247,12 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
|
|
|
247
247
|
const api = await createCloudflareApi(props);
|
|
248
248
|
if (this.phase === "delete") {
|
|
249
249
|
if (props.delete !== false) {
|
|
250
|
+
// Use bucket's actual jurisdiction from output, falling back to props
|
|
251
|
+
// This ensures EU/FedRAMP buckets are correctly addressed during cleanup
|
|
252
|
+
const deleteProps = {
|
|
253
|
+
...props,
|
|
254
|
+
jurisdiction: this.output?.jurisdiction ?? props.jurisdiction,
|
|
255
|
+
};
|
|
250
256
|
if (this.output?.catalog) {
|
|
251
257
|
await disableDataCatalog(api, bucketName);
|
|
252
258
|
}
|
|
@@ -254,9 +260,9 @@ const _R2Bucket = Resource("cloudflare::R2Bucket", async function (id, props = {
|
|
|
254
260
|
await deleteMiniflareBinding(this.scope, "r2", this.output.dev.id);
|
|
255
261
|
}
|
|
256
262
|
if (props.empty) {
|
|
257
|
-
await emptyBucket(api, bucketName,
|
|
263
|
+
await emptyBucket(api, bucketName, deleteProps);
|
|
258
264
|
}
|
|
259
|
-
await deleteBucket(api, bucketName,
|
|
265
|
+
await deleteBucket(api, bucketName, deleteProps);
|
|
260
266
|
}
|
|
261
267
|
return this.destroy();
|
|
262
268
|
}
|