Merge remote-tracking branch 'upstream/main' into fuzz_bug_65802

Signed-off-by: Adi Suissa-Peleg <adip@google.com>
adisuissa · Mar 21, 2024 · 1fd6f5c · 1fd6f5c
2 parents 2db7ed8 + a74ebbe
commit 1fd6f5c
Show file tree

Hide file tree

Showing 556 changed files with 12,527 additions and 5,120 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -359,7 +359,7 @@ build:compile-time-options --@envoy//source/extensions/filters/http/kill_request
 
 # Docker sandbox
 # NOTE: Update this from https://github.com/envoyproxy/envoy-build-tools/blob/main/toolchains/rbe_toolchains_config.bzl#L8
-build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:0ca52447572ee105a4730da5e76fe47c9c5a7c64@sha256:d736c58f06f36848e7966752cc7e01519cc1b5101a178d5c6634807e8ac3deab
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:f94a38f62220a2b017878b790b6ea98a0f6c5f9c@sha256:2dd96b6f43c08ccabd5f4747fce5854f5f96af509b32e5cf6493f136e9833649
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
@@ -523,7 +523,7 @@ build:bes-envoy-engflow --bes_upload_mode=fully_async
 build:rbe-envoy-engflow --config=cache-envoy-engflow
 build:rbe-envoy-engflow --config=bes-envoy-engflow
 build:rbe-envoy-engflow --remote_executor=grpcs://morganite.cluster.engflow.com
-build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:0ca52447572ee105a4730da5e76fe47c9c5a7c64@sha256:d736c58f06f36848e7966752cc7e01519cc1b5101a178d5c6634807e8ac3deab
+build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:f94a38f62220a2b017878b790b6ea98a0f6c5f9c@sha256:2dd96b6f43c08ccabd5f4747fce5854f5f96af509b32e5cf6493f136e9833649
 
 #############################################################################
 # debug: Various Bazel debugging flags

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:0ca52447572ee105a4730da5e76fe47c9c5a7c64@sha256:0434d2f6a65895a00f8936fba83b7ff14d21e149dc15c9ac25a31a6fa018234f
+FROM gcr.io/envoy-ci/envoy-build:f94a38f62220a2b017878b790b6ea98a0f6c5f9c@sha256:7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2
 
 ARG USERNAME=vscode
 ARG USER_UID=501

diff --git a/.github/config.yml b/.github/config.yml
@@ -2,11 +2,11 @@ agent-ubuntu: ubuntu-22.04
 build-image:
   # Authoritative configuration for build image/s
   repo: envoyproxy/envoy-build-ubuntu
-  sha: d736c58f06f36848e7966752cc7e01519cc1b5101a178d5c6634807e8ac3deab
-  mobile-sha: 13674edd989ada8b94257f410e38e5e8e4c6a0a9c2fdf8bda9261047a7f843e4
+  sha: 2dd96b6f43c08ccabd5f4747fce5854f5f96af509b32e5cf6493f136e9833649
+  mobile-sha: c9b6001d0c24170ae77b0ad39e1b0fcda49580c72a8578755dc65aec9be85be3
   # this is authoritative, but is not currently used in github ci
-  gcr-sha: 0434d2f6a65895a00f8936fba83b7ff14d21e149dc15c9ac25a31a6fa018234f
-  tag: 0ca52447572ee105a4730da5e76fe47c9c5a7c64
+  gcr-sha: 7adc40c09508f957624c4d2e0f5aeecb73a59207ee6ded53b107eac828c091b2
+  tag: f94a38f62220a2b017878b790b6ea98a0f6c5f9c
 
 config:
   envoy:
@@ -150,27 +150,8 @@ checks:
     - publish
     - verify
     required: true
-  windows:
-    name: Envoy/Windows
-    required: true
-    on-run:
-    - build-windows
 
 run:
-  build-windows:
-    paths:
-    - .bazelrc
-    - .bazelversion
-    - .github/config.yml
-    - api/**/*
-    - bazel/**/*
-    - ci/**/*
-    - configs/**/*
-    - contrib/**/*
-    - envoy/**/*
-    - source/**/*
-    - test/**/*
-    - VERSION.txt
   build-macos:
     paths:
     - .bazelrc
@@ -191,6 +172,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-android-all:
@@ -200,6 +182,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
     push: never
@@ -210,6 +193,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-asan:
@@ -219,6 +203,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-cc:
@@ -228,6 +213,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-compile-time-cc:
@@ -240,6 +226,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-coverage:
@@ -249,19 +236,22 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-core:
     paths:
     - "**/*"
     - "*"
+    - mobile/.bazelrc
   mobile-format:
     paths:
     - .bazelrc
     - .bazelversion
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-ios:
@@ -271,6 +261,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-ios-all:
@@ -280,6 +271,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
     push: never
@@ -290,6 +282,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-perf:
@@ -299,6 +292,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-release-validation:
@@ -308,6 +302,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   mobile-tsan:
@@ -317,6 +312,7 @@ run:
     - .github/config.yml
     - bazel/external/quiche.BUILD
     - bazel/repository_locations.bzl
+    - mobile/.bazelrc
     - mobile/**/*
     - tools/code_format/check_format.py
   precheck-deps:

diff --git a/.github/workflows/_precheck_deps.yml b/.github/workflows/_precheck_deps.yml
@@ -50,9 +50,9 @@ jobs:
     if: ${{ inputs.dependency-review }}
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633  # v4.1.2
       with:
         ref: ${{ fromJSON(inputs.request).request.sha }}
         persist-credentials: false
     - name: Dependency Review
-      uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce  # v4.1.3
+      uses: actions/dependency-review-action@0fa40c3c10055986a88de3baa0d6ec17c5a894b3  # v4.2.3
diff --git a/.github/workflows/codeql-daily.yml b/.github/workflows/codeql-daily.yml
@@ -27,7 +27,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633  # v4.1.2
 
     - name: Free disk space
       uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.2.27

diff --git a/.github/workflows/codeql-push.yml b/.github/workflows/codeql-push.yml
@@ -32,7 +32,7 @@ jobs:
     if: github.repository == 'envoyproxy/envoy'
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633  # v4.1.2
       with:
         fetch-depth: 2
 

diff --git a/.github/workflows/envoy-dependency.yml b/.github/workflows/envoy-dependency.yml
@@ -143,7 +143,7 @@ jobs:
           path: envoy
           fetch-depth: 0
         token: ${{ steps.appauth.outputs.token }}
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633  # v4.1.2
       name: Checkout Envoy build tools repository
       with:
         repository: envoyproxy/envoy-build-tools
@@ -235,7 +235,7 @@ jobs:
       issues: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11  # v4.1.1
+      uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633  # v4.1.2
     - name: Run dependency checker
       run: |
         TODAY_DATE=$(date -u -I"date")

diff --git a/.github/workflows/envoy-macos.yml b/.github/workflows/envoy-macos.yml
@@ -51,6 +51,7 @@ jobs:
       steps-post:
       steps-pre: ${{ matrix.steps-pre }}
       target: ${{ matrix.target }}
+      timeout-minutes: 90
       trusted: ${{ fromJSON(needs.load.outputs.trusted) }}
     strategy:
       fail-fast: false

diff --git a/.github/workflows/envoy-windows.yml b/.github/workflows/envoy-windows.yml