Skip to content

Commit bf23a7e

Browse files
committed
refactor: remove SKIP_R2_FUSE environment variable and related logic
- Eliminated SKIP_R2_FUSE from environment definitions and related files. - Updated the startup script and worker code to remove references to SKIP_R2_FUSE. - Adjusted tests to reflect the removal of the SKIP_R2_FUSE variable.
1 parent fab08cf commit bf23a7e

6 files changed

Lines changed: 0 additions & 14 deletions

File tree

alchemy.env.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ const raw = z
1212
AWS_ACCESS_KEY_ID: z.string().optional(),
1313
AWS_SECRET_ACCESS_KEY: z.string().optional(),
1414
CI: z.string().optional(),
15-
/** Set to "1" to skip R2 FUSE in the terminal container (debug only). Default: mount R2. */
16-
SKIP_R2_FUSE: z.string().optional(),
1715
})
1816
.parse(process.env);
1917

@@ -42,5 +40,4 @@ export const deployEnv = {
4240
portForwardBaseDomain: new URL(betterAuthUrl).hostname,
4341
awsAccessKeyId: raw.AWS_ACCESS_KEY_ID ?? '',
4442
awsSecretAccessKey: raw.AWS_SECRET_ACCESS_KEY ?? '',
45-
skipR2Fuse: raw.SKIP_R2_FUSE ?? '0',
4643
};

alchemy.run.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export const WORKER = await Worker(workerName, {
6767
R2_BUCKET_NAME: USER_DATA.name,
6868
R2_ACCOUNT_ID: deployEnv.accountId,
6969
PORT_FORWARD_BASE_DOMAIN: deployEnv.portForwardBaseDomain,
70-
SKIP_R2_FUSE: deployEnv.skipR2Fuse,
7170
},
7271
url: false,
7372
...(isLocalDevHostname

worker/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ class CloudShellTerminal extends Container {
3838
constructor(ctx: DurableObjectState<{}>, env: Env) {
3939
super(ctx, env);
4040
this.envVars = {
41-
SKIP_R2_FUSE: env.SKIP_R2_FUSE,
4241
AWS_ACCESS_KEY_ID: env.AWS_ACCESS_KEY_ID,
4342
AWS_SECRET_ACCESS_KEY: env.AWS_SECRET_ACCESS_KEY,
4443
R2_BUCKET_NAME: env.R2_BUCKET_NAME,

worker/routes.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ class MockR2Bucket implements R2Bucket {
112112

113113
function createEnv(): Env {
114114
return {
115-
SKIP_R2_FUSE: '0',
116115
AWS_ACCESS_KEY_ID: '',
117116
AWS_SECRET_ACCESS_KEY: '',
118117
R2_BUCKET_NAME: 'test-bucket',

worker/startup.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ seed_tmux_if_missing() {
1414
fi
1515
}
1616

17-
if [ "${SKIP_R2_FUSE:-}" = "1" ] || [ "${SKIP_R2_FUSE:-}" = "true" ]; then
18-
echo "SKIP_R2_FUSE set — R2 FUSE disabled (debug)"
19-
seed_tmux_if_missing
20-
exec /server
21-
fi
22-
2317
if [ -n "${AWS_ACCESS_KEY_ID:-}" ] && [ -n "${AWS_SECRET_ACCESS_KEY:-}" ] && [ -n "${R2_BUCKET_NAME:-}" ] && [ -n "${R2_ACCOUNT_ID:-}" ]; then
2418
R2_ENDPOINT="https://${R2_ACCOUNT_ID}.r2.cloudflarestorage.com"
2519
MOUNT_POINT="${R2_FUSE_MOUNT_POINT:-/home/user}"

worker/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ declare global {
1515
}
1616

1717
export interface Env {
18-
/** "1"/"true" = skip tigrisfs (debug). Otherwise R2 is mounted at /home/user when creds exist. */
19-
SKIP_R2_FUSE: string;
2018
AWS_ACCESS_KEY_ID: string;
2119
AWS_SECRET_ACCESS_KEY: string;
2220
R2_BUCKET_NAME: string;

0 commit comments

Comments
 (0)