Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1549,6 +1549,44 @@ describe("functions deploy", () => {
}).pipe(Effect.ensuring(cleanupTempDir(tempDir)));
});

it.live("bundles when Docker only shares the project directory", () => {
const tempDir = makeTempDir();
const sharedOutputRoot = join(tempDir, "supabase", ".temp");
let outputPath = "";
const child = mockChildProcessSpawner({
exitCode: 0,
onSpawn: (record) => {
if (record.command !== "docker" || record.args[0] !== "run") {
return;
}
outputPath = resolveDockerOutputPath(record.args);
if (!outputPath.startsWith(`${sharedOutputRoot}${sep}`)) {
return;
}
mkdirSync(dirname(outputPath), { recursive: true });
writeFileSync(outputPath, "eszip-test-output");
},
});

return Effect.gen(function* () {
yield* Effect.promise(() => writeProjectConfig(tempDir));
yield* Effect.promise(() => writeLocalFunction(tempDir, "hello-world"));

const { layer } = setup(tempDir, {
rawArgs: ["functions", "deploy", "hello-world", "--use-docker"],
childLayer: child.layer,
});

yield* functionsDeploy({
...BASE_FLAGS,
functionNames: ["hello-world"],
useDocker: true,
}).pipe(Effect.provide(layer));

expect(outputPath.startsWith(`${sharedOutputRoot}${sep}`)).toBe(true);
}).pipe(Effect.ensuring(cleanupTempDir(tempDir)));
});

it.live("forwards npm auth environment to the Docker bundler", () => {
const tempDir = makeTempDir();
const previousRegistry = process.env["NPM_CONFIG_REGISTRY"];
Expand Down
7 changes: 4 additions & 3 deletions apps/cli/src/shared/functions/deploy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { brotliCompressSync, constants as zlibConstants } from "node:zlib";
import { chmod, mkdtemp, readFile, readdir, realpath, rm, stat } from "node:fs/promises";
import { chmod, mkdir, mkdtemp, readFile, readdir, realpath, rm, stat } from "node:fs/promises";
import { basename, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
import { tmpdir } from "node:os";
import { URL } from "node:url";
import { FunctionResponse, operationDefinitions, type ApiClient } from "@supabase/api/effect";
import {
Expand Down Expand Up @@ -1334,8 +1333,10 @@ const bundleFunctionWithDocker = Effect.fnUntraced(function* (
const output = yield* Output;
yield* output.raw(`Bundling Function: ${config.slug}\n`, "stderr");

const outputRoot = resolve(functionsDir, "..", ".temp");
yield* Effect.tryPromise(() => mkdir(outputRoot, { recursive: true }));
const outputDir = yield* Effect.tryPromise(() =>
mkdtemp(join(tmpdir(), `.supabase-output-${config.slug}-`)),
mkdtemp(join(outputRoot, `.supabase-output-${config.slug}-`)),
);
try {
yield* Effect.tryPromise(() => chmod(outputDir, 0o777));
Expand Down
Loading