envoyproxy · lizan · Jun 3, 2020 · Jun 1, 2020 · Jun 2, 2020 · Jun 2, 2020
diff --git a/api/bazel/BUILD b/api/bazel/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@io_bazel_rules_go//proto:compiler.bzl", "go_proto_compiler")
 
+licenses(["notice"])  # Apache 2
+
 go_proto_compiler(
     name = "pgv_plugin_go",
     options = ["lang=go"],

diff --git a/api/bazel/api_build_system.bzl b/api/bazel/api_build_system.bzl
@@ -1,7 +1,8 @@
+load("@rules_cc//cc:defs.bzl", "cc_test")
 load("@com_envoyproxy_protoc_gen_validate//bazel:pgv_proto_library.bzl", "pgv_cc_proto_library")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
 load("@com_google_protobuf//:protobuf.bzl", _py_proto_library = "py_proto_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_grpc_library", "go_proto_library")
+load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_test")
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load(
@@ -138,7 +139,7 @@ def api_cc_py_proto_library(
         _api_cc_grpc_library(name = cc_grpc_name, proto = relative_name, deps = cc_proto_deps)
 
 def api_cc_test(name, **kwargs):
-    native.cc_test(
+    cc_test(
         name = name,
         **kwargs
     )

diff --git a/api/bazel/repositories.bzl b/api/bazel/repositories.bzl
@@ -1,4 +1,3 @@
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load(":envoy_http_archive.bzl", "envoy_http_archive")
 load(":repository_locations.bzl", "REPOSITORY_LOCATIONS")
 

diff --git a/api/envoy/service/auth/v2alpha/BUILD b/api/envoy/service/auth/v2alpha/BUILD
@@ -1,9 +1,9 @@
+load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
+
 licenses(["notice"])  # Apache 2
 
 # DO NOT EDIT. This file is generated by tools/proto_sync.py.
 
-load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
-
 api_proto_package(
     has_services = True,
     deps = ["//envoy/service/auth/v2:pkg"],

diff --git a/api/test/build/BUILD b/api/test/build/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test", "api_go_test")
 
+licenses(["notice"])  # Apache 2
+
 api_cc_test(
     name = "build_test",
     srcs = ["build_test.cc"],

diff --git a/api/test/validate/BUILD b/api/test/validate/BUILD
@@ -1,7 +1,7 @@
-licenses(["notice"])  # Apache 2
-
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_test")
 
+licenses(["notice"])  # Apache 2
+
 api_cc_test(
     name = "pgv_test",
     srcs = ["pgv_test.cc"],

diff --git a/api/tools/BUILD b/api/tools/BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_binary", "py_test")
+
 licenses(["notice"])  # Apache 2
 
 py_binary(

diff --git a/api/versioning/BUILD b/api/versioning/BUILD
@@ -1,9 +1,9 @@
 # DO NOT EDIT. This file is generated by tools/proto_format/active_protos_gen.py.
 
-licenses(["notice"])  # Apache 2
-
 load("@rules_proto//proto:defs.bzl", "proto_library")
 
+licenses(["notice"])  # Apache 2
+
 # This tracks active development versions of protos.
 proto_library(
     name = "active_protos",

diff --git a/bazel/BUILD b/bazel/BUILD
@@ -1,13 +1,11 @@
 load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library")
+load("//bazel:envoy_build_system.bzl", "envoy_package")
+load("//bazel:envoy_internal.bzl", "envoy_select_force_libcpp")
 
 licenses(["notice"])  # Apache 2
 
-load("//bazel:envoy_build_system.bzl", "envoy_package")
-
 envoy_package()
 
-load("//bazel:envoy_internal.bzl", "envoy_select_force_libcpp")
-
 exports_files([
     "gen_sh_test_runner.sh",
     "sh_test_wrapper.sh",

diff --git a/bazel/envoy_binary.bzl b/bazel/envoy_binary.bzl
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_binary")
+
 # DO NOT LOAD THIS FILE. Load envoy_build_system.bzl instead.
 # Envoy binary targets
 load(
@@ -27,7 +29,7 @@ def envoy_cc_binary(
         linkopts = linkopts + _envoy_stamped_linkopts()
         deps = deps + _envoy_stamped_deps()
     deps = deps + [envoy_external_dep_path(dep) for dep in external_deps] + envoy_stdlib_deps()
-    native.cc_binary(
+    cc_binary(
         name = name,
         srcs = srcs,
         data = data,

diff --git a/bazel/envoy_library.bzl b/bazel/envoy_library.bzl
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 # DO NOT LOAD THIS FILE. Load envoy_build_system.bzl instead.
 # Envoy library targets
 load(
@@ -6,7 +8,6 @@ load(
     "envoy_external_dep_path",
     "envoy_linkstatic",
 )
-load("@com_google_protobuf//:protobuf.bzl", "cc_proto_library", "py_proto_library")
 load("@envoy_api//bazel:api_build_system.bzl", "api_cc_py_proto_library")
 
 # As above, but wrapped in list form for adding to dep lists. This smell seems needed as
@@ -23,7 +24,7 @@ def tcmalloc_external_deps(repository):
 # all envoy targets pass through an envoy-declared skylark function where they can be modified
 # before being passed to a native bazel function.
 def envoy_basic_cc_library(name, deps = [], external_deps = [], **kargs):
-    native.cc_library(
+    cc_library(
         name = name,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps],
         **kargs
@@ -101,8 +102,7 @@ def envoy_cc_library(
         "@envoy//bazel:compdb_build": ["@envoy//bazel/external:empty.cc"],
         "//conditions:default": [],
     })
-
-    native.cc_library(
+    cc_library(
         name = name,
         srcs = srcs,
         hdrs = hdrs,
@@ -131,7 +131,7 @@ def envoy_cc_library(
 
     # Intended for usage by external consumers. This allows them to disambiguate
     # include paths via `external/envoy...`
-    native.cc_library(
+    cc_library(
         name = name + "_with_external_headers",
         hdrs = hdrs,
         copts = envoy_copts(repository) + copts,

diff --git a/bazel/envoy_test.bzl b/bazel/envoy_test.bzl
@@ -1,3 +1,6 @@
+load("@rules_python//python:defs.bzl", "py_binary")
+load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library", "cc_test")
+
 # DO NOT LOAD THIS FILE. Load envoy_build_system.bzl instead.
 # Envoy test targets. This includes both test library and test binary targets.
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
@@ -29,8 +32,7 @@ def _envoy_cc_test_infrastructure_library(
         **kargs):
     # Add implicit tcmalloc external dependency(if available) in order to enable CPU and heap profiling in tests.
     deps += tcmalloc_external_deps(repository)
-
-    native.cc_library(
+    cc_library(
         name = name,
         srcs = srcs,
         hdrs = hdrs,
@@ -105,7 +107,7 @@ def envoy_cc_fuzz_test(
         tags = tags,
         **kwargs
     )
-    native.cc_test(
+    cc_test(
         name = name,
         copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = _envoy_test_linkopts(),
@@ -129,7 +131,7 @@ def envoy_cc_fuzz_test(
     # https://github.com/google/oss-fuzz/blob/master/projects/envoy/build.sh. It won't yield
     # anything useful on its own, as it expects to be run in an environment where the linker options
     # provide a path to FuzzingEngine.
-    native.cc_binary(
+    cc_binary(
         name = name + "_driverless",
         copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = ["-lFuzzingEngine"] + _envoy_test_linkopts(),
@@ -138,8 +140,7 @@ def envoy_cc_fuzz_test(
         deps = [":" + test_lib_name],
         tags = ["manual"] + tags,
     )
-
-    native.cc_test(
+    cc_test(
         name = name + "_with_libfuzzer",
         copts = fuzz_copts + envoy_copts("@envoy", test = True),
         linkopts = ["-fsanitize=fuzzer"] + _envoy_test_linkopts(),
@@ -171,8 +172,7 @@ def envoy_cc_test(
         size = "medium",
         flaky = False):
     coverage_tags = tags + ([] if coverage else ["nocoverage"])
-
-    native.cc_test(
+    cc_test(
         name = name,
         srcs = srcs,
         data = data,
@@ -277,7 +277,7 @@ def envoy_py_test_binary(
         external_deps = [],
         deps = [],
         **kargs):
-    native.py_binary(
+    py_binary(
         name = name,
         deps = deps + [envoy_external_dep_path(dep) for dep in external_deps],
         **kargs

diff --git a/bazel/external/BUILD b/bazel/external/BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 # Use a wrapper cc_library with an empty source source file to force

diff --git a/bazel/external/apache_thrift.BUILD b/bazel/external/apache_thrift.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 # The apache-thrift distribution does not keep the thrift files in a directory with the

diff --git a/bazel/external/boringssl_fips.BUILD b/bazel/external/boringssl_fips.BUILD
@@ -1,7 +1,8 @@
-licenses(["notice"])  # Apache 2
-
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load(":genrule_cmd.bzl", "genrule_cmd")
 
+licenses(["notice"])  # Apache 2
+
 cc_library(
     name = "crypto",
     srcs = [

diff --git a/bazel/external/compiler_rt.BUILD b/bazel/external/compiler_rt.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/fmtlib.BUILD b/bazel/external/fmtlib.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/http-parser.BUILD b/bazel/external/http-parser.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/jinja.BUILD b/bazel/external/jinja.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 py_library(

diff --git a/bazel/external/libcircllhist.BUILD b/bazel/external/libcircllhist.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/libprotobuf_mutator.BUILD b/bazel/external/libprotobuf_mutator.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/markupsafe.BUILD b/bazel/external/markupsafe.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 py_library(

diff --git a/bazel/external/quiche.BUILD b/bazel/external/quiche.BUILD
@@ -1,3 +1,13 @@
+load("@rules_cc//cc:defs.bzl", "cc_proto_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+load(":genrule_cmd.bzl", "genrule_cmd")
+load(
+    "@envoy//bazel:envoy_build_system.bzl",
+    "envoy_cc_library",
+    "envoy_cc_test",
+    "envoy_cc_test_library",
+)
+
 licenses(["notice"])  # Apache 2
 
 # QUICHE is Google's implementation of QUIC and related protocols. It is the
@@ -25,16 +35,6 @@ licenses(["notice"])  # Apache 2
 # QUICHE platform APIs in //source/extensions/quic_listeners/quiche/platform/,
 # should remain largely the same.
 
-load("@rules_proto//proto:defs.bzl", "proto_library")
-load(":genrule_cmd.bzl", "genrule_cmd")
-load(
-    "@envoy//bazel:envoy_build_system.bzl",
-    "envoy_cc_library",
-    "envoy_cc_test",
-    "envoy_cc_test_library",
-    "envoy_proto_library",
-)
-
 src_files = glob([
     "**/*.h",
     "**/*.c",

diff --git a/bazel/external/rapidjson.BUILD b/bazel/external/rapidjson.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/spdlog.BUILD b/bazel/external/spdlog.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/sqlparser.BUILD b/bazel/external/sqlparser.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/tclap.BUILD b/bazel/external/tclap.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/external/twitter_common_finagle_thrift.BUILD b/bazel/external/twitter_common_finagle_thrift.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 py_library(

diff --git a/bazel/external/twitter_common_lang.BUILD b/bazel/external/twitter_common_lang.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 py_library(

diff --git a/bazel/external/twitter_common_rpc.BUILD b/bazel/external/twitter_common_rpc.BUILD
@@ -1,3 +1,5 @@
+load("@rules_python//python:defs.bzl", "py_library")
+
 licenses(["notice"])  # Apache 2
 
 py_library(

diff --git a/bazel/external/wee8.BUILD b/bazel/external/wee8.BUILD
@@ -1,7 +1,8 @@
-licenses(["notice"])  # Apache 2
-
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load(":genrule_cmd.bzl", "genrule_cmd")
 
+licenses(["notice"])  # Apache 2
+
 cc_library(
     name = "wee8",
     srcs = [

diff --git a/bazel/external/xxhash.BUILD b/bazel/external/xxhash.BUILD
@@ -1,3 +1,5 @@
+load("@rules_cc//cc:defs.bzl", "cc_library")
+
 licenses(["notice"])  # Apache 2
 
 cc_library(

diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
@@ -1,8 +1,9 @@
-licenses(["notice"])  # Apache 2
-
+load("@rules_cc//cc:defs.bzl", "cc_library")
 load("//bazel:envoy_build_system.bzl", "envoy_cmake_external", "envoy_package")
 load("@rules_foreign_cc//tools/build_defs:configure.bzl", "configure_make")
 
+licenses(["notice"])  # Apache 2
+
 envoy_package()
 
 # autotools packages are unusable on Windows as-is