Skip to content

feat(cloud-agent-next): open Cloudflare containers selection under enforced billing #6576

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

Merged
eshurakov merged 1 commit into from
Sep 23, 2026
Merged

feat(cloud-agent-next): open Cloudflare containers selection under enforced billing #6576

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
20 changes: 13 additions & 7 deletions services/cloud-agent-next/src/sandbox-selection.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,25 @@ describe('sandbox selection policy', () => {
).not.toContainEqual(getSandboxAllocationRequest('cloudflare-containers-standard-4'));
});

it('fails Cloudflare containers closed for enforced organization billing', () => {
it('offers Cloudflare containers to an enrolled owner under enforced organization billing', () => {
const env = {
...configured,
PER_SESSION_SANDBOX_ORG_IDS: owner.orgId,
CLOUDFLARE_CONTAINERS_ORG_IDS: owner.orgId,
CLOUD_AGENT_CONTAINER_BILLING_ENABLED: 'true',
CLOUD_AGENT_CONTAINER_BILLING_ORG_IDS: owner.orgId,
} as Env;
expect(
getSandboxSelectionCapabilities(env, owner).options.map(option => option.allocation)
).not.toContainEqual(getSandboxAllocationRequest('cloudflare-containers-standard-4'));
expect(() =>
assertSandboxAllocationAvailable(env, owner, 'cloudflare-containers-standard-4')
).toThrow('enforced compute billing');
const capabilities = getSandboxSelectionCapabilities(env, owner);
const options = capabilities.options.map(option => option.allocation);
expect(options).toContainEqual(getSandboxAllocationRequest('cloudflare-containers-standard-3'));
expect(options).toContainEqual(getSandboxAllocationRequest('cloudflare-containers-standard-4'));
expect(capabilities.defaultDestination).toEqual(
getSandboxAllocationRequest('cloudflare-containers-standard-4')
);
expect(options).toContainEqual(capabilities.defaultDestination);
expect(isSandboxAllocationAvailable(capabilities, 'cloudflare-containers-standard-4')).toBe(
true
);
});

it('admits the trigger-only allocation without listing it', () => {
Expand Down
3 changes: 0 additions & 3 deletions services/cloud-agent-next/src/sandbox-selection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@ function sandboxAllocationUnavailableReason(
if (!isCloudflareContainersEnrolled(env, { orgId: owner.orgId })) {
return 'Cloudflare containers are not enabled for this account';
}
if (isCloudAgentContainerBillingEnabled(env, owner)) {
return 'Cloudflare containers do not support enforced compute billing';
}
return undefined;
}

Expand Down