Merge branch 'main' into coverage2

Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
alyssawilk · Jan 4, 2024 · 5675b08 · 5675b08
2 parents a734d3c + 9ca49ce
commit 5675b08
Show file tree

Hide file tree

Showing 473 changed files with 9,484 additions and 3,147 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -357,7 +357,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:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669
+build:docker-sandbox --experimental_docker_image=envoyproxy/envoy-build-ubuntu:fd9ec000fdd72d5c5e4e4ef16db4f9103058779e@sha256:1386a26f687826850ba488d66a6cd5337c5941b3b8793d08cfa6f9df12aa2fcf
 build:docker-sandbox --spawn_strategy=docker
 build:docker-sandbox --strategy=Javac=docker
 build:docker-sandbox --strategy=Closure=docker
@@ -518,7 +518,7 @@ build:rbe-envoy-engflow --grpc_keepalive_time=30s
 build:rbe-envoy-engflow --remote_timeout=3600s
 build:rbe-envoy-engflow --bes_timeout=3600s
 build:rbe-envoy-engflow --bes_upload_mode=fully_async
-build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669
+build:rbe-envoy-engflow --remote_default_exec_properties=container-image=docker://docker.io/envoyproxy/envoy-build-ubuntu:fd9ec000fdd72d5c5e4e4ef16db4f9103058779e@sha256:1386a26f687826850ba488d66a6cd5337c5941b3b8793d08cfa6f9df12aa2fcf
 
 #############################################################################
 # debug: Various Bazel debugging flags

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM gcr.io/envoy-ci/envoy-build:6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c@sha256:56466807485ba97d3ae79b4fa54cf9723bd9eb327783917d4bdc736483e5d72a
+FROM gcr.io/envoy-ci/envoy-build:fd9ec000fdd72d5c5e4e4ef16db4f9103058779e@sha256:b0c0e07c97337fdd56423ddd6749a4250adaea9f66f85763a8d9cec36162c972
 
 ARG USERNAME=vscode
 ARG USER_UID=501

diff --git a/.gitattributes b/.gitattributes
@@ -4,3 +4,6 @@
 /test/extensions/transport_sockets/tls/test_data/aes_128_key binary
 /test/extensions/transport_sockets/tls/test_data/ticket_key_* binary
 /test/**/*_corpus/* linguist-generated=true
+requirements.txt binary
+package.lock binary
+yarn.lock binary
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: d117d6139f3af1eede6bb1606ad05ffccb766eef3262b336dd31bcf02a81a669
-  mobile-sha: 82a79f368aa7da9a3ed904352deb24e6e52c5eae156fdc5ca2fb3fca6650ed6d
+  sha: 1386a26f687826850ba488d66a6cd5337c5941b3b8793d08cfa6f9df12aa2fcf
+  mobile-sha: 1db9bac6578115179fe686cd0e58ee340e2cb3737d19d9136a264d5d94351961
   # this is authoritative, but is not currently used in github ci
-  gcr-sha: 56466807485ba97d3ae79b4fa54cf9723bd9eb327783917d4bdc736483e5d72a
-  tag: 6eba113ee1a0ef8e4f71830e90b6aedbbeb7360c
+  gcr-sha: b0c0e07c97337fdd56423ddd6749a4250adaea9f66f85763a8d9cec36162c972
+  tag: fd9ec000fdd72d5c5e4e4ef16db4f9103058779e
 
 config:
   envoy:
@@ -325,6 +325,8 @@ run:
     - .bazelversion
     - .github/config.yml
     - .github/dependabot.yml
+    - bazel/BUILD
+    - tools/dependency/*
     - "**/*.bzl"
     - "**/requirements.txt"
     - "**/go.mod"

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,24 +11,40 @@ updates:
 
 - package-ecosystem: "pip"
   directory: "/examples/grpc-bridge/client"
+  groups:
+    examples-grpc-bridge:
+      patterns:
+      - "*"
   schedule:
     interval: "daily"
     time: "06:00"
 
 - package-ecosystem: "pip"
   directory: "/examples/cache"
+  groups:
+    examples-cache:
+      patterns:
+      - "*"
   schedule:
     interval: "daily"
     time: "06:00"
 
 - package-ecosystem: "pip"
   directory: "/examples/shared/python/aiohttp"
+  groups:
+    examples-shared-python:
+      patterns:
+      - "*"
   schedule:
     interval: "daily"
     time: "06:00"
 
 - package-ecosystem: "pip"
   directory: "/examples/shared/python/postgres"
+  groups:
+    examples-postgres:
+      patterns:
+      - "*"
   schedule:
     interval: "daily"
     time: "06:00"
@@ -54,6 +70,10 @@ updates:
 
 - package-ecosystem: "docker"
   directory: "/examples/ext_authz"
+  groups:
+    examples-ext-authz:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
@@ -66,24 +86,40 @@ updates:
 
 - package-ecosystem: "docker"
   directory: "/examples/golang-network"
+  groups:
+    examples-golang-network:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "docker"
   directory: "/examples/grpc-bridge"
+  groups:
+    examples-grpc-bridge:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "docker"
   directory: "/examples/kafka"
+  groups:
+    examples-kafka:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "docker"
   directory: "/examples/local_ratelimit"
+  groups:
+    examples-local-ratelimit:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
@@ -193,54 +229,90 @@ updates:
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/basic"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/dummy"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/echo"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/metric"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/passthrough"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/access_log"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/action"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/buffer"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/contrib/golang/filters/http/test/test_data/routeconfig"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
@@ -252,43 +324,71 @@ updates:
     time: "06:00"
 
 - package-ecosystem: "gomod"
-  directory: "/contrib/golang/router/cluster_specifier/test/test_data/simple"
+  directory: "/contrib/golang/filters/network/test/test_data"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
-  directory: "/contrib/golang/filters/network/test/test_data"
+  directory: "/contrib/golang/router/cluster_specifier/test/test_data/simple"
+  groups:
+    contrib-golang:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/examples/ext_authz/auth/grpc-service"
+  groups:
+    examples-ext-authz:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/examples/load-reporting-service"
+  groups:
+    examples-load-reporting:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/examples/grpc-bridge/server"
+  groups:
+    examples-grpc-bridge:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/examples/golang-http/simple"
+  groups:
+    examples-golang-http:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
 
 - package-ecosystem: "gomod"
   directory: "/examples/golang-network/simple"
+  groups:
+    examples-golang-network:
+      patterns:
+      - "*"
   schedule:
     interval: daily
     time: "06:00"
diff --git a/.github/workflows/_cache.yml b/.github/workflows/_cache.yml
@@ -29,7 +29,7 @@ on:
 # For a job that does, you can restore with something like:
 #
 #    steps:
-#    - uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@actions-v0.0.5
+#    - uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
 #      with:
 #        key: "${{ needs.env.outputs.build-image }}"
 #
@@ -39,28 +39,28 @@ jobs:
   docker:
     runs-on: ubuntu-22.04
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/appauth@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       id: appauth
       name: Appauth (mutex lock)
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       id: docker
       name: Prime Docker cache (${{ inputs.image-tag }})
       with:
         image-tag: ${{ inputs.image-tag }}
         lock-token: ${{ steps.appauth.outputs.token }}
         lock-repository: ${{ inputs.lock-repository }}
-    - uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/jq@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       id: data
       name: Cache data
       with:
         input-format: yaml
         input: |
           cached: ${{ steps.docker.outputs.cached }}
           key: ${{ inputs.image-tag }}
-    - uses: envoyproxy/toolshed/gh-actions/json/table@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/json/table@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       name: Summary
       with:
         json: ${{ steps.data.outputs.value }}

diff --git a/.github/workflows/_finish.yml b/.github/workflows/_finish.yml
@@ -36,7 +36,7 @@ jobs:
       actions: read
       contents: read
     steps:
-    - uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/jq@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       name: Incoming data
       id: needs
       with:
@@ -87,21 +87,21 @@ jobs:
                    summary: "Check has finished",
                    text: $text}}}}
 
-    - uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/jq@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       name: Print summary
       with:
         input: ${{ toJSON(steps.needs.outputs.value).summary-title }}
         filter: |
           "## \(.)"
         options: -Rr
         output-path: GITHUB_STEP_SUMMARY
-    - uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/appauth@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       name: Appauth
       id: appauth
       with:
         app_id: ${{ secrets.app-id }}
         key: ${{ secrets.app-key }}
-    - uses: envoyproxy/toolshed/gh-actions/github/checks@actions-v0.2.17
+    - uses: envoyproxy/toolshed/gh-actions/github/checks@6b3ddd1e42c252d68fb98973760c0ee1943c9c21  # actions-v0.2.20
       name: Update check
       with:
         action: update