Fix Envoy build on Windows

Signed-off-by: Anuraag Agrawal <anuraaga@gmail.com>

Author: anuraaga

bazel/BUILD

@@ -68,6 +68,15 @@ genrule(
     stamp = 1,
 )
 
+# For Windows, which must list each exported symbol individually.
+genrule(
+    name = "exported_symbols_windows",
+    srcs = ["//source/extensions/dynamic_modules:abi.h"],
+    outs = ["exported_symbols_windows.def"],
+    cmd = "$(location //tools:gen_dynamic_modules_windows_exports) $(location //source/extensions/dynamic_modules:abi.h) $@",
+    tools = ["//tools:gen_dynamic_modules_windows_exports"],
+)
+
 cc_library(
     name = "static_stdlib",
     linkopts = select({

bazel/com_google_protoconverter.patch

@@ -1,3 +1,46 @@
+diff --git a/build_defs/BUILD.bazel b/build_defs/BUILD.bazel
+index 732514d..e8e451e 100644
+--- a/build_defs/BUILD.bazel
++++ b/build_defs/BUILD.bazel
+@@ -14,7 +14,7 @@ package(
+ 
+ create_compiler_config_setting(
+     name = "config_msvc",
+-    value = "msvc-cl",
++    values = ["msvc-cl", "clang-cl"],
+ )
+ 
+ config_setting(
+diff --git a/build_defs/compiler_config_setting.bzl b/build_defs/compiler_config_setting.bzl
+index 0aca1ad..1457298 100644
+--- a/build_defs/compiler_config_setting.bzl
++++ b/build_defs/compiler_config_setting.bzl
+@@ -14,7 +14,7 @@
+ 
+ """Creates config_setting that allows selecting based on 'compiler' value."""
+ 
+-def create_compiler_config_setting(name, value, visibility = None):
++def create_compiler_config_setting(name, values, visibility = None):
+     # The "do_not_use_tools_cpp_compiler_present" attribute exists to
+     # distinguish between older versions of Bazel that do not support
+     # "@bazel_tools//tools/cpp:compiler" flag_value, and newer ones that do.
+@@ -24,14 +24,12 @@ def create_compiler_config_setting(name, value, visibility = None):
+     if hasattr(cc_common, "do_not_use_tools_cpp_compiler_present"):
+         native.config_setting(
+             name = name,
+-            flag_values = {
+-                "@bazel_tools//tools/cpp:compiler": value,
+-            },
++            flag_values = {"@bazel_tools//tools/cpp:compiler": v for v in values},
+             visibility = visibility,
+         )
+     else:
+         native.config_setting(
+             name = name,
+-            values = {"compiler": value},
++            values = {"compiler": v for v in values},
+             visibility = visibility,
+         )
 diff --git a/src/google/protobuf/stubs/BUILD.bazel b/src/google/protobuf/stubs/BUILD.bazel
 index a7b8c82..4f66827 100644
 --- a/src/google/protobuf/stubs/BUILD.bazel

bazel/envoy_internal.bzl

@@ -229,7 +229,10 @@ def envoy_exported_symbols_input():
     return [
         "@envoy//bazel:exported_symbols.txt",
         "@envoy//bazel:exported_symbols_apple.txt",
-    ]
+    ] + select({
+        "@envoy//bazel:windows_x86_64": ["//bazel:exported_symbols_windows.def"],
+        "//conditions:default": [],
+    })
 
 # Default symbols to be exported.
 def _envoy_default_exported_symbols():
@@ -240,6 +243,9 @@ def _envoy_default_exported_symbols():
         "@envoy//bazel:apple": [
             "-Wl,-exported_symbols_list,$(location @envoy//bazel:exported_symbols_apple.txt)",
         ],
+        "@envoy//bazel:windows_x86_64": [
+            "-DEF:$(location //bazel:exported_symbols_windows.def)",
+        ],
         "//conditions:default": [],
     })
 

bazel/external/zstd.BUILD

@@ -54,7 +54,10 @@ cc_library(
         "lib/zstd_errors.h",
     ],
     includes = ["lib"],
-    linkopts = ["-pthread"],
+    linkopts = select({
+        "@platforms//os:windows": [],
+        "//conditions:default": ["-pthread"],
+    }),
     linkstatic = True,
     local_defines = [
         "XXH_NAMESPACE=ZSTD_",

bazel/foreign_cc/BUILD

@@ -103,7 +103,10 @@ cc_library(
 
 configure_make(
     name = "luajit",
-    configure_command = "luajit_build.sh",
+    configure_command = select({
+        "//bazel:windows_x86_64": "luajit_build_win.sh",
+        "//conditions:default": "luajit_build.sh",
+    }),
     env = select({
         # This shouldn't be needed! See
         # https://github.com/envoyproxy/envoy/issues/6084
@@ -446,6 +449,28 @@ envoy_cmake(
     tags = ["skip_on_windows"],
 )
 
+configure_make(
+    name = "dlfcn_win32_build",
+    configure_in_place = True,
+    configure_options = [
+        "--disable-shared",
+        "--enable-static",
+    ],
+    lib_source = "@com_github_dlfcn_win32//:all",
+    out_static_libs = select({
+        "//bazel:windows_x86_64": ["libdl.a"],
+        "//conditions:default": [],
+    }),
+)
+
+cc_library(
+    name = "dlfcn_win32",
+    deps = select({
+        "//bazel:windows_x86_64": [":dlfcn_win32_build"],
+        "//conditions:default": [],
+    }),
+)
+
 envoy_cmake(
     name = "maxmind",
     build_args = select({

bazel/foreign_cc/cel-cpp.patch

@@ -1,3 +1,46 @@
+diff --git a/bazel/cel_proto_transitive_descriptor_set.bzl b/bazel/cel_proto_transitive_descriptor_set.bzl
+index e65e0b4a..0e143480 100644
+--- a/bazel/cel_proto_transitive_descriptor_set.bzl
++++ b/bazel/cel_proto_transitive_descriptor_set.bzl
+@@ -21,15 +21,33 @@ load("@com_google_protobuf//bazel/common:proto_info.bzl", "ProtoInfo")
+ def _cel_proto_transitive_descriptor_set(ctx):
+     output = ctx.actions.declare_file(ctx.attr.name + ".binarypb")
+     transitive_descriptor_sets = depset(transitive = [dep[ProtoInfo].transitive_descriptor_sets for dep in ctx.attr.deps])
+-    args = ctx.actions.args()
+-    args.use_param_file(param_file_arg = "%s", use_always = True)
+-    args.add_all(transitive_descriptor_sets)
++
++    # Generate script to concatenate files listed in a parameter file into an output file.
++    script = """
++set -euo pipefail
++PARAMS_FILE="$1"
++OUTPUT_FILE="$2"
++if [ ! -f "$PARAMS_FILE" ]; then
++    echo "Error: Parameter file not found at $PARAMS_FILE" >&2
++    exit 1
++fi
++exec > "$OUTPUT_FILE"
++while IFS= read -r file_to_cat || [[ -n "$file_to_cat" ]]; do
++    if [ -f "$file_to_cat" ]; then
++        cat "$file_to_cat"
++    fi
++done < "$PARAMS_FILE"
++"""
++
++    param_file_args = ctx.actions.args()
++    param_file_args.use_param_file(param_file_arg = "%s", use_always = True)
++    param_file_args.add_all(transitive_descriptor_sets)
+     ctx.actions.run_shell(
+         outputs = [output],
+         inputs = transitive_descriptor_sets,
+         progress_message = "Joining descriptors.",
+-        command = ("< \"$1\" xargs cat >{output}".format(output = output.path)),
+-        arguments = [args],
++        command=script,
++        arguments=[param_file_args, output.path],
+     )
+     return DefaultInfo(
+         files = depset([output]),
 diff --git a/common/internal/byte_string.cc b/common/internal/byte_string.cc
 index b9f47922..9d096424 100644
 --- a/common/internal/byte_string.cc

bazel/foreign_cc/luajit.patch

@@ -53,7 +53,7 @@ index c83abfa0..0276f9e3 100644
  ##############################################################################
 diff --git a/luajit_build.sh b/luajit_build.sh
 new file mode 100755
-index 00000000..3b4f8eca
+index 00000000..8dca96e6
 --- /dev/null
 +++ b/luajit_build.sh
 @@ -0,0 +1,68 @@
@@ -125,3 +125,65 @@ index 00000000..3b4f8eca
 +"${MAKE:-make}" -j$(nproc) V=1 PREFIX="$PREFIX" \
 +  "${EXTRA_MAKE_ARGS[@]}" \
 +  install
+diff --git a/luajit_build_win.sh b/luajit_build_win.sh
+new file mode 100755
+index 00000000..8fb0fbe8
+--- /dev/null
++++ b/luajit_build_win.sh
+@@ -0,0 +1,39 @@
++#!/bin/bash
++
++set -e
++
++PREFIX=""
++while [[ $# -gt 0 ]]; do
++    case $1 in
++        --prefix=*)
++            PREFIX="${1#*=}"
++            shift
++            ;;
++        --prefix)
++            PREFIX="$2"
++            shift 2
++            ;;
++        *)
++            shift
++            ;;
++    esac
++done
++
++# Copy source tree to a build directory
++SRC_DIR="$(dirname "$(realpath "$0")")"
++BUILD_DIR="$(basename "$SRC_DIR")"
++cp -r "$SRC_DIR" "$BUILD_DIR"
++cd "$BUILD_DIR"
++
++ ls
++ cd src
++./msvcbuild.bat static
++
++mkdir -p "$PREFIX/lib"
++cp lua51.lib "$PREFIX/lib"
++mkdir -p "$PREFIX/include/luajit-2.1"
++for header in lauxlib.h luaconf.h lua.h lua.hpp luajit.h lualib.h; do
++    cp "$header" "$PREFIX/include/luajit-2.1"
++done
++mkdir -p "$PREFIX/bin"
++cp luajit.exe "$PREFIX/bin"
+diff --git a/src/msvcbuild.bat b/src/msvcbuild.bat
+index d6aed170..8a86b766 100644
+--- a/src/msvcbuild.bat
++++ b/src/msvcbuild.bat
+@@ -18,9 +18,9 @@
+ @rem Add more debug flags here, e.g. DEBUGCFLAGS=/DLUA_USE_ASSERT
+ @set DEBUGCFLAGS=
+ @set LJCOMPILE=cl /nologo /c /O2 /W3 /D_CRT_SECURE_NO_DEPRECATE /D_CRT_STDIO_INLINE=__declspec(dllexport)__inline
+-@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MD
+-@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MDd 
+-@set LJCOMPILETARGET=/Zi
++@set LJDYNBUILD=/DLUA_BUILD_AS_DLL /MT
++@set LJDYNBUILD_DEBUG=/DLUA_BUILD_AS_DLL /MTd 
++@set LJCOMPILETARGET=/Z7
+ @set LJLINKTYPE=/DEBUG /RELEASE
+ @set LJLINKTYPE_DEBUG=/DEBUG
+ @set LJLINKTARGET=/OPT:REF /OPT:ICF /INCREMENTAL:NO

bazel/platforms/BUILD

@@ -111,3 +111,12 @@ platform(
         "@platforms//os:macos",
     ],
 )
+
+platform(
+    name = "x64_windows-clang-cl",
+    constraint_values = [
+        "@platforms//cpu:x86_64",
+        "@platforms//os:windows",
+        "@bazel_tools//tools/cpp:clang-cl",
+    ],
+)

bazel/repo.bzl

@@ -65,25 +65,36 @@ def _envoy_repo_impl(repository_ctx):
 
     """
 
-    # parse container information for use in RBE
-    json_result = repository_ctx.execute([
-        repository_ctx.path(repository_ctx.attr.yq),
-        repository_ctx.path(repository_ctx.attr.envoy_ci_config),
-        "-ojson",
-    ])
-    if json_result.return_code != 0:
-        fail("yq failed: {}".format(json_result.stderr))
-    repository_ctx.file("ci-config.json", json_result.stdout)
-    config_data = json.decode(repository_ctx.read("ci-config.json"))
-    repository_ctx.file("containers.bzl", CONTAINERS.format(
-        repo = config_data["build-image"]["repo"],
-        repo_gcr = config_data["build-image"]["repo-gcr"],
-        sha = config_data["build-image"]["sha"],
-        sha_gcc = config_data["build-image"]["sha-gcc"],
-        sha_mobile = config_data["build-image"]["sha-mobile"],
-        sha_worker = config_data["build-image"]["sha-worker"],
-        tag = config_data["build-image"]["tag"],
-    ))
+    if repository_ctx.os.name.lower().find("windows") == -1:
+        json_result = repository_ctx.execute([
+            repository_ctx.path(repository_ctx.attr.yq),
+            repository_ctx.path(repository_ctx.attr.envoy_ci_config),
+            "-ojson",
+        ])
+        if json_result.return_code != 0:
+            fail("yq failed: {}".format(json_result.stderr))
+        repository_ctx.file("ci-config.json", json_result.stdout)
+        config_data = json.decode(repository_ctx.read("ci-config.json"))
+        repository_ctx.file("containers.bzl", CONTAINERS.format(
+            repo = config_data["build-image"]["repo"],
+            repo_gcr = config_data["build-image"]["repo-gcr"],
+            sha = config_data["build-image"]["sha"],
+            sha_gcc = config_data["build-image"]["sha-gcc"],
+            sha_mobile = config_data["build-image"]["sha-mobile"],
+            sha_worker = config_data["build-image"]["sha-worker"],
+            tag = config_data["build-image"]["tag"],
+        ))
+    else:
+        # yq via bazel doesn't work on Windows, but we don't need the file either
+        repository_ctx.file("containers.bzl", CONTAINERS.format(
+            repo = "",
+            repo_gcr = "",
+            sha = "",
+            sha_gcc = "",
+            sha_mobile = "",
+            sha_worker = "",
+            tag = "",
+        ))
     repo_version_path = repository_ctx.path(repository_ctx.attr.envoy_version)
     api_version_path = repository_ctx.path(repository_ctx.attr.envoy_api_version)
     version = repository_ctx.read(repo_version_path).strip()

bazel/repositories.bzl

@@ -13,6 +13,8 @@ WINDOWS_SKIP_TARGETS = [
     "envoy.filters.http.sxg",
     "envoy.tracers.dynamic_ot",
     "envoy.tracers.datadog",
+    # Only implemented for Linux.
+    "envoy.resource_monitors.cpu_utilization",
     # Extensions that require CEL.
     "envoy.access_loggers.extension_filters.cel",
     "envoy.rate_limit_descriptors.expr",
@@ -215,6 +217,7 @@ def envoy_dependencies(skip_targets = []):
     external_http_archive("envoy_examples")
     external_http_archive("envoy_toolshed")
 
+    _com_github_dlfcn_win32()
     _com_github_maxmind_libmaxminddb()
 
     external_http_archive("rules_license")
@@ -918,3 +921,9 @@ def _com_github_maxmind_libmaxminddb():
         name = "com_github_maxmind_libmaxminddb",
         build_file_content = BUILD_ALL_CONTENT,
     )
+
+def _com_github_dlfcn_win32():
+    external_http_archive(
+        name = "com_github_dlfcn_win32",
+        build_file_content = BUILD_ALL_CONTENT,
+    )