From 464b8bb4ffcffc42cd111542870e20bac0feaf54 Mon Sep 17 00:00:00 2001 From: Dan Luhring Date: Mon, 20 May 2024 21:59:42 -0400 Subject: [PATCH] review feedback Signed-off-by: Dan Luhring --- pkg/build/gobuild.go | 7 +++---- pkg/build/gobuild_test.go | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkg/build/gobuild.go b/pkg/build/gobuild.go index 4b0600069..03ccb0f95 100644 --- a/pkg/build/gobuild.go +++ b/pkg/build/gobuild.go @@ -313,7 +313,7 @@ func getDelve(ctx context.Context, platform v1.Platform) (string, error) { // find the delve binary in tmpInstallDir/bin/ delveBinary := "" - err = filepath.WalkDir(filepath.Join(tmpInstallDir, "bin"), func(path string, d fs.DirEntry, err error) error { + if err := filepath.WalkDir(filepath.Join(tmpInstallDir, "bin"), func(path string, d fs.DirEntry, err error) error { if err != nil { return err } @@ -323,8 +323,7 @@ func getDelve(ctx context.Context, platform v1.Platform) (string, error) { } return nil - }) - if err != nil { + }); err != nil { return "", fmt.Errorf("could not search for Delve binary: %w", err) } @@ -1100,7 +1099,7 @@ func (g *gobuild) buildOne(ctx context.Context, refStr string, base v1.Image, pl } defer os.RemoveAll(filepath.Dir(delveBinary)) - delvePath = "/usr/bin/" + filepath.Base(delveBinary) + delvePath = path.Join("/ko-app", filepath.Base(delveBinary)) // add layer with delve binary delveLayer, err := g.cache.get(ctx, delveBinary, func() (v1.Layer, error) { diff --git a/pkg/build/gobuild_test.go b/pkg/build/gobuild_test.go index d5cf6316f..de5cc403b 100644 --- a/pkg/build/gobuild_test.go +++ b/pkg/build/gobuild_test.go @@ -1489,7 +1489,7 @@ func TestDebugger(t *testing.T) { } gotEntrypoint := cfg.Config.Entrypoint wantEntrypoint := []string{ - "/usr/bin/dlv", + "/ko-app/dlv", "exec", "--listen=:40000", "--headless",