Fixup importpath (#1209)

* Fixup importpath

Infer test import path correctly from deps
Remove importpath from all go_binary and go_test rules
Add importpath to all go_library rules
Delete go_prefix occurences

Progress on #721

* Review fixes

Author: ianthehat

BUILD.bazel

@@ -1,4 +1,4 @@
-load("@io_bazel_rules_go//go:def.bzl", "gazelle", "go_prefix", "go_path", "go_vet_test")
+load("@io_bazel_rules_go//go:def.bzl", "gazelle", "go_path", "go_vet_test")
 load("@io_bazel_rules_go//go/private:tools/lines_sorted_test.bzl", "lines_sorted_test")
 load("@io_bazel_rules_go//go/private:rules/info.bzl", "go_info")
 load("@io_bazel_rules_go//proto:go_proto_library.bzl", "go_google_protobuf")
@@ -16,9 +16,6 @@ go_context_data(
 
 # gazelle:prefix github.com/bazelbuild/rules_go
 
-# TODO(jayconrod): remove when nothing depends on this.
-go_prefix("github.com/bazelbuild/rules_go")
-
 go_google_protobuf()
 
 lines_sorted_test(

examples/bindata/BUILD.bazel

@@ -9,6 +9,7 @@ bindata(
 
 go_library(
     name = "go_default_library",
+    importpath = "github.com/bazelbuild/rules_go/examples/bindata",
     srcs = [":data"],
 )
 

examples/cgo/BUILD.bazel

@@ -14,6 +14,7 @@ go_library(
         "use_exported.c",
         "use_exported.h",
     ],
+    importpath = "github.com/bazelbuild/rules_go/examples/cgo",
     cdeps = ["//examples/cgo/cc_dependency:version"],
     cgo = True,
     clinkopts = ["-lm"],
@@ -31,6 +32,7 @@ go_library(
     cgo = True,
     clinkopts = ["-lm"],
     visibility = ["//visibility:private"],
+    importpath = "github.com/bazelbuild/rules_go/examples/cgo/sub",
 )
 
 go_test(

examples/cgo/skip_go_library/BUILD.bazel

@@ -9,4 +9,5 @@ go_library(
         "types.go",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/examples/cgo/skip_go_library",
 )

examples/lib/BUILD.bazel

@@ -12,6 +12,7 @@ go_library(
         "lib.go",
         "sub.s",
     ],
+    importpath = "github.com/bazelbuild/rules_go/examples/lib",
     deps = ["//examples/lib/deep:go_default_library"],
 )
 

examples/lib/deep/BUILD.bazel

@@ -8,4 +8,5 @@ go_library(
         "doc.go",
         "thought.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/examples/lib/deep",
 )

examples/proto/BUILD.bazel

@@ -15,7 +15,6 @@ go_test(
     name = "proto_test",
     size = "small",
     srcs = ["proto_test.go"],
-    importpath = "github.com/bazelbuild/rules_go/examples/proto",
     pure = "off",
     deps = [
         "//examples/proto/embed:go_default_library",
@@ -27,7 +26,6 @@ go_test(
     name = "proto_pure_test",
     size = "small",
     srcs = ["proto_test.go"],
-    importpath = "github.com/bazelbuild/rules_go/examples/proto",
     pure = "on",
     deps = [
         "//examples/proto/embed:go_default_library",

examples/stamped_bin/stamp/BUILD.bazel

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["stamp.go"],
+    importpath = "github.com/bazelbuild/rules_go/examples/stamped_bin/stamp",
     visibility = ["//visibility:public"],
     x_defs = {
         "XdefBuildTimestamp": "{BUILD_TIMESTAMP}",

examples/vendor/github.com/user/vendored/BUILD.bazel

@@ -53,6 +53,9 @@ c_exts = [
 go_filetype = FileType(go_exts + asm_exts)
 cc_hdr_filetype = FileType(hdr_exts)
 
+auto_importpath = "~auto~"
+test_library_suffix = "~library~"
+
 # Extensions of files we can build with the Go compiler or with cc_library.
 # This is a subset of the extensions recognized by go/build.
 cgo_filetype = FileType(go_exts + asm_exts + c_exts)

go/private/common.bzl

@@ -30,6 +30,8 @@ load("@io_bazel_rules_go//go/private:common.bzl",
     "structs",
     "goos_to_extension",
     "as_iterable",
+    "auto_importpath",
+    "test_library_suffix",
 )
 
 GoContext = provider()
@@ -121,14 +123,30 @@ def _infer_importpath(ctx):
   VENDOR_PREFIX = "/vendor/"
   # Check if import path was explicitly set
   path = getattr(ctx.attr, "importpath", "")
+  # are we in forced infer mode?
+  if path == auto_importpath:
+    path = ""
   if path != "":
     return path, EXPLICIT_PATH
   # See if we can collect importpath from embeded libraries
   # This is the path that fixes tests as well
   for embed in getattr(ctx.attr, "embed", []):
-    if GoLibrary in embed:
-      if embed[GoLibrary].pathtype == EXPLICIT_PATH:
-        return embed[GoLibrary].importpath, EXPLICIT_PATH
+    if GoLibrary not in embed:
+      continue
+    if embed[GoLibrary].pathtype == EXPLICIT_PATH:
+      return embed[GoLibrary].importpath, EXPLICIT_PATH
+  # If we are a test, and we have a dep in the same package, presume
+  # we should be named the same with an _test suffix
+  if ctx.label.name.endswith("_test" + test_library_suffix):
+    for dep in getattr(ctx.attr, "deps", []):
+      if GoLibrary not in dep:
+        continue
+      lib = dep[GoLibrary]
+      if lib.label.workspace_root != ctx.label.workspace_root:
+        continue
+      if lib.label.package != ctx.label.package:
+        continue
+      return lib.importpath + "_test", INFERRED_PATH
   # TODO: stop using the prefix
   prefix = getattr(ctx.attr, "_go_prefix", None)
   path = prefix.go_prefix if prefix else ""

go/private/context.bzl

@@ -16,8 +16,9 @@ load("@io_bazel_rules_go//go/private:rules/binary.bzl", "go_binary")
 load("@io_bazel_rules_go//go/private:rules/library.bzl", "go_library")
 load("@io_bazel_rules_go//go/private:rules/test.bzl", "go_test")
 load("@io_bazel_rules_go//go/private:rules/cgo.bzl", "setup_cgo_library")
+load("@io_bazel_rules_go//go/private:common.bzl", "auto_importpath", "test_library_suffix")
 
-def go_library_macro(name, srcs=None, embed=[], cgo=False, cdeps=[], copts=[], clinkopts=[], library=None, **kwargs):
+def go_library_macro(name, srcs=None, embed=[], cgo=False, cdeps=[], copts=[], clinkopts=[], importpath="", library=None, **kwargs):
   """See go/core.rst#go_library for full documentation."""
   if library:
     #TODO: print("\nDEPRECATED: {}//{}:{} : the library attribute is deprecated. Please migrate to embed.".format(native.repository_name(), native.package_name(), name))
@@ -37,16 +38,19 @@ def go_library_macro(name, srcs=None, embed=[], cgo=False, cdeps=[], copts=[], c
       name = name,
       srcs = srcs,
       embed = embed,
+      importpath = importpath,
       **kwargs
   )
 
+#TODO(#1207): Remove importpath
 def go_binary_macro(name, srcs=None, embed=[], cgo=False, cdeps=[], copts=[], clinkopts=[], library=None, importpath="", **kwargs):
   """See go/core.rst#go_binary for full documentation."""
   if library:
     #TODO: print("\nDEPRECATED: {}//{}:{} : the library attribute is deprecated. Please migrate to embed.".format(native.repository_name(), native.package_name(), name))
     embed = embed + [library]
-  #if importpath:
-  #  print("\nDEPRECATED: {}//{}:{} : the importpath attribute on go_binary is deprecated.".format(native.repository_name(), native.package_name(), name))
+  #TODO: Turn on the deprecation warning when gazelle stops adding these
+  #if importpath and native.repository_name() == "@":
+  #  print("\nDEPRECATED: //{}:{} : the importpath attribute on go_binary is deprecated.".format(native.package_name(), name))
 
   if cgo:
     cgo_embed = setup_cgo_library(
@@ -65,15 +69,20 @@ def go_binary_macro(name, srcs=None, embed=[], cgo=False, cdeps=[], copts=[], cl
       **kwargs
   )
 
-def go_test_macro(name, srcs=None, deps=None, importpath="", library=None, embed=[], gc_goopts=[], cgo=False, cdeps=[], copts=[], clinkopts=[], x_defs={}, **kwargs):
+#TODO(#1207): Remove importpath
+def go_test_macro(name, srcs=None, deps=None, importpath=None, library=None, embed=[], gc_goopts=[], cgo=False, cdeps=[], copts=[], clinkopts=[], x_defs={}, **kwargs):
   """See go/core.rst#go_test for full documentation."""
   if library:
     #TODO: print("\nDEPRECATED: {}//{}:{} : the library attribute is deprecated. Please migrate to embed.".format(native.repository_name(), native.package_name(), name))
     embed = embed + [library]
-  #TODO: if importpath:
-  #  print("\nDEPRECATED: {}//{}:{} : the importpath attribute on go_test is deprecated.".format(native.repository_name(), native.package_name(), name))
+  if not importpath:
+    importpath = auto_importpath
+  #TODO: Turn on the deprecation warning when gazelle stops adding these
+  #elif native.repository_name() == "@":
+  #  print("\nDEPRECATED: //{}:{} : the importpath attribute on go_test is deprecated.".format(native.package_name(), name))
+
 
-  library_name = name + "~library~"
+  library_name = name + test_library_suffix
   go_library_macro(
       name = library_name,
       visibility = ["//visibility:private"],

go/private/rules/wrappers.bzl

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["bazel.go"],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/bazel",
     visibility = ["//visibility:public"],
 )
 

go/tools/bazel/BUILD.bazel

@@ -9,6 +9,7 @@ go_binary(
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/fetch_repo",
     visibility = ["//visibility:private"],
     deps = ["@org_golang_x_tools//go/vcs:go_default_library"],
 )

go/tools/fetch_repo/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "directives.go",
         "platform.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/config",
     visibility = ["//visibility:public"],
     deps = ["@com_github_bazelbuild_buildtools//build:go_default_library"],
 )

go/tools/gazelle/config/BUILD.bazel

@@ -9,6 +9,7 @@ go_library(
         "main.go",
         "print.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/gazelle",
     deps = [
         "//go/tools/gazelle/config:go_default_library",
         "//go/tools/gazelle/merger:go_default_library",

go/tools/gazelle/gazelle/BUILD.bazel

@@ -6,6 +6,7 @@ go_library(
         "fix.go",
         "merger.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/merger",
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_bazelbuild_buildtools//build:go_default_library",

go/tools/gazelle/merger/BUILD.bazel

@@ -10,6 +10,7 @@ go_library(
         "package.go",
         "walk.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/packages",
     visibility = ["//visibility:public"],
     deps = [
         "//go/tools/gazelle/config:go_default_library",

go/tools/gazelle/packages/BUILD.bazel

@@ -11,6 +11,7 @@ go_library(
         "resolve_vendored.go",
         "std_package_list.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/resolve",
     visibility = ["//visibility:public"],
     deps = [
         "@com_github_bazelbuild_buildtools//build:go_default_library",

go/tools/gazelle/resolve/BUILD.bazel

@@ -8,6 +8,7 @@ go_library(
         "generator.go",
         "sort_labels.go",
     ],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/rules",
     visibility = ["//visibility:public"],
     deps = [
         "//go/tools/gazelle/config:go_default_library",

go/tools/gazelle/rules/BUILD.bazel

@@ -3,6 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["finder.go"],
+    importpath = "github.com/bazelbuild/rules_go/go/tools/gazelle/wspace",
     visibility = ["//visibility:public"],
 )
 

go/tools/gazelle/wspace/BUILD.bazel

@@ -25,6 +25,7 @@ go_library(
         ":darwin_amd64": LIB_AMD64_SRCS,
         "//conditions:default": LIB_OTHER_SRCS,
     }),
+    importpath = "github.com/bazelbuild/rules_go/tests/asm_include",
 )
 
 go_test(

tests/asm_include/BUILD.bazel

@@ -27,6 +27,7 @@ go_library(
         ":c_srcs_group",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/build_constraints",
 )
 
 filegroup(

tests/build_constraints/BUILD.bazel

@@ -11,4 +11,5 @@ go_library(
     name = "go_default_library",
     srcs = ["pure.go"],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_filtered",
 )

tests/cgo_filtered/BUILD.bazel

@@ -18,6 +18,7 @@ go_library(
         "foo.c",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_library_root_dir",
     tags = ["manual"],
 )
 

tests/cgo_library_root_dir/BUILD.bazel

@@ -18,4 +18,5 @@ go_library(
         "foo/foo.go",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_multi_dir",
 )

tests/cgo_multi_dir/BUILD.bazel

@@ -13,5 +13,4 @@ go_test(
     name = "go_default_test",
     srcs = ["cgo_opts_test.go"],
     embed = [":go_default_library"],
-    importpath = "github.com/bazelbuild/rules_go/tests/cgo_opts",
 )

tests/cgo_opts/BUILD.bazel

@@ -4,6 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = ["cgo_pthread_flag.go"],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_pthread_flag",
 )
 
 go_test(

tests/cgo_pthread_flag/BUILD.bazel

@@ -9,6 +9,7 @@ go_library(
         "pure.go",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_pure",
 )
 
 go_test(

tests/cgo_pure/BUILD.bazel

@@ -25,6 +25,7 @@ go_library(
         ],
     }),
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_select",
 )
 
 cc_library(

tests/cgo_select/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
         "sub/foo.h",
     ],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_sys_hdr",
 )
 
 go_test(

tests/cgo_sys_hdr/BUILD.bazel

@@ -4,6 +4,7 @@ go_library(
     name = "go_default_library",
     srcs = ["cgo_lib.go"],
     cgo = True,
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_trans_deps",
     deps = ["//tests/cgo_trans_deps/dep:go_default_library"],
 )
 

tests/cgo_trans_deps/BUILD.bazel

@@ -3,5 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["dep.go"],
+    importpath = "github.com/bazelbuild/rules_go/tests/cgo_trans_deps/dep",
     visibility = ["//visibility:public"],
 )

tests/cgo_trans_deps/dep/BUILD.bazel

@@ -14,6 +14,7 @@ go_test(
 go_library(
     name = "go_default_library",
     srcs = ["lib.go"],
+    importpath = "github.com/bazelbuild/rules_go/tests/coverage",
 )
 
 bazel_test(
@@ -37,6 +38,7 @@ go_binary(
 go_library(
     name = "bin_lib",
     srcs = ["bin_lib.go"],
+    importpath = "github.com/bazelbuild/rules_go/tests/coverage",
 )
 
 bazel_test(

tests/coverage/BUILD.bazel

@@ -24,7 +24,6 @@ go_test(
     name = "empty_package_cgo",
     size = "small",
     srcs = ["empty_package_test.go"],
-    importpath = "github.com/bazelbuild/rules_go/tests/empty_package_test",
     pure = "off",
     x_defs = {
         "Expect": "2",
@@ -36,7 +35,6 @@ go_test(
     name = "empty_package_pure",
     size = "small",
     srcs = ["empty_package_test.go"],
-    importpath = "github.com/bazelbuild/rules_go/tests/empty_package_test",
     pure = "on",
     x_defs = {
         "Expect": "1",