feat(functions): allow custom functions entrypoint path

internal/functions/deploy/bundle.go

@@ -44,8 +44,7 @@ func (b *dockerBundler) Bundle(ctx context.Context, entrypoint string, importMap
 		}
 	}()
 	// Create bind mounts
-	hostEntrypointDir := filepath.Dir(entrypoint)
-	binds, err := GetBindMounts(cwd, utils.FunctionsDir, hostOutputDir, hostEntrypointDir, importMap, b.fsys)
+	binds, err := GetBindMounts(cwd, utils.FunctionsDir, hostOutputDir, entrypoint, importMap, b.fsys)
 	if err != nil {
 		return err
 	}
@@ -86,7 +85,7 @@ func (b *dockerBundler) Bundle(ctx context.Context, entrypoint string, importMap
 	return function.Compress(eszipBytes, output)
 }
 
-func GetBindMounts(cwd, hostFuncDir, hostOutputDir, hostEntrypointDir, hostImportMapPath string, fsys afero.Fs) ([]string, error) {
+func GetBindMounts(cwd, hostFuncDir, hostOutputDir, hostEntrypointPath, hostImportMapPath string, fsys afero.Fs) ([]string, error) {
 	sep := string(filepath.Separator)
 	// Docker requires all host paths to be absolute
 	if !filepath.IsAbs(hostFuncDir) {
@@ -116,6 +115,7 @@ func GetBindMounts(cwd, hostFuncDir, hostOutputDir, hostEntrypointDir, hostImpor
 		}
 	}
 	// Allow entrypoints outside the functions directory
+	hostEntrypointDir := filepath.Dir(hostEntrypointPath)
 	if len(hostEntrypointDir) > 0 {
 		if !filepath.IsAbs(hostEntrypointDir) {
 			hostEntrypointDir = filepath.Join(cwd, hostEntrypointDir)

internal/functions/deploy/deploy.go

@@ -58,6 +58,10 @@ func GetFunctionSlugs(fsys afero.Fs) (slugs []string, err error) {
 			slugs = append(slugs, slug)
 		}
 	}
+	// Add all function slugs declared in config file
+	for slug := range utils.Config.Functions {
+		slugs = append(slugs, slug)
+	}
 	return slugs, nil
 }
 

internal/functions/serve/serve.go

@@ -109,19 +109,13 @@ func ServeFunctions(ctx context.Context, envFilePath string, noVerifyJWT *bool,
 	if err != nil {
 		return err
 	}
-	cwd, err := os.Getwd()
-	if err != nil {
-		return errors.Errorf("failed to get working directory: %w", err)
-	}
-	dockerFuncDir := utils.ToDockerPath(filepath.Join(cwd, utils.FunctionsDir))
 	env = append(env,
 		fmt.Sprintf("SUPABASE_URL=http://%s:8000", utils.KongAliases[0]),
 		"SUPABASE_ANON_KEY="+utils.Config.Auth.AnonKey,
 		"SUPABASE_SERVICE_ROLE_KEY="+utils.Config.Auth.ServiceRoleKey,
 		"SUPABASE_DB_URL="+dbUrl,
 		"SUPABASE_INTERNAL_JWT_SECRET="+utils.Config.Auth.JwtSecret,
 		fmt.Sprintf("SUPABASE_INTERNAL_HOST_PORT=%d", utils.Config.Api.Port),
-		"SUPABASE_INTERNAL_FUNCTIONS_PATH="+dockerFuncDir,
 	)
 	if viper.GetBool("DEBUG") {
 		env = append(env, "SUPABASE_INTERNAL_DEBUG=true")
@@ -130,6 +124,10 @@ func ServeFunctions(ctx context.Context, envFilePath string, noVerifyJWT *bool,
 		env = append(env, "SUPABASE_INTERNAL_WALLCLOCK_LIMIT_SEC=0")
 	}
 	// 3. Parse custom import map
+	cwd, err := os.Getwd()
+	if err != nil {
+		return errors.Errorf("failed to get working directory: %w", err)
+	}
 	binds, functionsConfigString, err := populatePerFunctionConfigs(cwd, importMapPath, noVerifyJWT, fsys)
 	if err != nil {
 		return err

internal/functions/serve/templates/main.ts

@@ -2,6 +2,7 @@ import {
   STATUS_CODE,
   STATUS_TEXT,
 } from "https://deno.land/std/http/status.ts";
+import * as posix from "https://deno.land/std/path/posix/mod.ts";
 
 import * as jose from "https://deno.land/x/jose@v4.13.1/index.ts";
 
@@ -28,7 +29,6 @@ const EXCLUDED_ENVS = ["HOME", "HOSTNAME", "PATH", "PWD"];
 
 const JWT_SECRET = Deno.env.get("SUPABASE_INTERNAL_JWT_SECRET")!;
 const HOST_PORT = Deno.env.get("SUPABASE_INTERNAL_HOST_PORT")!;
-const FUNCTIONS_PATH = Deno.env.get("SUPABASE_INTERNAL_FUNCTIONS_PATH")!;
 const DEBUG = Deno.env.get("SUPABASE_INTERNAL_DEBUG") === "true";
 const FUNCTIONS_CONFIG_STRING = Deno.env.get(
   "SUPABASE_INTERNAL_FUNCTIONS_CONFIG",
@@ -43,6 +43,7 @@ const DENO_SB_ERROR_MAP = new Map([
 ]);
 
 interface FunctionConfig {
+  entrypointPath: string;
   importMapPath: string;
   verifyJWT: boolean;
 }
@@ -144,7 +145,7 @@ Deno.serve({
       }
     }
 
-    const servicePath = `${FUNCTIONS_PATH}/${functionName}`;
+    const servicePath = posix.dirname(functionsConfig[functionName].entrypointPath);
     console.error(`serving the request with ${servicePath}`);
 
     // Ref: https://supabase.com/docs/guides/functions/limits
@@ -167,6 +168,9 @@ Deno.serve({
     // point, as their migration process will not be easy.
     const decoratorType = "tc39";
 
+    const absEntrypoint = posix.join(Deno.cwd(), functionsConfig[functionName].entrypointPath);
+    const maybeEntrypoint = posix.toFileUrl(absEntrypoint).href;
+
     try {
       const worker = await EdgeRuntime.userWorkers.create({
         servicePath,
@@ -179,7 +183,8 @@ Deno.serve({
         customModuleRoot,
         cpuTimeSoftLimitMs,
         cpuTimeHardLimitMs,
-        decoratorType
+        decoratorType,
+        maybeEntrypoint
       });
 
       const controller = new AbortController();

pkg/config/config.go

@@ -368,10 +368,10 @@ type (
 	FunctionConfig map[string]function
 
 	function struct {
-		Enabled    *bool  `toml:"enabled"`
+		Enabled    *bool  `toml:"enabled" json:"-"`
 		VerifyJWT  *bool  `toml:"verify_jwt" json:"verifyJWT"`
 		ImportMap  string `toml:"import_map" json:"importMapPath,omitempty"`
-		Entrypoint string `json:"-"`
+		Entrypoint string `toml:"entrypoint" json:"entrypointPath,omitempty"`
 	}
 
 	analytics struct {