Clean up gazelle options (uber#430)

bufdev · web-flow · commit 0d13cb9fd7b1 · 2019-04-12T17:49:21.000-04:00
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,20 +1,5 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
 
 # gazelle:prefix github.com/uber/prototool
-# gazelle:exclude etc
-# gazelle:exclude example
-# gazelle:exclude style
-# gazelle:exclude internal/breaking/testdata
-# gazelle:exclude internal/cmd/testdata/lint
-# gazelle:exclude internal/cmd/testdata/compile
-# gazelle:exclude internal/cmd/testdata/foo
-# gazelle:exclude internal/cmd/testdata/format
-# gazelle:exclude internal/cmd/testdata/format-fix-v2
-# gazelle:exclude internal/cmd/testdata/format-fix
-# gazelle:exclude internal/cmd/testdata/bar
-# gazelle:exclude internal/cmd/testdata/create
-# gazelle:exclude internal/cmd/testdata/generate
-# gazelle:exclude internal/file/testdata
-# gazelle:exclude internal/reflect/proto
-# gazelle:exclude internal/reflect/testdata
+# gazelle:proto disable_global
 gazelle(name = "gazelle")
diff --git a/etc/bin/bazelgen.sh b/etc/bin/bazelgen.sh
@@ -44,7 +44,7 @@ EOF
 
 go mod tidy -v
 bazel run //:gazelle
-rm internal/cmd/testdata/grpc/BUILD.bazel
+rm -f internal/cmd/testdata/grpc/BUILD.bazel
 
 go mod tidy -v
 bazel run //:gazelle -- update-repos -from_file=go.mod
diff --git a/example/cmd/excited/BUILD.bazel b/example/cmd/excited/BUILD.bazel
@@ -0,0 +1,18 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["main.go"],
+    importpath = "github.com/uber/prototool/example/cmd/excited",
+    visibility = ["//visibility:private"],
+    deps = [
+        "//example/gen/go/uber/foo/v1:go_default_library",
+        "@org_golang_google_grpc//:go_default_library",
+    ],
+)
+
+go_binary(
+    name = "excited",
+    embed = [":go_default_library"],
+    visibility = ["//visibility:public"],
+)
diff --git a/example/gen/go/uber/bar/v1/BUILD.bazel b/example/gen/go/uber/bar/v1/BUILD.bazel
@@ -0,0 +1,9 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["bar.pb.go"],
+    importpath = "github.com/uber/prototool/example/gen/go/uber/bar/v1",
+    visibility = ["//visibility:public"],
+    deps = ["@com_github_golang_protobuf//proto:go_default_library"],
+)
diff --git a/example/gen/go/uber/foo/v1/BUILD.bazel b/example/gen/go/uber/foo/v1/BUILD.bazel
@@ -0,0 +1,19 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "excited_api.pb.go",
+        "foo.pb.go",
+        "hello_api.pb.go",
+    ],
+    importpath = "github.com/uber/prototool/example/gen/go/uber/foo/v1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//example/gen/go/uber/bar/v1:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//ptypes/duration:go_default_library",
+        "@com_github_golang_protobuf//ptypes/timestamp:go_default_library",
+        "@org_golang_google_grpc//:go_default_library",
+    ],
+)
diff --git a/internal/breaking/BUILD.bazel b/internal/breaking/BUILD.bazel
@@ -42,6 +42,7 @@ go_library(
 go_test(
     name = "go_default_test",
     srcs = ["breaking_test.go"],
+    data = glob(["testdata/**"]),
     embed = [":go_default_library"],
     deps = [
         "//internal/extract:go_default_library",
diff --git a/internal/cmd/BUILD.bazel b/internal/cmd/BUILD.bazel
@@ -30,9 +30,9 @@ go_test(
         "//internal/settings:go_default_library",
         "//internal/vars:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//credentials:go_default_library",
diff --git a/internal/desc/BUILD.bazel b/internal/desc/BUILD.bazel
@@ -7,6 +7,6 @@ go_library(
     visibility = ["//:__subpackages__"],
     deps = [
         "@com_github_golang_protobuf//proto:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
     ],
 )
diff --git a/internal/exec/BUILD.bazel b/internal/exec/BUILD.bazel
@@ -25,10 +25,10 @@ go_library(
         "//internal/settings:go_default_library",
         "//internal/text:go_default_library",
         "//internal/vars:go_default_library",
-        "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
+        "@com_github_golang_protobuf//jsonpb:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@in_gopkg_yaml_v2//:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@org_uber_go_multierr//:go_default_library",
         "@org_uber_go_zap//:go_default_library",
     ],
diff --git a/internal/file/BUILD.bazel b/internal/file/BUILD.bazel
@@ -20,6 +20,7 @@ go_test(
         "file_test.go",
         "proto_set_provider_test.go",
     ],
+    data = glob(["testdata/**"]),
     embed = [":go_default_library"],
     deps = [
         "//internal/settings:go_default_library",
diff --git a/internal/grpc/BUILD.bazel b/internal/grpc/BUILD.bazel
@@ -12,11 +12,11 @@ go_library(
     deps = [
         "//internal/desc:go_default_library",
         "@com_github_fullstorydev_grpcurl//:go_default_library",
-        "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
+        "@com_github_golang_protobuf//jsonpb:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@com_github_jhump_protoreflect//desc:go_default_library",
         "@com_github_jhump_protoreflect//dynamic:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//credentials:go_default_library",
         "@org_golang_google_grpc//keepalive:go_default_library",
diff --git a/internal/location/BUILD.bazel b/internal/location/BUILD.bazel
@@ -12,7 +12,7 @@ go_library(
     ],
     importpath = "github.com/uber/prototool/internal/location",
     visibility = ["//:__subpackages__"],
-    deps = ["@io_bazel_rules_go//proto/wkt:descriptor_go_proto"],
+    deps = ["@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library"],
 )
 
 go_test(
@@ -25,7 +25,7 @@ go_test(
     ],
     embed = [":go_default_library"],
     deps = [
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@com_github_stretchr_testify//assert:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
     ],
 )
diff --git a/internal/protoc/BUILD.bazel b/internal/protoc/BUILD.bazel
@@ -17,7 +17,7 @@ go_library(
         "//internal/wkt:go_default_library",
         "@com_github_gofrs_flock//:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@org_uber_go_multierr//:go_default_library",
         "@org_uber_go_zap//:go_default_library",
     ],
diff --git a/internal/reflect/BUILD.bazel b/internal/reflect/BUILD.bazel
@@ -9,18 +9,19 @@ go_library(
         "//internal/reflect/gen/uber/proto/reflect/v1:go_default_library",
         "//internal/strs:go_default_library",
         "@com_github_golang_protobuf//proto:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["reflect_test.go"],
+    data = glob(["testdata/**"]),
     embed = [":go_default_library"],
     deps = [
         "//internal/reflect/gen/uber/proto/reflect/v1:go_default_library",
         "//internal/testing:go_default_library",
-        "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
+        "@com_github_golang_protobuf//jsonpb:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
     ],
 )
diff --git a/internal/testing/BUILD.bazel b/internal/testing/BUILD.bazel
@@ -9,9 +9,9 @@ go_library(
         "//internal/file:go_default_library",
         "//internal/protoc:go_default_library",
         "//internal/reflect/gen/uber/proto/reflect/v1:go_default_library",
-        "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
+        "@com_github_golang_protobuf//jsonpb:go_default_library",
+        "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",
         "@com_github_stretchr_testify//require:go_default_library",
-        "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",
         "@org_uber_go_multierr//:go_default_library",
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ go_library(`
`7`	`7`	`visibility = ["//:__subpackages__"],`
`8`	`8`	`deps = [`
`9`	`9`	`"@com_github_golang_protobuf//proto:go_default_library",`
`10`		`- "@io_bazel_rules_go//proto/wkt:descriptor_go_proto",`
	`10`	`+ "@com_github_golang_protobuf//protoc-gen-go/descriptor:go_default_library",`
`11`	`11`	`],`
`12`	`12`	`)`