Skip to content

fix(deploy): retire the removed RoomDO namespace #455

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

Open
sota009 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(deploy): retire the removed RoomDO namespace #455

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
13 changes: 12 additions & 1 deletion apps/relay/test/self-host-config.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ const readJsonc = (raw: string) => JSON.parse(
raw.replace(/^\s*\/\/.*$/gm, ""),
);

function liveExports(exports: Record<string, any>): Record<string, any> {
return Object.fromEntries(
Object.entries(exports).filter(([, value]) => value.state !== "deleted"),
);
}

function normalizedRuntimeConfig(input: any): any {
const config = structuredClone(input);
// The official hosted relay also serves the AgentCall product site. A
Expand All @@ -21,6 +27,9 @@ function normalizedRuntimeConfig(input: any): any {
}
for (const dataset of config.analytics_engine_datasets ?? []) dataset.dataset = "<customer-dataset>";
for (const rateLimit of config.ratelimits ?? []) rateLimit.namespace_id = "<customer-rate-namespace>";
// Hosted deletion tombstones retire namespaces provisioned by earlier
// releases. A fresh self-hosted account never owned those namespaces.
if (config.exports) config.exports = liveExports(config.exports);
return config;
}

Expand All @@ -38,9 +47,11 @@ describe("self-host Wrangler distribution", () => {
d1_databases: [{ binding: "DB", migrations_dir: "migrations" }],
analytics_engine_datasets: [{ binding: "STATUS_READS" }],
durable_objects: hosted.durable_objects,
exports: hosted.exports,
exports: liveExports(hosted.exports),
routes: [{ pattern: "relay.example.com", custom_domain: true }],
});
expect(hosted.exports.RoomDO).toEqual({ type: "durable-object", state: "deleted" });
expect(selfHosted.exports).not.toHaveProperty("RoomDO");
expect(hosted.assets).toEqual({
directory: "../landing",
binding: "ASSETS",
Expand Down
1 change: 1 addition & 0 deletions apps/relay/wrangler.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
] },
"exports": {
"HandleDO": { "type": "durable-object", "storage": "sqlite" },
"RoomDO": { "type": "durable-object", "state": "deleted" },
"RateLimiterDO": { "type": "durable-object", "storage": "sqlite" }
},
// Must stay in step with HOSTED_RELAY_HOST (packages/shared/src/protocol.ts),
Expand Down