Manual fixups

bazelbuild · Oct 22, 2020 · e72b0f5 · e72b0f5
1 parent e89d25e
commit e72b0f5
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 87 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -27,17 +27,6 @@ load("@io_bazel_rules_go//extras:embed_data_deps.bzl", "go_embed_data_dependenci
 
 go_embed_data_dependencies()
 
-http_archive(
-    name = "rules_proto",
-    sha256 = "4d421d51f9ecfe9bf96ab23b55c6f2b809cbaf0eea24952683e397decfbd0dd0",
-    strip_prefix = "rules_proto-f6b8d89b90a7956f6782a4a3609b2f0eee3ce965",
-    # master, as of 2020-01-06
-    urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/f6b8d89b90a7956f6782a4a3609b2f0eee3ce965.tar.gz",
-        "https://github.com/bazelbuild/rules_proto/archive/f6b8d89b90a7956f6782a4a3609b2f0eee3ce965.tar.gz",
-    ],
-)
-
 # Used by //tests:buildifier_test.
 # Latest release is not compatible with the incompatible bazel flags we use
 # in CI, in particular, --incompatible_load_proto_rules_from_bzl.

diff --git a/extras/BUILD.bazel b/extras/BUILD.bazel
@@ -31,5 +31,6 @@ bzl_library(
     name = "embed_data_deps",
     srcs = ["embed_data_deps.bzl"],
     visibility = ["//visibility:public"],
-    deps = ["@bazel_tools//tools/build_defs/repo:git.bzl"],
+    # Don't list dependency on @bazel_tools//tools/build_defs/repo.bzl
+    deps = [],  # keep
 )
diff --git a/go/platform/BUILD.bazel b/go/platform/BUILD.bazel
@@ -26,13 +26,13 @@ filegroup(
     visibility = ["//visibility:public"],
 )
 
-bzl_library(
-    name = "apple",
-    srcs = ["apple.bzl"],
-)
-
 bzl_library(
     name = "list",
     srcs = ["list.bzl"],
     deps = ["@io_bazel_rules_go//go/private:platforms"],
 )
+
+bzl_library(
+    name = "apple",
+    srcs = ["apple.bzl"],
+)
diff --git a/go/private/BUILD.bazel b/go/private/BUILD.bazel
@@ -33,14 +33,13 @@ config_setting(
     values = {"stamp": "true"},
 )
 
-bzl_library(
-    name = "common",
-    srcs = ["common.bzl"],
-)
-
 bzl_library(
     name = "context",
     srcs = ["context.bzl"],
+    visibility = [
+        "//extras:__pkg__",  # Manually added
+        "//go:__subpackages__",
+    ],
     deps = [
         ":common",
         ":mode",
@@ -56,6 +55,7 @@ bzl_library(
 bzl_library(
     name = "go_toolchain",
     srcs = ["go_toolchain.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:platforms",
         "@io_bazel_rules_go//go/private:providers",
@@ -70,41 +70,23 @@ bzl_library(
     ],
 )
 
-bzl_library(
-    name = "mode",
-    srcs = ["mode.bzl"],
-)
-
-bzl_library(
-    name = "nogo",
-    srcs = ["nogo.bzl"],
-)
-
-bzl_library(
-    name = "platforms",
-    srcs = ["platforms.bzl"],
-)
-
-bzl_library(
-    name = "providers",
-    srcs = ["providers.bzl"],
-)
-
 bzl_library(
     name = "repositories",
     srcs = ["repositories.bzl"],
+    visibility = ["//go:__subpackages__"],
+    # Don't list dependency on @bazel_tools//tools/build_defs/repo:http.bzl
     deps = [
         ":common",
         ":nogo",
         "//go/private/skylib/lib:versions",
         "//proto:gogo",
-        "@bazel_tools//tools/build_defs/repo:http.bzl",
-    ],
+    ],  # keep
 )
 
 bzl_library(
     name = "sdk",
     srcs = ["sdk.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:nogo",
@@ -114,7 +96,41 @@ bzl_library(
     ],
 )
 
+bzl_library(
+    name = "common",
+    srcs = ["common.bzl"],
+    visibility = ["//go:__subpackages__"],
+)
+
+bzl_library(
+    name = "mode",
+    srcs = ["mode.bzl"],
+    visibility = ["//go:__subpackages__"],
+)
+
+bzl_library(
+    name = "nogo",
+    srcs = ["nogo.bzl"],
+    visibility = ["//go:__subpackages__"],
+)
+
+bzl_library(
+    name = "platforms",
+    srcs = ["platforms.bzl"],
+    visibility = ["//go:__subpackages__"],
+)
+
+bzl_library(
+    name = "providers",
+    srcs = ["providers.bzl"],
+    visibility = [
+        "//go:__subpackages__",
+        "//proto:__pkg__",
+    ],
+)
+
 bzl_library(
     name = "sdk_list",
     srcs = ["sdk_list.bzl"],
+    visibility = ["//go:__subpackages__"],
 )
diff --git a/go/private/actions/BUILD.bazel b/go/private/actions/BUILD.bazel
@@ -3,6 +3,7 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
     name = "archive",
     srcs = ["archive.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:mode",
@@ -15,12 +16,14 @@ bzl_library(
 bzl_library(
     name = "asm",
     srcs = ["asm.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = ["@io_bazel_rules_go//go/private:mode"],
 )
 
 bzl_library(
     name = "binary",
     srcs = ["binary.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:mode",
@@ -30,12 +33,14 @@ bzl_library(
 bzl_library(
     name = "compile",
     srcs = ["compile.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = ["@io_bazel_rules_go//go/private:mode"],
 )
 
 bzl_library(
     name = "compilepkg",
     srcs = ["compilepkg.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@bazel_skylib//lib:shell",
         "@io_bazel_rules_go//go/private:mode",
@@ -45,6 +50,7 @@ bzl_library(
 bzl_library(
     name = "cover",
     srcs = ["cover.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@bazel_skylib//lib:structs",
         "@io_bazel_rules_go//go/private:providers",
@@ -54,6 +60,7 @@ bzl_library(
 bzl_library(
     name = "link",
     srcs = ["link.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:mode",
@@ -63,11 +70,13 @@ bzl_library(
 bzl_library(
     name = "pack",
     srcs = ["pack.bzl"],
+    visibility = ["//go:__subpackages__"],
 )
 
 bzl_library(
     name = "stdlib",
     srcs = ["stdlib.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:mode",
         "@io_bazel_rules_go//go/private:providers",

diff --git a/go/private/repositories.bzl b/go/private/repositories.bzl
@@ -279,7 +279,15 @@ def _maybe(repo_rule, name, **kwargs):
         repo_rule(name = name, **kwargs)
 
 def _go_name_hack_impl(ctx):
-    ctx.file("BUILD.bazel")
+    build_content = """\
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+
+bzl_library(
+    name = "def",
+    srcs = ["def.bzl"],
+)
+"""
+    ctx.file("BUILD.bazel", build_content)
     content = "IS_RULES_GO = {}".format(ctx.attr.is_rules_go)
     ctx.file("def.bzl", content)
 

diff --git a/go/private/rules/BUILD.bazel b/go/private/rules/BUILD.bazel
@@ -3,34 +3,38 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 bzl_library(
     name = "binary",
     srcs = ["binary.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
-        ":common",
-        ":context",
-        ":mode",
-        ":providers",
-        ":rules/transition",
+        "@io_bazel_rules_go//go/private:common",
+        "@io_bazel_rules_go//go/private:context",
+        "@io_bazel_rules_go//go/private:mode",
+        "@io_bazel_rules_go//go/private:providers",
+        "@io_bazel_rules_go//go/private/rules:transition",
     ],
 )
 
 bzl_library(
     name = "cgo",
     srcs = ["cgo.bzl"],
+    visibility = ["//go:__subpackages__"],
+    # Don't list dependency on @rules_cc//cc:defs
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:mode",
-        "@rules_cc//cc:defs",
-    ],
+    ],  # keep
 )
 
 bzl_library(
     name = "info",
     srcs = ["info.bzl"],
-    deps = ["//go/private:context"],
+    visibility = ["//go:__subpackages__"],
+    deps = ["@io_bazel_rules_go//go/private:context"],
 )
 
 bzl_library(
     name = "library",
     srcs = ["library.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:common",
         "@io_bazel_rules_go//go/private:context",
@@ -41,6 +45,7 @@ bzl_library(
 bzl_library(
     name = "nogo",
     srcs = ["nogo.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:context",
         "@io_bazel_rules_go//go/private:providers",
@@ -51,12 +56,14 @@ bzl_library(
 bzl_library(
     name = "sdk",
     srcs = ["sdk.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = ["@io_bazel_rules_go//go/private:providers"],
 )
 
 bzl_library(
     name = "source",
     srcs = ["source.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
         "@io_bazel_rules_go//go/private:context",
         "@io_bazel_rules_go//go/private:providers",
@@ -66,45 +73,52 @@ bzl_library(
 bzl_library(
     name = "stdlib",
     srcs = ["stdlib.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
-        ":context",
-        ":providers",
+        "@io_bazel_rules_go//go/private:context",
+        "@io_bazel_rules_go//go/private:providers",
     ],
 )
 
 bzl_library(
     name = "test",
     srcs = ["test.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
-        ":binary",
-        ":common",
-        ":context",
-        ":mode",
-        ":providers",
-        ":transition",
         "@bazel_skylib//lib:structs",
+        "@io_bazel_rules_go//go/private:common",
+        "@io_bazel_rules_go//go/private:context",
+        "@io_bazel_rules_go//go/private:mode",
+        "@io_bazel_rules_go//go/private:providers",
+        "@io_bazel_rules_go//go/private/rules:binary",
+        "@io_bazel_rules_go//go/private/rules:transition",
     ],
 )
 
 bzl_library(
     name = "transition",
     srcs = ["transition.bzl"],
-    deps = [
-        ":mode",
-        ":platforms",
-        ":providers",
-        "@io_bazel_rules_go_name_hack//:def",
+    visibility = [
+        "//go:__subpackages__",
+        "//proto:__pkg__",
     ],
+    # Don't list dependency on @io_bazel_rules_go_name_hack//:def
+    deps = [
+        "@io_bazel_rules_go//go/private:mode",
+        "@io_bazel_rules_go//go/private:platforms",
+        "@io_bazel_rules_go//go/private:providers",
+    ],  # keep
 )
 
 bzl_library(
     name = "wrappers",
     srcs = ["wrappers.bzl"],
+    visibility = ["//go:__subpackages__"],
     deps = [
-        ":binary",
-        ":cgo",
-        ":library",
-        ":test",
-        ":transition",
+        "@io_bazel_rules_go//go/private/rules:binary",
+        "@io_bazel_rules_go//go/private/rules:cgo",
+        "@io_bazel_rules_go//go/private/rules:library",
+        "@io_bazel_rules_go//go/private/rules:test",
+        "@io_bazel_rules_go//go/private/rules:transition",
     ],
 )