Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
12 changes: 8 additions & 4 deletions cmd/protoc-gen-connect-go-servicestruct/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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") {
Expand Down
4 changes: 3 additions & 1 deletion cmd/protoc-gen-connect-go-servicestruct/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 8 additions & 3 deletions cmd/protoc-gen-elixir-grpc/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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") {
Expand Down
4 changes: 3 additions & 1 deletion cmd/protoc-gen-elixir-grpc/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down