Use WORKSPACE.bzlmod for envoy dependencies instead of module extension

Co-authored-by: phlax <[email protected]>

Author: Copilot

MODULE.bazel

@@ -20,13 +20,8 @@ archive_override(
     integrity = "sha256-kx4r36cRfb/2at8z85cSzRbQ6y27VIc5tb8sb/AtMlo=",
 )
 
-# Non-module dependencies (envoy, envoy_archive, bootstrap)
-# These cannot be handled via standard bzlmod because:
-# - envoy has local_path_overrides in MODULE.bazel that don't work as external deps
-# - envoy_archive has no MODULE.bazel
-# - bootstrap needs a custom BUILD file
-non_module_deps = use_extension("//:deps.bzl", "non_module_dependencies")
-use_repo(non_module_deps, "com_github_twbs_bootstrap", "envoy", "envoy_archive")
+# Note: envoy, envoy_archive, and bootstrap are loaded via WORKSPACE.bzlmod
+# because envoy's WORKSPACE needs to run to load its dependencies (like zstd)
 
 # Setup jq toolchain from aspect_bazel_lib
 bazel_lib_toolchains = use_extension("@aspect_bazel_lib//lib:extensions.bzl", "toolchains")

WORKSPACE.bzlmod

@@ -0,0 +1,34 @@
+# WORKSPACE.bzlmod
+# This file supplements MODULE.bazel for dependencies that cannot be expressed in pure bzlmod.
+# In bzlmod mode, both MODULE.bazel and WORKSPACE.bzlmod are processed.
+
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+load("//:versions.bzl", "VERSIONS")
+
+# Bootstrap CSS framework - needs custom BUILD file
+bootstrap = VERSIONS["com_github_twbs_bootstrap"]
+http_archive(
+    name = "com_github_twbs_bootstrap",
+    urls = [url.format(repo = bootstrap["repo"], version = bootstrap["version"]) for url in bootstrap["urls"]],
+    sha256 = bootstrap["sha256"],
+    strip_prefix = bootstrap["strip_prefix"].format(version = bootstrap["version"]),
+    build_file = "@envoy-website//bazel:bootstrap.BUILD",
+)
+
+# envoy - for documentation building
+envoy = VERSIONS["envoy"]
+http_archive(
+    name = "envoy",
+    urls = [url.format(repo = envoy["repo"], version = envoy["version"]) for url in envoy["urls"]],
+    sha256 = envoy["sha256"],
+    strip_prefix = envoy["strip_prefix"].format(version = envoy["version"]),
+)
+
+# envoy_archive - contains versioned documentation
+envoy_archive = VERSIONS["envoy_archive"]
+git_repository(
+    name = "envoy_archive",
+    remote = "https://github.com/{repo}".format(repo = envoy_archive["repo"]),
+    commit = envoy_archive["version"],
+)