feat: use version from VCS info

Author: powerman

.github/workflows/release.yml

@@ -62,7 +62,7 @@ jobs:
           binary_name: ${{ github.event.repository.name }}
           pre_command: 'export CGO_ENABLED=0'
           build_flags: '-trimpath' # Reproducible build (also needs -buildid= in ldflags).
-          ldflags: '-s -w -buildid= -X main.ver=${{ needs.release-pr.outputs.version }}'
+          ldflags: '-s -w -buildid='
           executable_compression: upx
           md5sum: false
           compress_assets: 'OFF'

README.md

@@ -20,6 +20,7 @@ just ask for it in PR comments after your PR has being merged.
 - [Overview](#overview)
 - [Installation](#installation)
   - [Docker Installation](#docker-installation)
+  - [Go Install](#go-install)
 - [Usage](#usage)
   - [Command-line Options](#command-line-options)
   - [Waiting for other dependencies](#waiting-for-other-dependencies)
@@ -138,6 +139,14 @@ there are two recommended approaches:
 Both approaches will automatically use correct binary for your platform
 without any manual platform detection.
 
+### Go Install
+
+If you have Go installed, you can install dockerize using `go install`:
+
+```sh
+go install github.com/powerman/dockerize@latest
+```
+
 ## Usage
 
 dockerize works by wrapping the call to your application

main.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path"
 	"runtime"
+	"runtime/debug"
 	"strings"
 	"syscall"
 	"time"
@@ -29,14 +30,14 @@ const (
 	defWaitRetryInterval = time.Second
 	exitCodeUsage        = 2
 	exitCodeFatal        = 123
+	versionUnknown       = "unknown"
 )
 
 // Read-only globals for use only within init() and main().
 //
 //nolint:gochecknoglobals // By design.
 var (
 	app = strings.TrimSuffix(path.Base(os.Args[0]), ".test")
-	ver = "unknown" // set by ./release
 	cfg struct {
 		version       bool
 		ini           iniConfig
@@ -81,6 +82,29 @@ func init() { //nolint:gochecknoinits // By design.
 	flag.Usage = usage //nolint:reassign // By design.
 }
 
+// getVersionFromBuildInfo returns version information from VCS data embedded in the binary.
+func getVersionFromBuildInfo(buildInfo *debug.BuildInfo) string {
+	if buildInfo == nil {
+		return versionUnknown
+	}
+
+	// Try to get version from module version (works with go install)
+	if buildInfo.Main.Version != "" && buildInfo.Main.Version != "(devel)" {
+		return buildInfo.Main.Version
+	}
+
+	return versionUnknown
+}
+
+// getVersion returns version information from VCS data embedded in the binary.
+func getVersion() string {
+	buildInfo, ok := debug.ReadBuildInfo()
+	if !ok {
+		return versionUnknown
+	}
+	return getVersionFromBuildInfo(buildInfo)
+}
+
 func main() { //nolint:gocyclo,gocognit,funlen,maintidx // TODO Refactor?
 	if !flag.Parsed() { // flags may be already parsed by tests
 		flag.Parse()
@@ -152,7 +176,7 @@ func main() { //nolint:gocyclo,gocognit,funlen,maintidx // TODO Refactor?
 	case cfg.exec && flag.NArg() == 0:
 		fatalFlagValue("require command to exec", "exec", cfg.exec)
 	case cfg.version:
-		fmt.Println(app, ver, runtime.Version())
+		fmt.Println(app, getVersion(), runtime.Version())
 		os.Exit(0)
 	}
 

main_test.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"os"
+	"runtime/debug"
 	"strconv"
 	"strings"
 	"syscall"
@@ -26,12 +27,61 @@ func TestFlagHelp(tt *testing.T) {
 	t.Match(out, "Usage:")
 }
 
+func TestGetVersionFromBuildInfo(tt *testing.T) {
+	t := check.T(tt)
+	t.Parallel()
+
+	// Test with nil buildInfo
+	version := getVersionFromBuildInfo(nil)
+	t.Equal(version, versionUnknown)
+
+	// Table-driven tests for different version scenarios
+	tests := []struct {
+		name     string
+		version  string
+		expected string
+	}{
+		{
+			name:     "empty version",
+			version:  "",
+			expected: versionUnknown,
+		},
+		{
+			name:     "devel version",
+			version:  "(devel)",
+			expected: versionUnknown,
+		},
+		{
+			name:     "valid version",
+			version:  "v1.2.3",
+			expected: "v1.2.3",
+		},
+		{
+			name:     "version without v prefix",
+			version:  "1.2.3",
+			expected: "1.2.3",
+		},
+	}
+
+	for _, tc := range tests {
+		t.Run(tc.name, func(tt *testing.T) {
+			t := check.T(tt)
+			t.Parallel()
+			buildInfo := &debug.BuildInfo{
+				Main: debug.Module{Version: tc.version},
+			}
+			result := getVersionFromBuildInfo(buildInfo)
+			t.Equal(result, tc.expected)
+		})
+	}
+}
+
 func TestFlagVersion(tt *testing.T) {
 	t := check.T(tt)
 	t.Parallel()
 	out, err := testexec.Func(testCtx, t, main, "-version").CombinedOutput()
 	t.Nil(err)
-	t.Match(out, ver)
+	t.Match(out, getVersion())
 }
 
 func TestFlag(tt *testing.T) {
@@ -111,7 +161,7 @@ func TestFlag(tt *testing.T) {
 			out, err := testexec.Func(testCtx, t, main, flags...).CombinedOutput()
 			if v.want == "" {
 				t.Nil(err)
-				t.Match(out, ver)
+				t.Match(out, getVersion())
 			} else {
 				t.Match(err, "exit status 2")
 				t.Match(out, `invalid value .* `+v.flags[0]+`:.*`+v.want)