bazel: update rules_foreign_cc

[keith]

This update is required for this commit
bazel-contrib/rules_foreign_cc@c41020e
in order to support Apple Silicon. Since our last update there have been
some breaking API changes. I followed these instructions to migrate:

https://github.com/bazelbuild/rules_foreign_cc/releases/tag/0.3.0
https://github.com/bazelbuild/rules_foreign_cc/releases/tag/0.4.0

Signed-off-by: Keith Smiley keithbsmiley@gmail.com

[repokitteh-read-only]

CC @envoyproxy/dependency-shepherds: Your approval is needed for changes made to (bazel/.*repos.*\.bzl)|(bazel/dependency_imports\.bzl)|(api/bazel/.*\.bzl)|(.*/requirements\.txt)|(.*\.patch).

🐱

Caused by: #17445 was opened by keith.

see: more, trace.

[keith]

this was never overridden so I inlined it with the new name

[keith]

Doing this in 1 string uses 1 make command like before, I'm not sure if it matters but I kept it the same

[keith]

note there is a change here with this rm -f first because I was seeing this:

cp: /private/var/tmp/_bazel_ksmiley/4096f01a2eae006dd7eb0d708a9f3935/sandbox/darwin-sandbox/1854/execroot/envoy/bazel-out/darwin_arm64-fastbuild/bin/external/envoy/bazel/foreign_cc/ares/include/ares_dns.h and /private/var/tmp/_bazel_ksmiley/4096f01a2eae006dd7eb0d708a9f3935/sandbox/darwin-sandbox/1854/execroot/envoy/external/com_github_c_ares_c_ares/include/ares_dns.h are identical (not copied).

maybe this isn't needed on macOS or with the new version of rules_foreign_cc? either way it seems safe for now

[wrowe]

It's not immediately apparent what caused the regression here based on reviewing your patch diff, why exactly rules_foreign_cc was promoted to or lost from data-plane deps;

verifying dependencies...
Validating build dependency structure...
Validating test-only dependencies...
Validating data-plane dependencies...
Dependency validation failed, please check metadata in bazel/repository_locations.bzl
Observed dataplane core deps {'com_googlesource_code_re2', 'com_googlesource_googleurl', 'com_github_circonus_labs_libcircllhist', 'com_github_google_tcmalloc', 'opencensus_proto', 'io_bazel_rules_go', 'com_github_cyan4973_xxhash', 'com_github_jbeder_yaml_cpp', 'com_github_nlohmann_json', 'com_github_grpc_grpc', 'com_google_googleapis', 'boringssl_fips', 'com_github_zlib_ng_zlib_ng', 'com_github_nodejs_http_parser', 'com_github_nghttp2_nghttp2', 'com_googlesource_quiche', 'com_google_absl', 'rules_foreign_cc', 'com_github_c_ares_c_ares', 'com_github_gperftools_gperftools', 'com_google_protobuf', 'com_github_cncf_udpa', 'boringssl', 'com_github_tencent_rapidjson', 'com_envoyproxy_protoc_gen_validate', 'net_zlib', 'com_github_fmtlib_fmt', 'com_github_libevent_libevent', 'com_github_gabime_spdlog'} is not covered by "use_category" implied core deps {'bazel_skylib', 'com_github_openzipkin_zipkinapi', 'com_googlesource_code_re2', 'com_github_bazelbuild_buildtools', 'com_googlesource_googleurl', 'com_github_circonus_labs_libcircllhist', 'com_github_google_tcmalloc', 'opencensus_proto', 'prometheus_metrics_model', 'io_bazel_rules_go', 'com_github_cyan4973_xxhash', 'com_github_jbeder_yaml_cpp', 'com_github_nlohmann_json', 'com_github_grpc_grpc', 'boringssl_fips', 'com_google_googleapis', 'rules_proto', 'com_github_zlib_ng_zlib_ng', 'com_github_nghttp2_nghttp2', 'com_google_absl', 'com_googlesource_quiche', 'com_github_c_ares_c_ares', 'com_github_gperftools_gperftools', 'com_google_protobuf', 'com_github_cncf_udpa', 'boringssl', 'com_github_tencent_rapidjson', 'net_zlib', 'com_envoyproxy_protoc_gen_validate', 'com_github_nodejs_http_parser', 'com_github_libevent_libevent', 'com_github_gabime_spdlog', 'com_github_fmtlib_fmt', 'opentelemetry_proto'}: {'rules_foreign_cc'} are missing
##[error]Bash exited with code '1'.
Finishing: Verify dependency information

[moderation]

I've been running the latest version in my environment for a while and took a slightly different approach. I didn't test for Windows. Posting here just in case it helps with your implementation.

bazel/dependency_imports.bzl

-load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")                                           
+load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")                                          
-    rules_foreign_cc_dependencies()                                                                          
+    rules_foreign_cc_dependencies(register_default_tools = False, register_built_tools = False)              

diff --git a/bazel/envoy_build_system.bzl b/bazel/envoy_build_system.bzl                   
index a0463ab77..4bdbd742c 100644                                                          
--- a/bazel/envoy_build_system.bzl                                                         
+++ b/bazel/envoy_build_system.bzl                                                         
@@ -1,6 +1,6 @@                                                                            
 # The main Envoy bazel file. Load this file for all Envoy-specific build macros           
 # and rules that you'd like to use in your BUILD files.                                   
-load("@rules_foreign_cc//tools/build_defs:cmake.bzl", "cmake_external")                   
+load("@rules_foreign_cc//foreign_cc:cmake.bzl", "cmake")                                  
 load(":envoy_binary.bzl", _envoy_cc_binary = "envoy_cc_binary")                           
 load(":envoy_internal.bzl", "envoy_external_dep_path")                                    
 load(                                                                                     
@@ -87,7 +87,7 @@ envoy_directory_genrule = rule(                                          
                                                                                           
 # External CMake C++ library targets should be specified with this function. This defaults
 # to building the dependencies with ninja                                                 
-def envoy_cmake_external(                                                                 
+def envoy_cmake(                                                                          
         name,                                                                             
         cache_entries = {},                                                               
         debug_cache_entries = {},                                                         
@@ -123,7 +123,7 @@ def envoy_cmake_external(                                              
     else:                                                                                 
         pf = postfix_script                                                               
                                                                                           
-    cmake_external(                                                                       
+    cmake(                                                                                
         name = name,                                                                      
         cache_entries = select({                                                          
             "@envoy//bazel:dbg_build": cache_entries_debug,                               

diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD
index b24046ea9..9ee119436 100644
--- a/bazel/foreign_cc/BUILD
+++ b/bazel/foreign_cc/BUILD
@@ -1,6 +1,6 @@
 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")
+load("//bazel:envoy_build_system.bzl", "envoy_cmake", "envoy_package")
+load("@rules_foreign_cc//foreign_cc:configure.bzl", "configure_make")
 
 licenses(["notice"])  # Apache 2
 
@@ -21,7 +21,7 @@ configure_make(
     lib_source = "@com_github_gperftools_gperftools//:all",
     linkopts = ["-lpthread"],
     make_commands = ["make install-libLTLIBRARIES install-perftoolsincludeHEADERS"],
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:debug_tcmalloc": ["libtcmalloc_debug.a"],
         "//conditions:default": ["libtcmalloc_and_profiler.a"],
     }),
@@ -52,7 +52,7 @@ configure_make(
     lib_source = "@com_github_luajit_luajit//:all",
     make_commands = [],
     out_include_dir = "include/luajit-2.1",
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:windows_x86_64": ["lua51.lib"],
         "//conditions:default": ["libluajit-5.1.a"],
     }),
@@ -72,11 +72,11 @@ configure_make(
     lib_source = "@com_github_moonjit_moonjit//:all",
     make_commands = [],
     out_include_dir = "include/moonjit-2.2",
-    static_libraries = ["libluajit-5.1.a"],
+    out_static_libs = ["libluajit-5.1.a"],
     tags = ["skip_on_windows"],
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "ares",
     cache_entries = {
         "CARES_BUILD_TOOLS": "no",
@@ -91,17 +91,13 @@ envoy_cmake_external(
         "//bazel:apple": ["-lresolv"],
         "//conditions:default": [],
     }),
-    postfix_script = select({
-        "//bazel:windows_x86_64": "cp -L $EXT_BUILD_ROOT/external/com_github_c_ares_c_ares/src/lib/nameser.h $INSTALLDIR/include/nameser.h && cp -L $EXT_BUILD_ROOT/external/com_github_c_ares_c_ares/include/ares_dns.h $INSTALLDIR/include/ares_dns.h",
-        "//conditions:default": "cp -L $EXT_BUILD_ROOT/external/com_github_c_ares_c_ares/include/ares_dns.h $INSTALLDIR/include/ares_dns.h",
-    }),
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:windows_x86_64": ["cares.lib"],
         "//conditions:default": ["libcares.a"],
     }),
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "curl",
     cache_entries = {
         "BUILD_CURL_EXE": "off",
@@ -142,7 +138,7 @@ envoy_cmake_external(
     defines = ["CURL_STATICLIB"],
     generate_crosstool_file = True,
     lib_source = "@com_github_curl//:all",
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:windows_x86_64": ["libcurl.lib"],
         "//conditions:default": ["libcurl.a"],
     }),
@@ -154,7 +150,7 @@ envoy_cmake_external(
     ],
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "event",
     cache_entries = {
         "EVENT__DISABLE_OPENSSL": "on",
@@ -171,7 +167,7 @@ envoy_cmake_external(
         "_GNU_SOURCE": "on",
     },
     lib_source = "@com_github_libevent_libevent//:all",
-    static_libraries = select({
+    out_static_libs = select({
         # macOS organization of libevent is different from Windows/Linux.
         # Including libevent_core is a requirement on those platforms, but
         # results in duplicate symbols when built on macOS.
@@ -192,7 +188,7 @@ envoy_cmake_external(
     }),
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "llvm",
     cache_entries = {
         # Disable both: BUILD and INCLUDE, since some of the INCLUDE
@@ -231,7 +227,7 @@ envoy_cmake_external(
         "ASMFLAGS": "-UDEBUG",
     },
     lib_source = "@org_llvm_llvm//:all",
-    static_libraries = select({
+    out_static_libs = select({
         "//conditions:default": [
             # Order from llvm-config --libnames asmparser core debuginfodwarf
             # engine lto mcparser mirparser orcjit passes runtimedyld
@@ -292,7 +288,7 @@ envoy_cmake_external(
     alwayslink = True,
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "nghttp2",
     cache_entries = {
         "ENABLE_LIB_ONLY": "on",
@@ -305,13 +301,13 @@ envoy_cmake_external(
     debug_cache_entries = {"ENABLE_DEBUG": "on"},
     defines = ["NGHTTP2_STATICLIB"],
     lib_source = "@com_github_nghttp2_nghttp2//:all",
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:windows_x86_64": ["nghttp2.lib"],
         "//conditions:default": ["libnghttp2.a"],
     }),
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "wamr",
     cache_entries = {
         "LLVM_DIR": "$EXT_BUILD_DEPS/copy_llvm/llvm/lib/cmake/llvm",
@@ -329,7 +325,7 @@ envoy_cmake_external(
     deps = [":llvm"],
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "wavm",
     binaries = ["wavm"],
     cache_entries = {
@@ -349,7 +345,7 @@ envoy_cmake_external(
         "ASMFLAGS": "-UDEBUG",
     },
     lib_source = "@com_github_wavm_wavm//:all",
-    static_libraries = select({
+    out_static_libs = select({
         "//conditions:default": [
             "libWAVM.a",
             "libWAVMUnwind.a",
@@ -359,7 +355,7 @@ envoy_cmake_external(
     deps = [":llvm"],
 )
 
-envoy_cmake_external(
+envoy_cmake(
     name = "zlib",
     cache_entries = {
         "CMAKE_CXX_COMPILER_FORCED": "on",
@@ -392,7 +388,7 @@ envoy_cmake_external(
         "//bazel:zlib_ng": "@com_github_zlib_ng_zlib_ng//:all",
         "//conditions:default": "@net_zlib//:all",
     }),
-    static_libraries = select({
+    out_static_libs = select({
         "//bazel:windows_x86_64": ["zlib.lib"],
         "//conditions:default": ["libz.a"],
     }),

[keith]

fix for the deps issue #17598

[keith]

Yay green. @moderation can you take a look?

[moderation]

/lgtm deps

[rojkov]

Thanks, LGTM!
@lizan could you please check and probably merge it?
/cc @wrowe

[wrowe]

Reviewing Monday