Skip to content

Commit df9bf74

Browse files
committed
Merge remote-tracking branch 'origin/master' into aws-lambda-streaming
2 parents f5a2877 + 22c96a2 commit df9bf74

File tree

533 files changed

+12863
-3861
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

533 files changed

+12863
-3861
lines changed

.bazelrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ common --color=yes
1414
common --curses=auto
1515

1616
build --experimental_ui_max_stdouterr_bytes=10485760
17+
# TODO: remove after bump to bazel >= 7
18+
build --experimental_cc_shared_library
1719

1820
build --show_progress_rate_limit=0
1921
build --show_timestamps

.github/labeler.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,16 @@ plugins/opentelemetry:
254254
- changed-files:
255255
- any-glob-to-any-file: kong/plugins/opentelemetry/**/*
256256

257+
plugins/standard-webhooks:
258+
- changed-files:
259+
- any-glob-to-any-file: kong/plugins/standard-webhooks/**/*
260+
257261
schema-change-noteworthy:
258262
- changed-files:
259-
- any-glob-to-any-file: ['kong/db/schema/**/*.lua', 'kong/**/schema.lua', 'kong/plugins/**/daos.lua', 'plugins-ee/**/daos.lua', 'plugins-ee/**/schema.lua', 'kong/db/dao/*.lua', 'kong/enterprise_edition/redis/init.lua']
263+
- any-glob-to-any-file: [
264+
'kong/db/schema/**/*.lua', 'kong/**/schema.lua', 'kong/plugins/**/daos.lua', 'plugins-ee/**/daos.lua', 'plugins-ee/**/schema.lua', 'kong/db/dao/*.lua', 'kong/enterprise_edition/redis/init.lua',
265+
'kong/llm/init.lua',
266+
]
260267

261268
build/bazel:
262269
- changed-files:

.github/workflows/backport-fail-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
result-encoding: string
4545

4646
- name: Send Slack Message
47-
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
47+
uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
4848
with:
4949
payload: ${{ steps.generate-payload.outputs.result }}
5050
env:

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Create backport pull requests
17-
uses: korthout/backport-action@1081c491020466732d9eb79496d44fb0cf807881 # v2.4.1
17+
uses: korthout/backport-action@52886ff43ef0184911d99c0a489f5c1307db8fc7 # v2.4.1
1818
id: backport
1919
with:
2020
github_token: ${{ secrets.PAT }}

.github/workflows/changelog-requirement.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Find changelog files
2323
id: changelog-list
24-
uses: tj-actions/changed-files@20576b4b9ed46d41e2d45a2256e5e2316dde6834 # 43.0.1
24+
uses: tj-actions/changed-files@0874344d6ebbaa00a27da73276ae7162fadcaf69 # 44.3.0
2525
with:
2626
files_yaml: |
2727
changelogs:

.github/workflows/label-schema.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ jobs:
1212
continue-on-error: true
1313
env:
1414
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_SCHEMA_CHANGE }}
15-
SLACK_FOOTER: ${{ github.event.pull_request.title }}
15+
SLACK_MESSAGE: ${{ github.event.pull_request.title }}
16+
SLACK_FOOTER: "<${{ github.server_url }}/${{ github.repository }}/pull/${{ github.event.pull_request.number }}>"

.github/workflows/release-and-tests-fail-bot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
result-encoding: string
7171

7272
- name: Send Slack Message
73-
uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
73+
uses: slackapi/slack-github-action@70cd7be8e40a46e8b0eced40b0de447bdb42f68e # v1.26.0
7474
with:
7575
payload: ${{ steps.generate-payload.outputs.result }}
7676
env:

.github/workflows/release.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
- name: Cache Git
134134
id: cache-git
135135
if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != ''
136-
uses: actions/cache@v4
136+
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3, DO NOT BUMP, v4 BREAKS ON CENTOS7 OR AMAZONLINUX2
137137
with:
138138
path: /usr/local/git
139139
key: ${{ matrix.label }}-git-2.41.0
@@ -194,7 +194,7 @@ jobs:
194194
- name: Cache Packages
195195
id: cache-deps
196196
if: env.GHA_CACHE == 'true'
197-
uses: actions/cache@v4
197+
uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3, DO NOT BUMP, v4 BREAKS ON CENTOS7 OR AMAZONLINUX2
198198
with:
199199
path: bazel-bin/pkg
200200
key: ${{ steps.cache-key.outputs.cache-key }}
@@ -204,7 +204,7 @@ jobs:
204204
grep -v '^#' .requirements >> $GITHUB_ENV
205205
206206
- name: Setup Bazel
207-
uses: bazelbuild/setup-bazelisk@b39c379c82683a5f25d34f0d062761f62693e0b2 # v3.0.0
207+
uses: bazelbuild/setup-bazelisk@95c9bf48d0c570bb3e28e57108f3450cd67c1a44 # v2.0.0
208208

209209
- name: Install Deb Dependencies
210210
if: matrix.package == 'deb' && steps.cache-deps.outputs.cache-hit != 'true'
@@ -597,14 +597,20 @@ jobs:
597597
username: ${{ secrets.GHA_DOCKERHUB_PUSH_USER }}
598598
password: ${{ secrets.GHA_KONG_ORG_DOCKERHUB_PUSH_TOKEN }}
599599

600+
- uses: actions/checkout@v3
601+
602+
- name: Get latest commit SHA on master
603+
run: |
604+
echo "latest_sha=$(git ls-remote origin -h refs/heads/${{ github.event.inputs.default_branch }} | cut -f1)" >> $GITHUB_ENV
605+
600606
- name: Docker meta
601607
id: meta
602608
uses: docker/metadata-action@v5
603609
with:
604610
images: ${{ needs.metadata.outputs.docker-repository }}
605611
sep-tags: " "
606612
tags: |
607-
type=raw,value=latest,enable=${{ matrix.label == 'ubuntu' }}
613+
type=raw,value=latest,enable=${{ matrix.label == 'ubuntu' && github.ref_name == github.event.inputs.default_branch && env.latest_sha == github.event.pull_request.head.sha }}
608614
type=match,enable=${{ github.event_name == 'workflow_dispatch' }},pattern=\d.\d,value=${{ github.event.inputs.version }}
609615
type=match,enable=${{ github.event_name == 'workflow_dispatch' && matrix.label == 'ubuntu' }},pattern=\d.\d,value=${{ github.event.inputs.version }},suffix=
610616
type=raw,enable=${{ github.event_name == 'workflow_dispatch' }},${{ github.event.inputs.version }}

.requirements

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,30 @@
11
KONG_PACKAGE_NAME=kong
22

33
OPENRESTY=1.25.3.1
4-
LUAROCKS=3.11.0
4+
OPENRESTY_SHA256=32ec1a253a5a13250355a075fe65b7d63ec45c560bbe213350f0992a57cd79df
5+
LUAROCKS=3.11.1
6+
LUAROCKS_SHA256=c3fb3d960dffb2b2fe9de7e3cb004dc4d0b34bb3d342578af84f84325c669102
57
OPENSSL=3.2.1
8+
OPENSSL_SHA256=83c7329fe52c850677d75e5d0b0ca245309b97e8ecbcfdc1dfdc4ab9fac35b39
69
PCRE=10.43
7-
LIBEXPAT=2.5.0
10+
PCRE_SHA256=889d16be5abb8d05400b33c25e151638b8d4bac0e2d9c76e9d6923118ae8a34e
11+
LIBEXPAT=2.6.2
12+
LIBEXPAT_SHA256=d4cf38d26e21a56654ffe4acd9cd5481164619626802328506a2869afab29ab3
813

914
# Note: git repositories can be loaded from local path if path is set as value
1015

11-
LUA_KONG_NGINX_MODULE=691ba795ced07364d491e8abbdf0c8c8d3778c14 # 0.10.0
16+
LUA_KONG_NGINX_MODULE=a8411f7cf4289049f0bd3e8e40088e7256389ed3 # 0.11.0
1217
LUA_RESTY_LMDB=7d2581cbe30cde18a8482d820c227ca0845c0ded # 1.4.2
13-
LUA_RESTY_EVENTS=8448a92cec36ac04ea522e78f6496ba03c9b1fd8 # 0.2.0
14-
LUA_RESTY_WEBSOCKET=60eafc3d7153bceb16e6327074e0afc3d94b1316 # 0.4.0
15-
ATC_ROUTER=1eeb0509a90494dc8618c5cd034ca4be231bb344 # 1.6.1
18+
LUA_RESTY_EVENTS=21d152d42ace72e1d51b782ca6827b851cd6a1d4 # 0.2.1
19+
LUA_RESTY_WEBSOCKET=966c69c39f03029b9b42ec0f8e55aaed7d6eebc0 # 0.4.0.1
20+
ATC_ROUTER=ffd11db657115769bf94f0c4f915f98300bc26b6 # 1.6.2
21+
SNAPPY=23b3286820105438c5dbb9bc22f1bb85c5812c8a # 1.2.0
1622

1723
KONG_MANAGER=nightly
18-
NGX_WASM_MODULE=3bd94e61c55415ccfb0f304fa51143a7d630d6ae
24+
NGX_WASM_MODULE=91d447ffd0e9bb08f11cc69d1aa9128ec36b4526
1925
WASMER=3.1.1
2026
WASMTIME=19.0.0
2127
V8=12.0.267.17
2228

23-
NGX_BROTLI=a71f9312c2deb28875acc7bacfdd5695a111aa53 # master branch of Jan 23, 2024
24-
BROTLI=ed738e842d2fbdf2d6459e39267a633c4a9b2f5d # master branch of brotli deps submodule of Jan 23, 2024
29+
NGX_BROTLI=a71f9312c2deb28875acc7bacfdd5695a111aa53 # master branch of Oct 9, 2023
30+
BROTLI=ed738e842d2fbdf2d6459e39267a633c4a9b2f5d # 1.1.0

BUILD.bazel

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,18 @@ config_setting(
123123
visibility = ["//visibility:public"],
124124
)
125125

126+
config_setting(
127+
name = "debug_linux_flag",
128+
constraint_values = [
129+
"@platforms//os:linux",
130+
],
131+
flag_values = {
132+
":debug": "true",
133+
},
134+
visibility = ["//visibility:public"],
135+
)
136+
137+
# --//:brotli=true
126138
bool_flag(
127139
name = "brotli",
128140
build_setting_default = True,
@@ -136,17 +148,6 @@ config_setting(
136148
visibility = ["//visibility:public"],
137149
)
138150

139-
config_setting(
140-
name = "debug_linux_flag",
141-
constraint_values = [
142-
"@platforms//os:linux",
143-
],
144-
flag_values = {
145-
":debug": "true",
146-
},
147-
visibility = ["//visibility:public"],
148-
)
149-
150151
# --//:licensing=false
151152
bool_flag(
152153
name = "licensing",
@@ -258,6 +259,20 @@ config_setting(
258259
visibility = ["//visibility:public"],
259260
)
260261

262+
# --//:skip_tools=false
263+
bool_flag(
264+
name = "skip_tools",
265+
build_setting_default = False,
266+
)
267+
268+
config_setting(
269+
name = "skip_tools_flag",
270+
flag_values = {
271+
":skip_tools": "true",
272+
},
273+
visibility = ["//visibility:public"],
274+
)
275+
261276
##### constraints, platforms and config_settings for cross-compile
262277

263278
constraint_setting(name = "cross_build_setting")

0 commit comments

Comments
 (0)