feat: update Delve to 1.7.3 (#106)

Author: briandealwis

go/helper-image/Dockerfile

@@ -4,23 +4,27 @@ ARG BUILDPLATFORM
 ARG TARGETOS
 ARG TARGETARCH
 
-ARG DELVE_VERSION=1.7.2
+ARG DELVE_VERSION=1.7.3
 
-# Patch delve to change default for --only-same-user to false
-# Required as `kubectl port-forward` to dlv port is refused.
-# We must install patch(1) to apply the patch.
+# Patch delve to make defaults for --check-go-version and --only-same-user
+# to be set at build time.  We must install patch(1) to apply the patch.
+#
+# We default --check-go-version to false to support binaries compiled
+# with unsupported versions of Go.  Delve issues a prominent warning.
+# 
+# We default --only-same-user to false as `kubectl port-forward`
+# to dlv port is refused otherwise.
 RUN apt-get update && apt-get install -y --no-install-recommends \
   patch
 RUN curl --location --output delve.tar.gz https://github.com/go-delve/delve/archive/v$DELVE_VERSION.tar.gz \
   && tar xzf delve.tar.gz \
   && mv delve-$DELVE_VERSION delve-source
 COPY delve-*.patch .
-RUN patch -p0 -d delve-source < delve-only-same-user.patch \
-  && patch -p0 -d delve-source < delve-pr2684.patch
+RUN patch -p0 -d delve-source < delve-as-options.patch
 
 # Produce an as-static-as-possible dlv binary to work on musl and glibc
 RUN cd delve-source \
-  && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /go/dlv -ldflags '-s -w -extldflags "-static"' ./cmd/dlv/
+  && CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -o /go/dlv -ldflags '-s -w -X github.com/go-delve/delve/cmd/dlv/cmds.checkGoVersionDefault=false -X github.com/go-delve/delve/cmd/dlv/cmds.checkLocalConnUserDefault=false -extldflags "-static"' ./cmd/dlv/
 
 # Now populate the duct-tape image with the language runtime debugging support files
 # The debian image is about 95MB bigger

go/helper-image/delve-as-options.patch

@@ -0,0 +1,41 @@
+diff --git cmd/dlv/cmds/commands.go cmd/dlv/cmds/commands.go
+index 15df5f6..f145330 100644
+--- cmd/dlv/cmds/commands.go
++++ cmd/dlv/cmds/commands.go
+@@ -46,6 +46,10 @@ var (
+ 	apiVersion int
+ 	// acceptMulti allows multiple clients to connect to the same server
+ 	acceptMulti bool
++	// checkGoVersionDefault sets default for --check-go-version
++	checkGoVersionDefault = "true"
++	// checkLocalConnUserDefault sets default for --only-same-user
++	checkLocalConnUserDefault = "true"
+ 	// addr is the debugging server listen address.
+ 	addr string
+ 	// initFile is the path to initialization file.
+@@ -139,8 +143,8 @@ func New(docCall bool) *cobra.Command {
+ 	rootCommand.PersistentFlags().StringVar(&initFile, "init", "", "Init file, executed by the terminal client.")
+ 	rootCommand.PersistentFlags().StringVar(&buildFlags, "build-flags", buildFlagsDefault, "Build flags, to be passed to the compiler. For example: --build-flags=\"-tags=integration -mod=vendor -cover -v\"")
+ 	rootCommand.PersistentFlags().StringVar(&workingDir, "wd", "", "Working directory for running the program.")
+-	rootCommand.PersistentFlags().BoolVarP(&checkGoVersion, "check-go-version", "", true, "Exits if the version of Go in use is not compatible (too old or too new) with the version of Delve.")
+-	rootCommand.PersistentFlags().BoolVarP(&checkLocalConnUser, "only-same-user", "", true, "Only connections from the same user that started this instance of Delve are allowed to connect.")
++	rootCommand.PersistentFlags().BoolVarP(&checkGoVersion, "check-go-version", "", parseBool(checkGoVersionDefault), "Exits if the version of Go in use is not compatible (too old or too new) with the version of Delve.")
++	rootCommand.PersistentFlags().BoolVarP(&checkLocalConnUser, "only-same-user", "", parseBool(checkLocalConnUserDefault), "Only connections from the same user that started this instance of Delve are allowed to connect.")
+ 	rootCommand.PersistentFlags().StringVar(&backend, "backend", "default", `Backend selection (see 'dlv help backend').`)
+ 	rootCommand.PersistentFlags().StringArrayVarP(&redirects, "redirect", "r", []string{}, "Specifies redirect rules for target process (see 'dlv help redirect')")
+ 	rootCommand.PersistentFlags().BoolVar(&allowNonTerminalInteractive, "allow-non-terminal-interactive", false, "Allows interactive sessions of Delve that don't have a terminal as stdin, stdout and stderr")
+@@ -1020,3 +1024,14 @@ func parseRedirects(redirects []string) ([3]string, error) {
+ 	}
+ 	return r, nil
+ }
++
++// parseBool parses a boolean value represented by a string, and panics if there is an error.
++// It is intended for boolean build-time constants that are set with 'go build -ldflags=-X xxx=bool'
++// and should only be a valid value.
++func parseBool(value string) bool {
++	b, err := strconv.ParseBool(value)
++	if err != nil {
++		panic(err)
++	}
++	return b
++}