Skip to content

Commit

Permalink
cmd/skipper: fix version and commit for go install (#2954)
Browse files Browse the repository at this point in the history
When skipper is installed via `go install` it has empty version and
commit values:
```
~$ go install github.com/zalando/skipper/cmd/skipper@latest
go: downloading github.com/zalando/skipper v0.21.2
~$ skipper -version
Skipper version  (commit: , runtime: go1.22.0)
```

Current build process of binaries specifies version and commit via `-ldflags`.

This change uses debug buildinfo to get version and commit if they are
not specified by `-ldflags` which is compatible with the current build process
but should also work for `go install` case.

If this change fixes `go install` case (which can only be tested after
package version is published) then we can add the same snippet
to other binaries and get rid of COMMIT_HASH ldflag.

We can not get rid of `-ldflags` fully though because `go build` does
not stamp version (see golang/go#50603).

Signed-off-by: Alexander Yastrebov <alexander.yastrebov@zalando.de>
  • Loading branch information
AlexanderYastrebov authored Feb 23, 2024
1 parent e7dd553 commit 8c03dfb
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions cmd/skipper/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package main
import (
"fmt"
"runtime"
"runtime/debug"

log "github.com/sirupsen/logrus"
"github.com/zalando/skipper"
Expand All @@ -28,6 +29,21 @@ var (
commit string
)

func init() {
if info, ok := debug.ReadBuildInfo(); ok {
if version == "" {
version = info.Main.Version
}
if commit == "" {
for _, setting := range info.Settings {
if setting.Key == "vcs.revision" {
commit = setting.Value[:min(8, len(setting.Value))]
}
}
}
}
}

func main() {
cfg := config.NewConfig()
if err := cfg.Parse(); err != nil {
Expand Down

0 comments on commit 8c03dfb

Please sign in to comment.