From 4e206d377e86f347c24c628883bf786183cfdf2a Mon Sep 17 00:00:00 2001
From: Elizabeth Byerly <ebyerly@google.com>
Date: Tue, 24 Mar 2026 15:46:36 -0400
Subject: [PATCH 1/2] Updating Envoy version to 07700f6 (2026-03-24T10:37:08Z)

See https://github.com/envoyproxy/envoy/commit/07700f6c1b5f03be0a6ebc4f4efdbb308e314e79.

Signed-off-by: Elizabeth Byerly <ebyerly@google.com>
---
 WORKSPACE                     |  2 +
 bazel/python_dependencies.bzl |  2 +-
 bazel/repositories.bzl        |  4 +-
 ci/run_envoy_docker.sh        |  4 +-
 tools/base/requirements.txt   | 77 ++++++++++++++++++-----------------
 5 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 027c7be52..0d33306ad 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -4,6 +4,8 @@ load("//bazel:repositories.bzl", "nighthawk_dependencies")
 
 nighthawk_dependencies()
 
+
+
 local_repository(
     name = "envoy_build_config",
     path = ".",
diff --git a/bazel/python_dependencies.bzl b/bazel/python_dependencies.bzl
index 173b7a4b5..329971796 100644
--- a/bazel/python_dependencies.bzl
+++ b/bazel/python_dependencies.bzl
@@ -5,5 +5,5 @@ def nighthawk_python_dependencies():
         name = "nh_pip3",
         python_interpreter_target = "@python3_12_host//:python",
         requirements_lock = "//tools/base:requirements.txt",
-        extra_pip_args = ["--require-hashes"],
+        extra_pip_args = ["--index-url", "https://pypi.org/simple"],
     )
diff --git a/bazel/repositories.bzl b/bazel/repositories.bzl
index d564a9a36..b125a2d5d 100644
--- a/bazel/repositories.bzl
+++ b/bazel/repositories.bzl
@@ -1,7 +1,7 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-ENVOY_COMMIT = "2cf3be83ecde2b37366e5e3f245f67ffd017ee5f"
-ENVOY_SHA = "5b3094096dd7cf047c2ae84f7a60e70caa567cfcbcede4c50e03a6544779c1f0"
+ENVOY_COMMIT = "07700f6c1b5f03be0a6ebc4f4efdbb308e314e79"
+ENVOY_SHA = "1eb0b82f54a79f28578a5b92c5aa8eb49188022b5c25490448721e4b00e4d382"
 
 HDR_HISTOGRAM_C_VERSION = "0.11.8"  # June 18th, 2025
 HDR_HISTOGRAM_C_SHA = "bb95351a6a8b242dc9be1f28562761a84d4cf0a874ffc90a9b630770a6468e94"
diff --git a/ci/run_envoy_docker.sh b/ci/run_envoy_docker.sh
index 611f6c77c..0663cdebf 100755
--- a/ci/run_envoy_docker.sh
+++ b/ci/run_envoy_docker.sh
@@ -7,8 +7,8 @@ set -e
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # User/group IDs
-USER_UID="$(id -u)"
-USER_GID="$(id -g)"
+USER_UID="${USER_UID:-$(id -u)}"
+USER_GID="${USER_GID:-$(id -g)}"
 export USER_UID
 export USER_GID
 
diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt
index 2622478de..e4be325b2 100644
--- a/tools/base/requirements.txt
+++ b/tools/base/requirements.txt
@@ -8,9 +8,9 @@ apipkg==3.0.2 \
     --hash=sha256:a16984c39de280701f3f6406ed3af658f2a1965011fe7bb5be34fbb48423b411 \
     --hash=sha256:c7aa61a4f82697fdaa667e70af1505acf1f7428b1c27b891d204ba7a8a3c5e0d
     # via -r tools/base/requirements.in
-attrs==25.4.0 \
-    --hash=sha256:16d5969b87f0859ef33a48b35d55ac1be6e42ae49d5e853b597db70c35c57e11 \
-    --hash=sha256:adcf7e2a1fb3b36ac48d97835bb6d8ade15b8dcce26aba8bf1d14847b57a3373
+attrs==26.1.0 \
+    --hash=sha256:c647aa4a12dfbad9333ca4e71fe62ddc36f4e63b2d260a37a8b83d2f043ac309 \
+    --hash=sha256:d03ceb89cb322a8fd706d4fb91940737b6642aa36998fe130a9bc96c985eff32
     # via -r tools/base/requirements.in
 certifi==2026.2.25 \
     --hash=sha256:027692e4402ad994f1c42e52a4997a9763c646b73e4096e4d5d6db8af1d6f0fa \
@@ -18,34 +18,39 @@ certifi==2026.2.25 \
     # via
     #   -r tools/base/requirements.in
     #   requests
-chardet==7.1.0 \
-    --hash=sha256:00c3182f739ae7715641e8c08e0ee8ae21b5db6402b883264aa04511edf428b9 \
-    --hash=sha256:18afc27681cd9f583fac47282179f8b73f37b1cab171a528e8af89e7e4562b32 \
-    --hash=sha256:1a3c22672c9502af99e0433b47421d0d72c8803efce2cd4a91a3ae1ab5972243 \
-    --hash=sha256:20b73403b7a21487e31b2810ea9d7182ce5e301a8ebe847b49d91ec6022e214a \
-    --hash=sha256:38be4c07e016dac37fb6060094f3a720200e3e49dc14f55924a1c230eeffa59f \
-    --hash=sha256:43c1e3cba6c41d8958ee4acdab94c151dbe256d7ef8df4ae032dc62a892f294f \
-    --hash=sha256:49b5edd762751735704d1fec38665ee219da28c66f2a4921d615b12be389735b \
-    --hash=sha256:5d86d349f768e6d35f6804013f6643d880ec877b94c453fa40a3fd10d16ddb48 \
-    --hash=sha256:619d7ef3187ff1691525a7fdbe8c30f5a519885e1de82f6f57e26a29866bf11b \
-    --hash=sha256:6f806f325825325e0682226269a2a4859993344cccca14f2463855d4f5a93272 \
-    --hash=sha256:70adef4a036d39d9b5f6c2702f773118a9985c0dff23b650e1045f20e33c9467 \
-    --hash=sha256:7f677725333bf53f84b7f57458f44669a8a5eb2ac4092ac699cdfa9b1af08a5f \
-    --hash=sha256:8e067ee79709ccf9caa5732419df2dbef476bd9b9658ffc929d45cf13fc91ed7 \
-    --hash=sha256:8f47bc4accac17bd9accbb4acc1d563acc024a783806c0a43c3a583f5285690b \
-    --hash=sha256:96e7fe0770cd77361bec21a1dd8524e77aaa567577fa8372368d5fa8dd0ef00b \
-    --hash=sha256:97cdd7a016fbb451a4dc26b3b1173960b3c0071bbe46a46d6b70027a517170ff \
-    --hash=sha256:a02197831a4304eed360559e0ffc58deccc9cdda9f9315c6e7ad978f7d8617d3 \
-    --hash=sha256:a6492bebaba8882afb3e14c786fb69ed767326b6f514b8e093dcdf6e2a094d33 \
-    --hash=sha256:b951107b254cdc766e52f4b8339dcfa97c7b45ca9f5509075308db2497e7f3af \
-    --hash=sha256:bacc8f862998c59e9ee7fe4960538300d1cc3fe2c293b9cc99bbbc7bf3bedf51 \
-    --hash=sha256:bbd4fccf1cf6d92fdd75a1827a478672abb5685e61e92ce863d9380b18cb813f \
-    --hash=sha256:c35d17822fc94467b7951adebd897cb01c0e37ac694be18d2cbd2b676d61df4f \
-    --hash=sha256:cc8c7520a9736da766f5794bbabb1c6cdfe446676429a5cf691af878631a80bf \
-    --hash=sha256:dff284d0661563e82d235f79f1d410c526b15ef8d50adc0446cba8162db68d22 \
-    --hash=sha256:e096d9c211050fff40e22748e1d09d0cec8348fc13ee6e2e0a1da079345b8a86 \
-    --hash=sha256:eb2a9b4052be006b87a985dbdbb00ab35b4b1b66d2751b0ee12680f8f4e90406 \
-    --hash=sha256:fdfc42dfc44ccd569b84fe6a1fdea1df66dc0c48461bc3899dea5efea8d507f6
+chardet==7.3.0 \
+    --hash=sha256:015f9d697f796a5bb0ac4d19e0108fd6cc84d141521089d0385d2a00c5f5d74e \
+    --hash=sha256:04ef4b65c18afb298ac7c1326fbd83e1524250ceb7e61df67115a4a48e9e8e0e \
+    --hash=sha256:23d264962f680deec691308cc753685b4c5a69798a26e00ce4f4cf96d2e43fcb \
+    --hash=sha256:328a79efb197d6e9460ce33ebb8002a0bf85faa123d56aa1f75c21696ee70070 \
+    --hash=sha256:340f4eccafa17cfc5a90af1fb8558dc791156f815f8d800d8ac2b1b9fb2b8103 \
+    --hash=sha256:51a0ad2031bd10d24357d7e52de68abe29efb62b7aedf1bd9d1c593fd438cec5 \
+    --hash=sha256:5276bc68736cf6d530ca2dc4ea1c2101d2b50015b09d48242615cc3818623574 \
+    --hash=sha256:58388f412a76d1449c6ce4631edbd1b0087385ff00b6fb1f521879d8e8d99484 \
+    --hash=sha256:5b58eb6d6dea67fc3b578dd956dd6e92aafea383aa559ccea55265554ff062a3 \
+    --hash=sha256:5dbfbaef7de55aee008de9b886a63e60e916016507ed7845c9b7bfe1357f4f54 \
+    --hash=sha256:5e912948f27c0124da8ce8fcd5ed8fe3b5e06fe8c0ecb66dd95180edf1122a6c \
+    --hash=sha256:622206fdb0d274766559fa172e2d680d58cc5fc6a67015c21c36fec500e7bd50 \
+    --hash=sha256:7193bcca96ffd87a7d6695056d3e875707b25eda588957756dd5c95d125fcb89 \
+    --hash=sha256:7ccec08ee572dfd7a9486835ceba06ef88fa3e15deb1b76130b5ba6012fbb0c0 \
+    --hash=sha256:7ed513fb0b35ebf663bd4f8be2d61af701202e98f77e6d8301d1a2c7d0f2985d \
+    --hash=sha256:7f3758c122aebb411eac37452c5774c56a5500147e1c24af0d460cb0d748fb48 \
+    --hash=sha256:80139a006a598e2db83fe6eaf7ac29c2a30cc5d10f255a89a9c6b9c04f81d67f \
+    --hash=sha256:811029a7cf397ed32441aa134475f7047826fba496047a6afd7bba1da7fc4ab7 \
+    --hash=sha256:8267de33ade8a496cb441eb86dd08c803043870a66b4f55aa44c02e1dbdbf93e \
+    --hash=sha256:90a6249a455b8ecdb207a9f5a5eb46e1c21f2173eacb5e1603def61ed4784303 \
+    --hash=sha256:920b91e9436c4d546862143313f48d4e6e0dd8510114ae0c5b194ff8c878a6c8 \
+    --hash=sha256:963e6cac79e3a4fc51c8517b8df03b3467550dd00d53e775059dce6e2fc0d0ca \
+    --hash=sha256:aab48b166f8aa8b086c93147ed6427376b8db2d783aff3f787c1c0819f6486bb \
+    --hash=sha256:b69fd9685a7aada6e236a50bb93b51bd4fc08d29d1029492e64823a69c015f46 \
+    --hash=sha256:c296044993dab62281176c07d0ca2b6e865044e38944d3f6e4ad661e222f4db8 \
+    --hash=sha256:c88c464b5b65859984386c698b43ccfe88e96814f80433c2d5fdf40dc4b68bcb \
+    --hash=sha256:dc4726af6ee00ee386293c34d86ba1fe18e0bd70a74612f1486da217d6a01249 \
+    --hash=sha256:e464c2ec0be69ab6d5792c1acf354001b34e201efa2bee60ff4f7ded0e23f6a8 \
+    --hash=sha256:e6bf602bb8a070524a19bac1cff2a10d62c71b09606f066251282870fa1466e5 \
+    --hash=sha256:f4ea1f94f17fce29600e1661f773048ee9ed90a9300f1226018987f7d5961019 \
+    --hash=sha256:fef009cdb37225b1f6259ddc18c3017cd1edddd85d57823f1c46c53503da41a1 \
+    --hash=sha256:ff4d81f5561f2382343dc922e533c017d52bc55125e50551c18034fffcdbd0cb
     # via -r tools/base/requirements.in
 charset-normalizer==3.4.6 \
     --hash=sha256:06a7e86163334edfc5d20fe104db92fcd666e5a5df0977cb5680a506fe26cc8e \
@@ -198,9 +203,9 @@ idna==3.11 \
     # via
     #   -r tools/base/requirements.in
     #   requests
-importlib-metadata==8.7.1 \
-    --hash=sha256:49fef1ae6440c182052f407c8d34a68f72efc36db9ca90dc0113398f2fdde8bb \
-    --hash=sha256:5a1f80bf1daa489495071efbb095d75a634cf28a8bc299581244063b53176151
+importlib-metadata==9.0.0 \
+    --hash=sha256:2d21d1cc5a017bd0559e36150c21c830ab1dc304dedd1b7ea85d20f45ef3edd7 \
+    --hash=sha256:a4f57ab599e6a2e3016d7595cfd72eb4661a5106e787a95bcc90c7105b831efc
     # via -r tools/base/requirements.in
 iniconfig==2.3.0 \
     --hash=sha256:c76315c77db068650d49c5b56314774a7804df16fee4402c1f19d6d15d8c4730 \
@@ -363,9 +368,7 @@ yapf==0.43.0 \
     --hash=sha256:00d3aa24bfedff9420b2e0d5d9f5ab6d9d4268e72afbf59bb3fa542781d5218e \
     --hash=sha256:224faffbc39c428cb095818cf6ef5511fdab6f7430a10783fdfb292ccf2852ca
     # via -r tools/base/requirements.in
-zipp==3.23.0 \
-    --hash=sha256:071652d6115ed432f5ce1d34c336c0adfd6a884660d1e9712a256d3d3bd4b14e \
-    --hash=sha256:a07157588a12518c9d4034df3fbbee09c814741a33ff63c05fa29d26a2404166
+zipp==3.18.1
     # via
     #   -r tools/base/requirements.in
     #   importlib-metadata

From 1745175d89ae9402164e87c921c4e2dd0828885c Mon Sep 17 00:00:00 2001
From: Elizabeth Byerly <ebyerly@google.com>
Date: Tue, 24 Mar 2026 19:59:42 -0400
Subject: [PATCH 2/2] Run formatter

Signed-off-by: Elizabeth Byerly <ebyerly@google.com>
---
 WORKSPACE | 2 --
 1 file changed, 2 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 0d33306ad..027c7be52 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -4,8 +4,6 @@ load("//bazel:repositories.bzl", "nighthawk_dependencies")
 
 nighthawk_dependencies()
 
-
-
 local_repository(
     name = "envoy_build_config",
     path = ".",