Skip to content
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.

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

Use debug.ReadBuildInfo for retrieving plugin version #3023

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/grpc-ecosystem/grpc-gateway/v2

go 1.17
go 1.18

require (
github.com/antihax/optional v1.0.0
Expand Down
11 changes: 10 additions & 1 deletion protoc-gen-grpc-gateway/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"flag"
"fmt"
"os"
"runtime/debug"
"strings"

"github.com/golang/glog"
Expand Down Expand Up @@ -44,12 +45,20 @@ var (
date = "unknown"
)

func buildVersion() string {
v, ok := debug.ReadBuildInfo()
if !ok {
return version
}
return v.Main.Version
}

func main() {
flag.Parse()
defer glog.Flush()

if *versionFlag {
fmt.Printf("Version %v, commit %v, built at %v\n", version, commit, date)
fmt.Printf("Version %v, commit %v, built at %v\n", buildVersion(), commit, date)
Semior001 marked this conversation as resolved.
Show resolved Hide resolved
os.Exit(0)
}

Expand Down
11 changes: 10 additions & 1 deletion protoc-gen-openapiv2/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"flag"
"fmt"
"os"
"runtime/debug"
"strings"

"github.com/golang/glog"
Expand Down Expand Up @@ -51,12 +52,20 @@ var (
date = "unknown"
)

func buildVersion() string {
v, ok := debug.ReadBuildInfo()
if !ok {
return version
}
return v.Main.Version
}

func main() {
flag.Parse()
defer glog.Flush()

if *versionFlag {
fmt.Printf("Version %v, commit %v, built at %v\n", version, commit, date)
fmt.Printf("Version %v, commit %v, built at %v\n", buildVersion(), commit, date)
os.Exit(0)
}

Expand Down