Skip to content

refactor(cloudflare): extract list + createAndResolve helpers #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Thanukamax wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor(cloudflare): extract list + createAndResolve helpers #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions dist/index.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22996,39 +22996,40 @@ async function resolveSubdomain(accountId, token) {
throw new Error("account has no workers.dev subdomain configured");
return sub;
}
var listD1 = () => wranglerJson(["d1", "list", "--json"], { allowFail: true }).then((l) => l ?? []);
var listKv = () => wranglerJson(["kv", "namespace", "list"], { allowFail: true }).then((l) => l ?? []);
async function createAndResolve(label, create, list, match) {
core2.info(`creating ${label}`);
await create();
const hit = (await list()).find(match);
if (!hit)
throw new Error(`failed to resolve ${label} after create`);
return hit;
}
async function ensureD1(dbName, location) {
const list = await wranglerJson(["d1", "list", "--json"], { allowFail: true }) ?? [];
let found = list.find((d) => d.name === dbName);
if (!found) {
core2.info(`creating preview D1 ${dbName}`);
await wrangler(["d1", "create", dbName, "--location", location]);
const relist = await wranglerJson(["d1", "list", "--json"], { allowFail: true }) ?? [];
found = relist.find((d) => d.name === dbName);
} else {
const match = (d) => d.name === dbName;
const found = (await listD1()).find(match);
if (found) {
core2.info(`reusing preview D1 ${dbName} (${found.uuid})`);
return found.uuid;
}
if (!found)
throw new Error(`failed to resolve preview D1 id for ${dbName}`);
return found.uuid;
const created = await createAndResolve(`preview D1 ${dbName}`, () => wrangler(["d1", "create", dbName, "--location", location]), listD1, match);
return created.uuid;
}
async function ensureKv(sourceKv, workerName) {
if (!Array.isArray(sourceKv))
return [];
const out = [];
const existing = await wranglerJson(["kv", "namespace", "list"], { allowFail: true }) ?? [];
const existing = await listKv();
for (const ns of sourceKv) {
const title = bindingResourceName(workerName, ns.binding);
let hit = existing.find((e) => e.title === title);
if (!hit) {
core2.info(`creating preview KV namespace ${title}`);
await wrangler(["kv", "namespace", "create", title]);
const relist = await wranglerJson(["kv", "namespace", "list"], { allowFail: true }) ?? [];
hit = relist.find((e) => e.title === title);
} else {
const match = (e) => e.title === title;
let hit = existing.find(match);
if (hit) {
core2.info(`reusing preview KV namespace ${title} (${hit.id})`);
} else {
hit = await createAndResolve(`preview KV namespace ${title}`, () => wrangler(["kv", "namespace", "create", title]), listKv, match);
}
if (!hit)
throw new Error(`failed to resolve preview KV id for ${title}`);
out.push({ binding: ns.binding, id: hit.id });
}
return out;
Expand All @@ -23050,7 +23051,7 @@ async function deleteWorker(name) {
await wrangler(["delete", "--name", name, "--force"], { allowFail: true });
}
async function deleteD1(dbName) {
const dbs = await wranglerJson(["d1", "list", "--json"], { allowFail: true }) ?? [];
const dbs = await listD1();
if (dbs.find((d) => d.name === dbName)) {
core2.info(`deleting preview D1 ${dbName}`);
await wrangler(["d1", "delete", dbName, "-y"], { allowFail: true });
Expand All @@ -23061,7 +23062,7 @@ async function deleteD1(dbName) {
async function deleteKv(sourceKv, workerName) {
if (!Array.isArray(sourceKv))
return;
const existing = await wranglerJson(["kv", "namespace", "list"], { allowFail: true }) ?? [];
const existing = await listKv();
for (const ns of sourceKv) {
const title = bindingResourceName(workerName, ns.binding);
const hit = existing.find((e) => e.title === title);
Expand Down
69 changes: 45 additions & 24 deletions src/cloudflare.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,61 @@ export async function resolveSubdomain(accountId: string, token: string): Promis
return sub
}

// wrangler list commands tolerate failure and may print nothing; normalize to [].
const listD1 = () =>
wranglerJson<any[]>(['d1', 'list', '--json'], { allowFail: true }).then((l) => l ?? [])
const listKv = () =>
wranglerJson<any[]>(['kv', 'namespace', 'list'], { allowFail: true }).then((l) => l ?? [])

// Create a resource, then re-list to resolve the freshly created entry.
// Throws if it still can't be found (create silently no-op'd or the list failed).
async function createAndResolve<T>(
label: string,
create: () => Promise<unknown>,
list: () => Promise<T[]>,
match: (item: T) => boolean,
): Promise<T> {
core.info(`creating ${label}`)
await create()
const hit = (await list()).find(match)
if (!hit) throw new Error(`failed to resolve ${label} after create`)
return hit
}

export async function ensureD1(dbName: string, location: string): Promise<string> {
const list = (await wranglerJson<any[]>(['d1', 'list', '--json'], { allowFail: true })) ?? []
let found = list.find((d) => d.name === dbName)
if (!found) {
core.info(`creating preview D1 ${dbName}`)
await wrangler(['d1', 'create', dbName, '--location', location])
const relist = (await wranglerJson<any[]>(['d1', 'list', '--json'], { allowFail: true })) ?? []
found = relist.find((d) => d.name === dbName)
} else {
const match = (d: any) => d.name === dbName
const found = (await listD1()).find(match)
if (found) {
core.info(`reusing preview D1 ${dbName} (${found.uuid})`)
return found.uuid
}
if (!found) throw new Error(`failed to resolve preview D1 id for ${dbName}`)
return found.uuid
const created = await createAndResolve(
`preview D1 ${dbName}`,
() => wrangler(['d1', 'create', dbName, '--location', location]),
listD1,
match,
)
return created.uuid
}

export async function ensureKv(sourceKv: any, workerName: string): Promise<KvBinding[]> {
if (!Array.isArray(sourceKv)) return []
const out: KvBinding[] = []
const existing =
(await wranglerJson<any[]>(['kv', 'namespace', 'list'], { allowFail: true })) ?? []
const existing = await listKv()
for (const ns of sourceKv) {
const title = bindingResourceName(workerName, ns.binding)
let hit = existing.find((e) => e.title === title)
if (!hit) {
core.info(`creating preview KV namespace ${title}`)
await wrangler(['kv', 'namespace', 'create', title])
const relist =
(await wranglerJson<any[]>(['kv', 'namespace', 'list'], { allowFail: true })) ?? []
hit = relist.find((e) => e.title === title)
} else {
const match = (e: any) => e.title === title
let hit = existing.find(match)
if (hit) {
core.info(`reusing preview KV namespace ${title} (${hit.id})`)
} else {
hit = await createAndResolve(
`preview KV namespace ${title}`,
() => wrangler(['kv', 'namespace', 'create', title]),
listKv,
match,
)
}
if (!hit) throw new Error(`failed to resolve preview KV id for ${title}`)
out.push({ binding: ns.binding, id: hit.id })
}
return out
Expand All @@ -70,7 +92,7 @@ export async function deleteWorker(name: string): Promise<void> {
}

export async function deleteD1(dbName: string): Promise<void> {
const dbs = (await wranglerJson<any[]>(['d1', 'list', '--json'], { allowFail: true })) ?? []
const dbs = await listD1()
if (dbs.find((d) => d.name === dbName)) {
core.info(`deleting preview D1 ${dbName}`)
await wrangler(['d1', 'delete', dbName, '-y'], { allowFail: true })
Expand All @@ -81,8 +103,7 @@ export async function deleteD1(dbName: string): Promise<void> {

export async function deleteKv(sourceKv: any, workerName: string): Promise<void> {
if (!Array.isArray(sourceKv)) return
const existing =
(await wranglerJson<any[]>(['kv', 'namespace', 'list'], { allowFail: true })) ?? []
const existing = await listKv()
for (const ns of sourceKv) {
const title = bindingResourceName(workerName, ns.binding)
const hit = existing.find((e) => e.title === title)
Expand Down
Loading