Skip to content

Commit dce2ea5

Browse files
fmeumfmeum
authored
bzlmod: Add support for go_proto_library (#3283)
This does not include support for `go_grpc_library` yet. Fixes #3265
1 parent 384289e commit dce2ea5

File tree

7 files changed

+103
-2
lines changed

7 files changed

+103
-2
lines changed

‎MODULE.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ print("WARNING: The rules_go Bazel module is still highly experimental and subje
1212

1313
bazel_dep(name = "bazel_skylib", version = "1.2.0")
1414
bazel_dep(name = "platforms", version = "0.0.4")
15+
bazel_dep(name = "rules_proto", version = "4.0.0")
16+
bazel_dep(name = "protobuf", version = "3.19.2", repo_name = "com_google_protobuf")
1517

1618
non_module_dependencies = use_extension("//go/private:extensions.bzl", "non_module_dependencies")
1719
use_repo(
@@ -25,5 +27,9 @@ use_repo(go_sdk, "go_default_sdk")
2527

2628
bazel_dep(name = "gazelle", version = "0.26.0")
2729
go_deps = use_extension("@gazelle//:extensions.bzl", "go_deps")
28-
go_deps.module(path = "github.com/golang/mock", version = "v1.6.0", sum = "h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=")
29-
use_repo(go_deps, "com_github_golang_mock")
30+
go_deps.from_file(go_mod = "//:go.mod")
31+
use_repo(go_deps,
32+
"com_github_golang_mock",
33+
"com_github_golang_protobuf",
34+
"org_golang_google_protobuf",
35+
)

‎go.mod

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
module github.com/bazelbuild/rules_go
2+
3+
go 1.18
4+
5+
require (
6+
github.com/golang/mock v1.6.0
7+
github.com/golang/protobuf v1.5.2
8+
google.golang.org/protobuf v1.28.0
9+
)

‎go.sum

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
2+
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
3+
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
4+
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
5+
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
6+
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
7+
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
8+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
9+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
10+
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
11+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
12+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
13+
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
14+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
15+
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
16+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
17+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
18+
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
19+
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
20+
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21+
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
22+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
23+
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
24+
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
25+
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
26+
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
27+
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
28+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
29+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
30+
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
31+
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
32+
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
33+
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
34+
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=

‎tests/bcr/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ local_path_override(
88
module_name = "rules_go",
99
path = "../..",
1010
)
11+
bazel_dep(name = "protobuf", version = "3.19.2")
1112

1213
# Test that this correctly downloads the SDK by requesting it from the commandline (see presubmit.yml).
1314
go_sdk = use_extension("@my_rules_go//go:extensions.bzl", "go_sdk")

‎tests/bcr/proto/BUILD.bazel

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
load("@my_rules_go//go:def.bzl", "go_test")
2+
load("@my_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library")
3+
4+
proto_library(
5+
name = "foo_proto",
6+
srcs = ["foo.proto"],
7+
deps = [
8+
"@protobuf//:empty_proto",
9+
],
10+
)
11+
12+
go_proto_library(
13+
name = "foo_go_proto",
14+
importpath = "example.com/foo_proto",
15+
proto = ":foo_proto",
16+
)
17+
18+
go_test(
19+
name = "foo_test",
20+
srcs = ["foo_test.go"],
21+
deps = [
22+
":foo_go_proto",
23+
],
24+
)

‎tests/bcr/proto/foo.proto

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
syntax = "proto3";
2+
3+
package tests.bcr.proto;
4+
option go_package = "example.com/foo_proto";
5+
6+
import "google/protobuf/empty.proto";
7+
8+
message Foo {
9+
int64 value = 1;
10+
google.protobuf.Empty empty = 2;
11+
}

‎tests/bcr/proto/foo_test.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package proto_test
2+
3+
import (
4+
"testing"
5+
6+
"example.com/foo_proto"
7+
)
8+
9+
func TestFoo(t *testing.T) {
10+
msg := &foo_proto.Foo{
11+
Value: 1,
12+
}
13+
if msg.Value != 1 {
14+
t.Fail()
15+
}
16+
}

0 commit comments

Comments
 (0)