diff --git a/cmd/protoc-gen-connect-go-servicestruct/main.go b/cmd/protoc-gen-connect-go-servicestruct/main.go index 4f2d393..10b7fb8 100644 --- a/cmd/protoc-gen-connect-go-servicestruct/main.go +++ b/cmd/protoc-gen-connect-go-servicestruct/main.go @@ -35,12 +35,18 @@ import ( "path/filepath" "strings" - connect "connectrpc.com/connect" "google.golang.org/protobuf/compiler/protogen" "google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/pluginpb" ) +var ( + // These variables are set by ldflags during build time + version = "dev" + commit = "unknown" + date = "unknown" +) + const ( contextPackage = protogen.GoImportPath("context") connectPackage = protogen.GoImportPath("connectrpc.com/connect") @@ -56,9 +62,7 @@ const ( func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { - if _, err := fmt.Fprintln(os.Stdout, connect.Version); err != nil { - os.Exit(1) - } + fmt.Printf("protoc-gen-connect-go-servicestruct %s (commit: %s, built: %s)\n", version, commit, date) os.Exit(0) } if len(os.Args) == 2 && (os.Args[1] == "-h" || os.Args[1] == "--help") { diff --git a/cmd/protoc-gen-connect-go-servicestruct/main_test.go b/cmd/protoc-gen-connect-go-servicestruct/main_test.go index 98ba40e..49d241e 100644 --- a/cmd/protoc-gen-connect-go-servicestruct/main_test.go +++ b/cmd/protoc-gen-connect-go-servicestruct/main_test.go @@ -19,7 +19,9 @@ func TestVersion(t *testing.T) { stdout, stderr, exitCode := testRunProtocGenServiceStruct(t, nil, "--version") assert.Equal(t, "", stderr.String()) assert.Equal(t, 0, exitCode) - assert.NotEmpty(t, stdout.String()) + assert.Contains(t, stdout.String(), "protoc-gen-connect-go-servicestruct") + assert.Contains(t, stdout.String(), "commit:") + assert.Contains(t, stdout.String(), "built:") } func TestGenerate(t *testing.T) { diff --git a/cmd/protoc-gen-elixir-grpc/main.go b/cmd/protoc-gen-elixir-grpc/main.go index 038f286..6b29fe0 100644 --- a/cmd/protoc-gen-elixir-grpc/main.go +++ b/cmd/protoc-gen-elixir-grpc/main.go @@ -40,6 +40,13 @@ import ( "google.golang.org/protobuf/types/pluginpb" ) +var ( + // These variables are set by ldflags during build time + version = "dev" + commit = "unknown" + date = "unknown" +) + const ( filenameSuffix = ".ex" serverSuffix = "Server" @@ -77,9 +84,7 @@ func parsePluginParameters(paramStr string, flagSet *flag.FlagSet) error { func main() { if len(os.Args) == 2 && os.Args[1] == "--version" { - if _, err := fmt.Fprintln(os.Stdout, "1.0.0"); err != nil { - os.Exit(1) - } + fmt.Printf("protoc-gen-elixir-grpc %s (commit: %s, built: %s)\n", version, commit, date) os.Exit(0) } if len(os.Args) == 2 && (os.Args[1] == "-h" || os.Args[1] == "--help") { diff --git a/cmd/protoc-gen-elixir-grpc/main_test.go b/cmd/protoc-gen-elixir-grpc/main_test.go index dadc68b..ea464dc 100644 --- a/cmd/protoc-gen-elixir-grpc/main_test.go +++ b/cmd/protoc-gen-elixir-grpc/main_test.go @@ -19,7 +19,9 @@ func TestVersion(t *testing.T) { stdout, stderr, exitCode := testRunProtocGenElixirGrpc(t, nil, "--version") assert.Equal(t, "", stderr.String()) assert.Equal(t, 0, exitCode) - assert.Equal(t, "1.0.0\n", stdout.String()) + assert.Contains(t, stdout.String(), "protoc-gen-elixir-grpc") + assert.Contains(t, stdout.String(), "commit:") + assert.Contains(t, stdout.String(), "built:") } func TestHelp(t *testing.T) {