Skip to content

Commit

Permalink
Merge branch 'main' into sub_check
Browse files Browse the repository at this point in the history
* main: (151 commits)
  http3: fixing an upstream threading issue and bumping http3 upstream code back to alpha (envoyproxy#32640)
  rlqs: reset quota usage (envoyproxy#32569)
  proxy status: add more mapping to proxystatus (envoyproxy#32606)
  rlqs: add logging around token bucket (envoyproxy#32612)
  Logging: ENVOY_BUG include filter name. (envoyproxy#32663)
  mobile: Reenable the FilterIntegrationTest.AltSvcCachedH2Slow test (envoyproxy#32675)
  c++20 by default (envoyproxy#32585)
  Docs: Add diagram for histogram stat sink. (envoyproxy#32665)
  Fix null node for list of struct in payload_to_metadaata filter (envoyproxy#32309)
  metrics_service: populate histogram summary sample sum (envoyproxy#32666)
  build(deps): bump postgres from `0e564da` to `f58300a` in /examples/shared/postgres (envoyproxy#32632)
  build(deps): bump the examples-ext-authz group in /examples/ext_authz with 1 update (envoyproxy#32654)
  build(deps): bump distroless/base-nossl-debian12 from `28dc895` to `0e777c6` in /ci (envoyproxy#32652)
  Update QUICHE from 02047e04d to 3373df94b (envoyproxy#32650)
  ci/logging: Add failure detection (envoyproxy#32662)
  Change udpa renaming workaround to not compile the same archive twice (envoyproxy#32647)
  sockets: flipping graceful client socket creation failure (envoyproxy#32602)
  TcpAsyncClient: enhance reconnect robustness (envoyproxy#32578)
  owners: adding Fredy as an Enovy Mobile maintainer (envoyproxy#32638)
  ci: Add scheduled garbage collection (and fix retest) (envoyproxy#32639)
  ...
  • Loading branch information
mattjo committed Mar 5, 2024
2 parents 9b98228 + e28e0d6 commit ee0a3d0
Show file tree
Hide file tree
Showing 589 changed files with 12,385 additions and 3,881 deletions.
26 changes: 14 additions & 12 deletions .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ common --experimental_allow_tags_propagation
build:linux --copt=-fdebug-types-section
build:linux --copt=-fPIC
build:linux --copt=-Wno-deprecated-declarations
build:linux --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
build:linux --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
build:linux --cxxopt=-fsized-deallocation --host_cxxopt=-fsized-deallocation
build:linux --conlyopt=-fexceptions
build:linux --fission=dbg,opt
Expand Down Expand Up @@ -133,7 +133,7 @@ build:clang-asan --linkopt --rtlib=compiler-rt
build:clang-asan --linkopt --unwindlib=libgcc

# macOS
build:macos --cxxopt=-std=c++17 --host_cxxopt=-std=c++17
build:macos --cxxopt=-std=c++20 --host_cxxopt=-std=c++20
build:macos --action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
build:macos --host_action_env=PATH=/opt/homebrew/bin:/opt/local/bin:/usr/local/bin:/usr/bin:/bin
build:macos --define tcmalloc=disabled
Expand Down Expand Up @@ -194,7 +194,7 @@ build:libc++ --define force_libcpp=enabled

build:libc++20 --config=libc++
# gRPC has a lot of deprecated-enum-enum-conversion warning. Remove once it is addressed
build:libc++20 --cxxopt=-std=c++20 --copt=-Wno-error=deprecated-enum-enum-conversion
build:libc++20 --copt=-Wno-error=deprecated-enum-enum-conversion

# Optimize build for binary size reduction.
build:sizeopt -c opt --copt -Os
Expand Down Expand Up @@ -510,16 +510,18 @@ build:rbe-engflow --remote_timeout=3600s
build:rbe-engflow --bes_timeout=3600s
build:rbe-engflow --bes_upload_mode=fully_async

build:rbe-envoy-engflow --google_default_credentials=false
build:rbe-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com
build:cache-envoy-engflow --google_default_credentials=false
build:cache-envoy-engflow --remote_cache=grpcs://morganite.cluster.engflow.com
build:cache-envoy-engflow --remote_timeout=3600s
build:cache-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
build:cache-envoy-engflow --grpc_keepalive_time=30s
build:bes-envoy-engflow --bes_backend=grpcs://morganite.cluster.engflow.com/
build:bes-envoy-engflow --bes_results_url=https://morganite.cluster.engflow.com/invocation/
build:bes-envoy-engflow --bes_timeout=3600s
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 --bes_backend=grpcs://morganite.cluster.engflow.com/
build:rbe-envoy-engflow --bes_results_url=https://morganite.cluster.engflow.com/invocation/
build:rbe-envoy-engflow --credential_helper=*.engflow.com=%workspace%/bazel/engflow-bazel-credential-helper.sh
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:0ca52447572ee105a4730da5e76fe47c9c5a7c64@sha256:d736c58f06f36848e7966752cc7e01519cc1b5101a178d5c6634807e8ac3deab

#############################################################################
Expand Down
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* text=auto eol=lf

/generated_api_shadow/envoy/** linguist-generated=true
/generated_api_shadow/bazel/** linguist-generated=true
*.svg binary
Expand Down
1 change: 1 addition & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ run:
mobile-core:
paths:
- "**/*"
- "*"
mobile-format:
paths:
- .bazelrc
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
# - uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@actions-v0.2.27
# with:
# key: "${{ needs.env.outputs.build-image }}"
#
Expand All @@ -39,28 +39,28 @@ jobs:
docker:
runs-on: ubuntu-22.04
steps:
- uses: envoyproxy/toolshed/gh-actions/appauth@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.27
id: appauth
name: Appauth (mutex lock)
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@actions-v0.2.27
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@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
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@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/json/table@actions-v0.2.27
name: Summary
with:
json: ${{ steps.data.outputs.value }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_finish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
actions: read
contents: read
steps:
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
name: Incoming data
id: needs
with:
Expand Down Expand Up @@ -87,21 +87,21 @@ jobs:
summary: "Check has finished",
text: $text}}}}
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
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@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.27
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/checks@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checks@actions-v0.2.27
name: Update check
with:
action: update
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/_load.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ jobs:
# Handle any failure in triggering job
# Remove any `checks` we dont care about
# Prepare a check request
- uses: envoyproxy/toolshed/gh-actions/github/env/load@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/env/load@actions-v0.2.27
name: Load env
id: data
with:
Expand All @@ -102,21 +102,21 @@ jobs:
GH_TOKEN: ${{ github.token }}

# Update the check
- uses: envoyproxy/toolshed/gh-actions/appauth@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.27
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/checks@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checks@actions-v0.2.27
name: Update check
if: ${{ fromJSON(steps.data.outputs.data).data.check.action == 'RUN' }}
with:
action: update
checks: ${{ toJSON(fromJSON(steps.data.outputs.data).checks) }}
token: ${{ steps.appauth.outputs.token }}

- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
name: Print request summary
with:
input: |
Expand All @@ -136,7 +136,7 @@ jobs:
| $summary.summary as $summary
| "${{ inputs.template-request-summary }}"
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
id: request-output
name: Load request
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_load_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,18 @@ jobs:
request: ${{ steps.env.outputs.data }}
trusted: true
steps:
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/checkout@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checkout@actions-v0.2.27
id: checkout
name: Checkout Envoy repository
- name: Generate environment variables
uses: envoyproxy/toolshed/gh-actions/envoy/ci/env@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/envoy/ci/env@actions-v0.2.27
id: env
with:
branch-name: ${{ inputs.branch-name }}
Expand All @@ -86,7 +86,7 @@ jobs:

- name: Request summary
id: summary
uses: envoyproxy/toolshed/gh-actions/github/env/summary@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/github/env/summary@actions-v0.2.27
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_precheck_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ jobs:
ref: ${{ fromJSON(inputs.request).request.sha }}
persist-credentials: false
- name: Dependency Review
uses: actions/dependency-review-action@4901385134134e04cec5fbe5ddfe3b2c5bd5d976 # v4.0.0
uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4.1.3
10 changes: 5 additions & 5 deletions .github/workflows/_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ jobs:
env: ${{ steps.data.outputs.value }}
config: ${{ steps.config.outputs.config }}
steps:
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/checkout@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checkout@actions-v0.2.27
id: checkout
name: Checkout Envoy repository
with:
Expand All @@ -60,7 +60,7 @@ jobs:
# *ALL* variables collected should be treated as untrusted and should be sanitized before
# use
- name: Generate environment variables from commit
uses: envoyproxy/toolshed/gh-actions/envoy/ci/request@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/envoy/ci/request@actions-v0.2.27
id: env
with:
branch-name: ${{ steps.checkout.outputs.branch-name }}
Expand All @@ -71,7 +71,7 @@ jobs:
vars: ${{ toJSON(vars) }}
- name: Request summary
id: summary
uses: envoyproxy/toolshed/gh-actions/github/env/summary@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/github/env/summary@actions-v0.2.27
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand All @@ -87,7 +87,7 @@ jobs:
target-branch: ${{ fromJSON(steps.env.outputs.data).request.target-branch }}

- name: Environment data
uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
id: data
with:
input: |
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ on:
ERROR
error:
Error:
fail-match:
type: string
notice-match:
type: string
default: |
Expand Down Expand Up @@ -94,7 +96,7 @@ on:
summary-post:
type: string
default: |
- uses: envoyproxy/toolshed/gh-actions/envoy/run/summary@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/envoy/run/summary@actions-v0.2.27
with:
context: %{{ inputs.context }}
steps-pre:
Expand All @@ -116,6 +118,7 @@ on:
type: string
timeout-minutes:
type: number
default: 60
trusted:
type: boolean
required: true
Expand Down Expand Up @@ -155,15 +158,15 @@ jobs:
name: ${{ inputs.command }} ${{ inputs.target }}
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
id: started
name: Create timestamp
with:
options: -r
filter: |
now
# This controls which input vars are exposed to the run action (and related steps)
- uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
name: Context
id: context
with:
Expand All @@ -184,11 +187,11 @@ jobs:
| . * {$config, $check}
- if: ${{ inputs.cache-build-image }}
name: Restore Docker cache ${{ inputs.cache-build-image && format('({0})', inputs.cache-build-image) || '' }}
uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@actions-v0.2.27
with:
image_tag: ${{ inputs.cache-build-image }}

- uses: envoyproxy/toolshed/gh-actions/appauth@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.27
id: appauth
name: Appauth
if: ${{ inputs.trusted }}
Expand All @@ -199,7 +202,7 @@ jobs:
# - the workaround is to allow the token to be passed through.
token: ${{ github.token }}
token-ok: true
- uses: envoyproxy/toolshed/gh-actions/github/checkout@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checkout@actions-v0.2.27
id: checkout
name: Checkout Envoy repository
with:
Expand All @@ -216,15 +219,15 @@ jobs:
token: ${{ inputs.trusted && steps.appauth.outputs.token || github.token }}

# This is currently only use by mobile-docs and can be removed once they are updated to the newer website
- uses: envoyproxy/toolshed/gh-actions/github/checkout@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/checkout@actions-v0.2.27
id: checkout-extra
name: Checkout extra repository (for publishing)
if: ${{ inputs.checkout-extra }}
with:
config: ${{ inputs.checkout-extra }}
ssh-key: ${{ inputs.trusted && inputs.ssh-key-extra || '' }}

- uses: envoyproxy/toolshed/gh-actions/github/run@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/github/run@actions-v0.2.27
name: Run CI ${{ inputs.command }} ${{ inputs.target }}
with:
args: ${{ inputs.args != '--' && inputs.args || inputs.target }}
Expand All @@ -238,6 +241,7 @@ jobs:
downloads: ${{ inputs.downloads }}
entrypoint: ${{ inputs.entrypoint }}
error-match: ${{ inputs.error-match }}
fail-match: ${{ inputs.fail-match }}
notice-match: ${{ inputs.notice-match }}
output-path: ${{ inputs.output-path }}
report-pre: ${{ inputs.report-pre }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_stage_publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
export ENVOY_PUBLISH_DRY_RUN=${{ (fromJSON(inputs.request).request.version.dev || ! inputs.trusted) && 1 || '' }}
steps-pre: |
- id: url
uses: envoyproxy/toolshed/gh-actions/jq@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
uses: envoyproxy/toolshed/gh-actions/jq@actions-v0.2.27
with:
options: -Rr
input: >-
Expand All @@ -80,7 +80,7 @@ jobs:
end
| . as $bucket
| "https://storage.googleapis.com/\($bucket)/\($sha)/\($path)"
- uses: envoyproxy/toolshed/gh-actions/fetch@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/fetch@actions-v0.2.27
with:
url: %{{ steps.url.outputs.value }}
path: %{{ runner.temp }}/release.signed
Expand All @@ -98,12 +98,12 @@ jobs:
needs:
- publish
steps:
- uses: envoyproxy/toolshed/gh-actions/appauth@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/appauth@actions-v0.2.27
id: appauth
with:
app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
key: ${{ secrets.ENVOY_CI_SYNC_APP_KEY }}
- uses: envoyproxy/toolshed/gh-actions/dispatch@680d414be3f56cbb161dfdebebece85d81c3f686 # actions-v0.2.24
- uses: envoyproxy/toolshed/gh-actions/dispatch@actions-v0.2.27
with:
ref: main
repository: ${{ fromJSON(inputs.request).request.version.dev && 'envoyproxy/envoy-website' || 'envoyproxy/archive' }}
Expand Down
Loading

0 comments on commit ee0a3d0

Please sign in to comment.