Skip to content
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

Jump to bottom

fix(functions): always resolve absolute path in container #2187

Merged
merged 2 commits into from
Apr 18, 2024
Merged

fix(functions): always resolve absolute path in container #2187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00ad7c5
fix(functions): duplicate mount point when passing fallback as flag
sweatybridge Apr 18, 2024
9544cb2
fix(functions): always resolve absolute path in container
sweatybridge Apr 18, 2024
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
10 changes: 6 additions & 4 deletions internal/functions/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,13 @@ func ServeFunctions(ctx context.Context, envFilePath string, noVerifyJWT *bool,
return err
}
}
modules, err := utils.BindImportMap(fallbackImportMapPath, dockerFallbackImportMapPath, fsys)
if err != nil {
return err
if fallbackImportMapPath != importMapPath {
modules, err := utils.BindImportMap(fallbackImportMapPath, dockerFallbackImportMapPath, fsys)
if err != nil {
return err
}
binds = append(binds, modules...)
}
binds = append(binds, modules...)

if err := utils.MkdirIfNotExistFS(fsys, utils.FunctionsDir); err != nil {
return err
Expand Down
23 changes: 9 additions & 14 deletions internal/utils/deno.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,37 +278,32 @@ func resolveHostPath(hostPath string, fsys afero.Fs) string {
if filepath.IsAbs(hostPath) {
return getModulePath(hostPath)
}
cwd, err := os.Getwd()
if err != nil {
return hostPath
}
rel := filepath.Join(FunctionsDir, hostPath)
if strings.HasPrefix(rel, FunctionsDir) {
return hostPath
}
rebased := filepath.Join(cwd, rel)
exists, err := afero.Exists(fsys, rebased)
exists, err := afero.Exists(fsys, rel)
if err != nil {
logger := GetDebugLogger()
fmt.Fprintln(logger, err)
}
if !exists {
return hostPath
}
if strings.HasPrefix(rel, FunctionsDir) {
suffix := strings.TrimPrefix(rel, FunctionsDir)
return path.Join(DockerFuncDirPath, filepath.ToSlash(suffix))
}
// Directory imports need to be suffixed with /
// Ref: https://deno.com/[email protected]/basics/import_maps
if strings.HasSuffix(hostPath, "/") {
rel += "/"
if strings.HasSuffix(hostPath, string(filepath.Separator)) {
rel += string(filepath.Separator)
}
return getModulePath(rel)
}

func getModulePath(hostPath string) string {
mod := path.Join(DockerModsDir, GetPathHash(hostPath))
if strings.HasSuffix(hostPath, "/") {
if strings.HasSuffix(hostPath, string(filepath.Separator)) {
mod += "/"
}
if ext := filepath.Ext(hostPath); len(ext) > 0 {
} else if ext := filepath.Ext(hostPath); len(ext) > 0 {
mod += ext
}
return mod
Expand Down
10 changes: 4 additions & 6 deletions internal/utils/deno_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,16 @@ func TestResolveImports(t *testing.T) {
}
// Setup in-memory fs
fsys := afero.NewMemMapFs()
cwd, err := os.Getwd()
require.NoError(t, err)
require.NoError(t, fsys.Mkdir(filepath.Join(cwd, "common"), 0755))
require.NoError(t, fsys.Mkdir(filepath.Join(cwd, DbTestsDir), 0755))
require.NoError(t, fsys.Mkdir(filepath.Join(cwd, FunctionsDir, "child"), 0755))
require.NoError(t, fsys.Mkdir("common", 0755))
require.NoError(t, fsys.Mkdir(DbTestsDir, 0755))
require.NoError(t, fsys.Mkdir(filepath.Join(FunctionsDir, "child"), 0755))
// Run test
resolved := importMap.Resolve(fsys)
// Check error
assert.Equal(t, "/home/deno/modules/ac351c7174c8f47a9a9056bd96bcd71cfb980c906daee74ab9bce8308c68b811/", resolved.Imports["abs/"])
assert.Equal(t, "/home/deno/modules/92a5dc04bd6f9fb8f29f8066fed8a5c1e81bc59ad48a11283b63736867e4f2a8", resolved.Imports["root"])
assert.Equal(t, "/home/deno/modules/faaed96206118cf98625ea8065b6b3864f8cf9484814c423b58ebaa9b2d1e47b", resolved.Imports["parent"])
assert.Equal(t, "child", resolved.Imports["child"])
assert.Equal(t, "/home/deno/functions/child", resolved.Imports["child"])
assert.Equal(t, "../missing", resolved.Imports["missing"])
})

Expand Down