Skip to content

Commit

Permalink
Merge branch 'main' into hqin/fix_http_status_in_grpc_bridge
Browse files Browse the repository at this point in the history
Signed-off-by: Henry Qin <[email protected]>
  • Loading branch information
hq6 committed Jan 16, 2024
2 parents eee144f + 5eaffad commit 1ee6391
Show file tree
Hide file tree
Showing 219 changed files with 10,300 additions and 830 deletions.
9 changes: 8 additions & 1 deletion .azure-pipelines/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ parameters:
displayName: "CI target"
type: string
default: release
- name: artifactName
displayName: "Artifact name"
type: string
default: ""
- name: artifactSuffix
displayName: "Suffix of artifact"
type: string
Expand Down Expand Up @@ -339,6 +343,9 @@ steps:
- task: PublishBuildArtifacts@1
inputs:
pathtoPublish: "$(Build.StagingDirectory)/envoy"
artifactName: ${{ parameters.ciTarget }}
${{ if eq(parameters.artifactName, '') }}:
artifactName: ${{ parameters.ciTarget }}
${{ if ne(parameters.artifactName, '') }}:
artifactName: ${{ parameters.artifactName }}
timeoutInMinutes: 10
condition: eq(${{ parameters.publishEnvoy }}, 'true')
1 change: 1 addition & 0 deletions .azure-pipelines/stage/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
name: target
- template: ../ci.yml
parameters:
artifactName: release
managedAgent: ${{ parameters.managedAgent }}
ciTarget: $(target.value)
cacheName: "release"
Expand Down
2 changes: 2 additions & 0 deletions .github/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ run:
- examples/**/*
- source/**/*
- tools/**/*
- VERSION.txt
verify:
paths:
- .bazelrc
Expand All @@ -355,6 +356,7 @@ run:
- examples/**/*
- source/**/*
- tools/**/*
- VERSION.txt
push: paths

tables:
Expand Down
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,3 +392,9 @@ updates:
schedule:
interval: daily
time: "06:00"

- package-ecosystem: "npm"
directory: "/examples/single-page-app/ui"
schedule:
interval: daily
time: "06:00"
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
# - uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
# 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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/appauth@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: appauth
name: Appauth (mutex lock)
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/docker/cache/prime@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/json/table@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/appauth@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/checks@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checks@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/env/load@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/appauth@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
name: Appauth
id: appauth
with:
app_id: ${{ secrets.app-id }}
key: ${{ secrets.app-key }}
- uses: envoyproxy/toolshed/gh-actions/github/checks@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checks@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/checkout@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checkout@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: checkout
name: Checkout Envoy repository
- name: Generate environment variables
uses: envoyproxy/toolshed/gh-actions/envoy/ci/env@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/envoy/ci/env@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/github/env/summary@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
actor: ${{ toJSON(fromJSON(steps.env.outputs.data).request.actor) }}
base-sha: ${{ fromJSON(steps.env.outputs.data).request.base-sha }}
Expand Down
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: started
name: Create timestamp
with:
options: -r
filter: |
now
- uses: envoyproxy/toolshed/gh-actions/github/checkout@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checkout@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/envoy/ci/request@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/github/env/summary@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: data
with:
input: |
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/_run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ on:
summary-post:
type: string
default: |
- uses: envoyproxy/toolshed/gh-actions/envoy/run/summary@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/envoy/run/summary@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
context: %{{ inputs.context }}
steps-pre:
Expand Down Expand Up @@ -155,15 +155,15 @@ jobs:
name: ${{ inputs.command }} ${{ inputs.target }}
timeout-minutes: ${{ inputs.timeout-minutes }}
steps:
- uses: envoyproxy/toolshed/gh-actions/jq@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
name: Context
id: context
with:
Expand All @@ -184,11 +184,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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/docker/cache/restore@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
image_tag: ${{ inputs.cache-build-image }}

- uses: envoyproxy/toolshed/gh-actions/appauth@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/appauth@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: appauth
name: Appauth
if: ${{ inputs.trusted }}
Expand All @@ -199,7 +199,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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checkout@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: checkout
name: Checkout Envoy repository
with:
Expand All @@ -216,15 +216,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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/checkout@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/github/run@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
name: Run CI ${{ inputs.command }} ${{ inputs.target }}
with:
args: ${{ inputs.args != '--' && inputs.args || inputs.target }}
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
warning-match: ${{ inputs.warning-match }}
working-directory: ${{ inputs.working-directory }}
env:
GITHUB_TOKEN: ${{ steps.checkout.outputs.token && steps.checkout.outputs.token || secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ inputs.trusted && steps.appauth.outputs.token || github.token }}
ENVOY_DOCKER_BUILD_DIR: ${{ runner.temp }}
ENVOY_RBE: ${{ inputs.rbe != 'false' && 1 || '' }}
RBE_KEY: ${{ secrets.rbe-key }}
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/fetch@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
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@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/appauth@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
id: appauth
with:
app_id: ${{ secrets.ENVOY_CI_SYNC_APP_ID }}
key: ${{ secrets.ENVOY_CI_SYNC_APP_KEY }}
- uses: envoyproxy/toolshed/gh-actions/dispatch@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/dispatch@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
ref: main
repository: ${{ fromJSON(inputs.request).request.version.dev && 'envoyproxy/envoy-website' || 'envoyproxy/archive' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/_stage_verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
rbe: false
steps-pre: |
- id: url
uses: envoyproxy/toolshed/gh-actions/jq@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
uses: envoyproxy/toolshed/gh-actions/jq@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
options: -Rr
input: >-
Expand All @@ -66,15 +66,15 @@ jobs:
end
| . as $bucket
| "https://storage.googleapis.com/\($bucket)/\($sha)"
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
url: %{{ steps.url.outputs.value }}/docker/envoy.tar
variant: dev
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
url: %{{ steps.url.outputs.value }}/docker/envoy-contrib.tar
variant: contrib-dev
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@6b3ddd1e42c252d68fb98973760c0ee1943c9c21 # actions-v0.2.20
- uses: envoyproxy/toolshed/gh-actions/docker/fetch@2b4b266dbf6e410f2e8a05abf0dcd8ad13e6ecac # actions-v0.2.23
with:
url: %{{ steps.url.outputs.value }}/docker/envoy-google-vrp.tar
variant: google-vrp-dev
Expand Down
Loading

0 comments on commit 1ee6391

Please sign in to comment.