Change import style used by gazelle, which fixes tests.

See bazelbuild/bazel-gazelle#5 (comment)
google · Oct 4, 2021 · 4eb7d7d · 4eb7d7d
1 parent 777a2fd
commit 4eb7d7d
Show file tree

Hide file tree

Showing 35 changed files with 183 additions and 159 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -2,4 +2,5 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 
 # gazelle:prefix github.com/google/xtoproto
 # gazelle:proto_import_prefix github.com/google/xtoproto
+# gazelle:go_naming_convention import
 gazelle(name = "gazelle")
diff --git a/bazel/defs.bzl b/bazel/defs.bzl
@@ -78,10 +78,10 @@ def go_xtoproto_converter_library(name, request, importpath, deps=None, visibili
         deps = []
 
     final_deps = deps + [
-        "@xtoproto//csvtoprotoparse:go_default_library",
-        "@xtoproto//protocp:go_default_library",
-        "@xtoproto//csvcoder:go_default_library",
-        "@xtoproto//textcoder:go_default_library",
+        "@xtoproto//csvtoprotoparse",
+        "@xtoproto//protocp",
+        "@xtoproto//csvcoder",
+        "@xtoproto//textcoder",
         "@org_golang_google_protobuf//proto:go_default_library",
     ]
     go_library(

diff --git a/cmd/xtoproto/BUILD.bazel b/cmd/xtoproto/BUILD.bazel
@@ -1,19 +1,19 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "xtoproto_lib",
     srcs = ["xtoproto.go"],
     importpath = "github.com/google/xtoproto/cmd/xtoproto",
     visibility = ["//visibility:private"],
     deps = [
-        "//proto/service:go_default_library",
-        "//service:go_default_library",
-        "@org_golang_google_protobuf//encoding/prototext:go_default_library",
+        "//proto/service",
+        "//service",
+        "@org_golang_google_protobuf//encoding/prototext",
     ],
 )
 
 go_binary(
     name = "xtoproto",
-    embed = [":go_default_library"],
+    embed = [":xtoproto_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/cmd/xtoproto_web/BUILD.bazel b/cmd/xtoproto_web/BUILD.bazel
@@ -1,21 +1,21 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "xtoproto_web_lib",
     srcs = ["xtoproto_web.go"],
     data = [
         "//playground:playground_files",
     ],
     importpath = "github.com/google/xtoproto/cmd/xtoproto_web",
     visibility = ["//visibility:private"],
     deps = [
-        "@com_github_golang_glog//:go_default_library",
+        "@com_github_golang_glog//:glog",
         "@io_bazel_rules_go//go/tools/bazel:go_default_library",
     ],
 )
 
 go_binary(
     name = "xtoproto_web",
-    embed = [":go_default_library"],
+    embed = [":xtoproto_web_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/csvcoder/BUILD.bazel b/csvcoder/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "csvcoder",
     srcs = [
         "csvcoder_cell.go",
         "csvcoder_file.go",
@@ -10,18 +10,18 @@ go_library(
     ],
     importpath = "github.com/google/xtoproto/csvcoder",
     visibility = ["//visibility:public"],
-    deps = ["//textcoder:go_default_library"],
+    deps = ["//textcoder"],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "csvcoder_test",
     srcs = [
         "csvcoder_examples_test.go",
         "csvcoder_test.go",
     ],
-    embed = [":go_default_library"],
+    embed = [":csvcoder"],
     deps = [
-        "//textcoder:go_default_library",
-        "@com_github_google_go_cmp//cmp:go_default_library",
+        "//textcoder",
+        "@com_github_google_go_cmp//cmp",
     ],
 )
diff --git a/csvinfer/BUILD.bazel b/csvinfer/BUILD.bazel
@@ -1,20 +1,21 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "csvinfer",
     srcs = ["csvinfer.go"],
     importpath = "github.com/google/xtoproto/csvinfer",
     visibility = ["//visibility:public"],
-    deps = ["//recordinfer:go_default_library"],
+    deps = ["//recordinfer"],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "csvinfer_test",
     srcs = ["csvinfer_test.go"],
-    embed = [":go_default_library"],
+    embed = [":csvinfer"],
     deps = [
-        "//recordinfer:go_default_library",
-        "@com_github_google_go_cmp//cmp:go_default_library",
-        "@org_golang_google_protobuf//testing/protocmp:go_default_library",
+        "//proto/recordtoproto",
+        "//recordinfer",
+        "@com_github_google_go_cmp//cmp",
+        "@org_golang_google_protobuf//testing/protocmp",
     ],
 )
diff --git a/csvtoproto/BUILD.bazel b/csvtoproto/BUILD.bazel
@@ -1,16 +1,17 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "csvtoproto",
     srcs = [
         "csvtoproto.go",
         "csvtoproto_go_codegen.go",
     ],
     importpath = "github.com/google/xtoproto/csvtoproto",
     visibility = ["//visibility:public"],
     deps = [
-        "@com_github_golang_glog//:go_default_library",
-        "@com_github_mitchellh_go_wordwrap//:go_default_library",
-        "@com_github_stoewer_go_strcase//:go_default_library",
+        "//proto/recordtoproto",
+        "@com_github_golang_glog//:glog",
+        "@com_github_mitchellh_go_wordwrap//:go-wordwrap",
+        "@com_github_stoewer_go_strcase//:go-strcase",
     ],
 )
diff --git a/csvtoprotoparse/BUILD.bazel b/csvtoprotoparse/BUILD.bazel
@@ -1,13 +1,13 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "csvtoprotoparse",
     srcs = ["csvtoprotoparse.go"],
     importpath = "github.com/google/xtoproto/csvtoprotoparse",
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_golang_protobuf//ptypes:go_default_library_gen",
-        "@org_golang_google_protobuf//types/known/durationpb:go_default_library",
-        "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
+        "@org_golang_google_protobuf//types/known/durationpb",
+        "@org_golang_google_protobuf//types/known/timestamppb",
     ],
 )
diff --git a/examples/example01/BUILD.bazel b/examples/example01/BUILD.bazel
@@ -4,7 +4,7 @@ load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "example01",
     embed = [":mypackage_go_proto"],
     importpath = "github.com/google/xtoproto/examples/example01",
     visibility = ["//visibility:public"],

diff --git a/examples/example01/converter/BUILD.bazel b/examples/example01/converter/BUILD.bazel
@@ -1,23 +1,34 @@
 load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
-# gazelle:resolve go github.com/google/xtoproto/examples/example01/converter :go_default_library
+# gazelle:resolve go github.com/google/xtoproto/examples/example01/converter :converter
 go_xtoproto_converter_library(
-    name = "go_default_library",
+    name = "converter",
     importpath = "github.com/google/xtoproto/examples/example01/converter",
     request = "codegen_request.pbtxt",
     deps = [
-        "//examples/example01:go_default_library",
+        "//examples/example01",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["converter_test.go"],
     deps = [
-        "//examples/example01:go_default_library",
-        "//examples/example01/converter:go_default_library",
+        "//examples/example01",
+        "//examples/example01/converter",
         "@com_github_google_go_cmp//cmp:go_default_library",
         "@org_golang_google_protobuf//testing/protocmp:go_default_library",
     ],
 )
+
+go_test(
+    name = "converter_test",
+    srcs = ["converter_test.go"],
+    deps = [
+        "//examples/example01",
+        "//examples/example01/converter",
+        "@com_github_google_go_cmp//cmp",
+        "@org_golang_google_protobuf//testing/protocmp",
+    ],
+)
diff --git a/examples/example02/BUILD.bazel b/examples/example02/BUILD.bazel
@@ -18,7 +18,7 @@ go_proto_library(
 )
 
 go_library(
-    name = "go_default_library",
+    name = "example02",
     embed = [":mycompany_mypackage_go_proto"],
     importpath = "github.com/google/xtoproto/examples/example02",
     visibility = ["//visibility:public"],

diff --git a/examples/example02/converter02/BUILD.bazel b/examples/example02/converter02/BUILD.bazel
@@ -1,26 +1,40 @@
 load("@xtoproto//bazel:defs.bzl", "go_xtoproto_converter_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 
-# gazelle:resolve go github.com/google/xtoproto/examples/example02/converter02 :go_default_library
+# gazelle:resolve go github.com/google/xtoproto/examples/example02/converter02 :converter02
 go_xtoproto_converter_library(
-    name = "go_default_library",
+    name = "converter02",
     importpath = "github.com/google/xtoproto/examples/example02/converter02",
     request = "codegen_request.pbtxt",
     deps = [
-        "//examples/example02:go_default_library",
+        "//examples/example02",
     ],
 )
 
 go_test(
     name = "go_default_test",
     srcs = ["converter02_test.go"],
     deps = [
-        "//csvtoprotoparse:go_default_library",
-        "//examples/example02:go_default_library",
-        "//examples/example02/converter02:go_default_library",
+        "//csvtoprotoparse",
+        "//examples/example02",
+        "//examples/example02/converter02",
         "@com_github_golang_protobuf//ptypes:go_default_library_gen",
         "@com_github_google_go_cmp//cmp:go_default_library",
         "@org_golang_google_protobuf//testing/protocmp:go_default_library",
         "@org_golang_google_protobuf//types/known/timestamppb:go_default_library",
     ],
 )
+
+go_test(
+    name = "converter02_test",
+    srcs = ["converter02_test.go"],
+    deps = [
+        "//csvtoprotoparse",
+        "//examples/example02",
+        "//examples/example02/converter02",
+        "@com_github_golang_protobuf//ptypes:go_default_library_gen",
+        "@com_github_google_go_cmp//cmp",
+        "@org_golang_google_protobuf//testing/protocmp",
+        "@org_golang_google_protobuf//types/known/timestamppb",
+    ],
+)
diff --git a/internal/protoreflectcmp/BUILD.bazel b/internal/protoreflectcmp/BUILD.bazel
@@ -1,30 +1,30 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "protoreflectcmp",
     srcs = [
         "protoreflectcmp.go",
         "protoreflectcmp_list_impl.go",
     ],
     importpath = "github.com/google/xtoproto/internal/protoreflectcmp",
     visibility = ["//:__subpackages__"],
     deps = [
-        "@com_github_google_go_cmp//cmp:go_default_library",
-        "@com_github_google_go_cmp//cmp/cmpopts:go_default_library",
-        "@org_golang_google_protobuf//proto:go_default_library",
-        "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
+        "@com_github_google_go_cmp//cmp",
+        "@com_github_google_go_cmp//cmp/cmpopts",
+        "@org_golang_google_protobuf//proto",
+        "@org_golang_google_protobuf//reflect/protoreflect",
     ],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "protoreflectcmp_test",
     srcs = ["protoreflectcmp_test.go"],
-    embed = [":go_default_library"],
+    embed = [":protoreflectcmp"],
     deps = [
-        "//proto/wirepath/testproto:go_default_library",
-        "@com_github_google_go_cmp//cmp:go_default_library",
-        "@org_golang_google_protobuf//proto:go_default_library",
-        "@org_golang_google_protobuf//reflect/protoreflect:go_default_library",
-        "@org_golang_google_protobuf//testing/protocmp:go_default_library",
+        "//proto/wirepath/testproto",
+        "@com_github_google_go_cmp//cmp",
+        "@org_golang_google_protobuf//proto",
+        "@org_golang_google_protobuf//reflect/protoreflect",
+        "@org_golang_google_protobuf//testing/protocmp",
     ],
 )
diff --git a/internal/protoutil/BUILD.bazel b/internal/protoutil/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "protoutil",
     srcs = ["protoutil.go"],
     importpath = "github.com/google/xtoproto/internal/protoutil",
     visibility = ["//:__subpackages__"],

diff --git a/playground/BUILD.bazel b/playground/BUILD.bazel
@@ -2,16 +2,16 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 #load("defs.bzl", "")
 
 go_library(
-    name = "go_default_library",
+    name = "playground_lib",
     srcs = ["playground.go"],
     importpath = "github.com/google/xtoproto/playground",
     visibility = ["//visibility:private"],
     deps = select({
         "@io_bazel_rules_go//go/platform:js_wasm": [
-            "//proto/service:go_default_library",
-            "//service:go_default_library",
-            "@org_golang_google_protobuf//encoding/prototext:go_default_library",
-            "@org_golang_google_protobuf//proto:go_default_library",
+            "//proto/service",
+            "//service",
+            "@org_golang_google_protobuf//encoding/prototext",
+            "@org_golang_google_protobuf//proto",
         ],
         "//conditions:default": [],
     }),
@@ -20,7 +20,7 @@ go_library(
 go_binary(
     name = "playground",
     out = "playground.wasm",
-    embed = [":go_default_library"],
+    embed = [":playground_lib"],
     goarch = "wasm",
     goos = "js",
     pure = "on",

diff --git a/proto/recordtoproto/BUILD.bazel b/proto/recordtoproto/BUILD.bazel
@@ -17,7 +17,7 @@ go_proto_library(
 )
 
 go_library(
-    name = "go_default_library",
+    name = "recordtoproto",
     embed = [":recordtoproto_go_proto"],
     importpath = "github.com/google/xtoproto/proto/recordtoproto",
     visibility = ["//visibility:public"],

diff --git a/proto/service/BUILD.bazel b/proto/service/BUILD.bazel
@@ -18,11 +18,11 @@ go_proto_library(
     importpath = "github.com/google/xtoproto/proto/service",
     proto = ":service_proto",
     visibility = ["//visibility:public"],
-    deps = ["//proto/recordtoproto:go_default_library"],
+    deps = ["//proto/recordtoproto"],
 )
 
 go_library(
-    name = "go_default_library",
+    name = "service",
     embed = [":service_go_proto"],
     importpath = "github.com/google/xtoproto/proto/service",
     visibility = ["//visibility:public"],

diff --git a/proto/wirepath/BUILD.bazel b/proto/wirepath/BUILD.bazel
@@ -17,7 +17,7 @@ go_proto_library(
 )
 
 go_library(
-    name = "go_default_library",
+    name = "wirepath",
     embed = [":wirepath_go_proto"],
     importpath = "github.com/google/xtoproto/proto/wirepath",
     visibility = ["//visibility:public"],