Skip to content

fix: convert all paths to relative for deploy #3403

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
sweatybridge merged 2 commits into from
Apr 8, 2025
Merged

fix: convert all paths to relative for deploy #3403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b970361
fix: convert all paths to relative for deploy
sweatybridge Apr 8, 2025
cf4c84c
chore: move log statement to callback
sweatybridge Apr 8, 2025
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: 16 additions & 4 deletions pkg/function/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func (s *EdgeRuntimeAPI) Deploy(ctx context.Context, functionConfig config.Funct
if s.eszip != nil {
return s.UpsertFunctions(ctx, functionConfig)
}
// Convert all paths in functions config to relative when using api deploy
var toDeploy []api.FunctionDeployMetadata
for slug, fc := range functionConfig {
if !fc.Enabled {
Expand All @@ -36,13 +37,13 @@ func (s *EdgeRuntimeAPI) Deploy(ctx context.Context, functionConfig config.Funct
}
meta := api.FunctionDeployMetadata{
Name: &slug,
EntrypointPath: filepath.ToSlash(fc.Entrypoint),
ImportMapPath: cast.Ptr(filepath.ToSlash(fc.ImportMap)),
EntrypointPath: toRelPath(fc.Entrypoint),
ImportMapPath: cast.Ptr(toRelPath(fc.ImportMap)),
VerifyJwt: &fc.VerifyJWT,
}
files := make([]string, len(fc.StaticFiles))
for i, sf := range fc.StaticFiles {
files[i] = filepath.ToSlash(sf)
files[i] = toRelPath(sf)
}
meta.StaticPatterns = &files
toDeploy = append(toDeploy, meta)
Expand All @@ -57,16 +58,27 @@ func (s *EdgeRuntimeAPI) Deploy(ctx context.Context, functionConfig config.Funct
return s.bulkUpload(ctx, toDeploy, fsys)
}

func toRelPath(fp string) string {
if filepath.IsAbs(fp) {
if cwd, err := os.Getwd(); err == nil {
if relPath, err := filepath.Rel(cwd, fp); err == nil {
fp = relPath
}
}
}
return filepath.ToSlash(fp)
}

func (s *EdgeRuntimeAPI) bulkUpload(ctx context.Context, toDeploy []api.FunctionDeployMetadata, fsys fs.FS) error {
jq := queue.NewJobQueue(s.maxJobs)
toUpdate := make([]api.BulkUpdateFunctionBody, len(toDeploy))
for i, meta := range toDeploy {
fmt.Fprintln(os.Stderr, "Deploying Function:", *meta.Name)
param := api.V1DeployAFunctionParams{
Slug: meta.Name,
BundleOnly: cast.Ptr(true),
}
bundle := func() error {
fmt.Fprintln(os.Stderr, "Deploying Function:", *meta.Name)
resp, err := s.upload(ctx, param, meta, fsys)
if err != nil {
return err
Expand Down