Skip to content

Commit 037f7e4

Browse files
CI Botms2008
authored andcommitted
chore(version) added Kong Enterprise version 3.10.0.7 artifacts
1 parent 3b6aa43 commit 037f7e4

File tree

1,577 files changed

+106941
-43467
lines changed

Some content is hidden

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

1,577 files changed

+106941
-43467
lines changed

kong-versions/3.10.0.4/kong/Makefile

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ OS := $(shell uname | awk '{print tolower($$0)}')
22
MACHINE := $(shell uname -m)
33

44
BAZEL_REMOTE_CACHE_OPT := $(if $(BAZEL_REMOTE_CACHE),--remote_cache=$(BAZEL_REMOTE_CACHE))
5-
LUAROCKS_OPTS ?= --server https://kong.github.io/kongrocks-dev/rocks/ OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) AVRO_INCDIR=$(AVRO_INCDIR) AVRO_LIBDIR=$(AVRO_LIBDIR)
6-
DEV_ROCKS = "busted 2.2.0" "busted-hjtest 0.0.5" "luacheck 1.2.0" "lua-llthreads2 0.1.6" "ldoc 1.5.0" "luacov 0.16.0" "lua-reqwest 0.1.2"
5+
LUAROCKS_OPTS ?= --server https://kong.github.io/kongrocks-dev/rocks/ OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)
6+
DEV_ROCKS = "busted 2.2.0" "busted-hjtest 0.0.5" "luacheck 1.2.0" "lua-llthreads2 0.1.6" "ldoc 1.5.0" "luacov 0.16.0" "lua-reqwest 0.1.1"
77
WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
88
BUSTED_ARGS ?= -v
99
TEST_CMD ?= bin/busted $(BUSTED_ARGS)
10-
PYTHON ?= python3
11-
TEST_PYTHON_REQUIREMENTS_FILE = "spec-ee/fixtures/mcp/requirements.txt"
1210

1311
BUILD_NAME ?= kong-dev
1412
BAZEL_ARGS ?= --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME) --//:skip_webui=true --//:skip_tools=true $(BAZEL_REMOTE_CACHE_OPT) --remote_upload_local_results=false
@@ -20,17 +18,13 @@ EXPAT_DIR ?= $(HOMEBREW_DIR)/opt/expat
2018
LIBXML2_DIR ?= $(HOMEBREW_DIR)/opt/libxml2
2119
GRPCURL_OS ?= osx
2220
YAML_DIR ?= $(shell brew --prefix)/opt/libyaml
23-
AVRO_LIBDIR ?= $(shell brew --prefix)/opt/avro/lib
24-
AVRO_INCDIR ?= $(shell brew --prefix)/opt/avro/include
2521
else
2622
LIBRARY_PREFIX ?= /usr
2723
OPENSSL_DIR ?= $(LIBRARY_PREFIX)
2824
EXPAT_DIR ?= $(LIBRARY_PREFIX)
2925
LIBXML2_DIR ?= $(LIBRARY_PREFIX)
3026
GRPCURL_OS ?= $(OS)
3127
YAML_DIR ?= /usr
32-
AVRO_LIBDIR ?= /usr/local/kong/lib
33-
AVRO_INCDIR ?= /usr/local/kong/include/avro
3428
endif
3529

3630
ifeq ($(MACHINE), aarch64)
@@ -52,12 +46,12 @@ endif
5246
.PHONY: install dev \
5347
sca test test-integration test-plugins test-all \
5448
pdk-phase-check functional-tests \
55-
fix-windows release test-logs
49+
fix-windows release wasm-test-filters test-logs
5650

5751
ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
5852
KONG_SOURCE_LOCATION ?= $(ROOT_DIR)
5953
GRPCURL_VERSION ?= 1.8.5
60-
BAZLISK_VERSION ?= 1.26.0
54+
BAZLISK_VERSION ?= 1.25.0
6155
H2CLIENT_VERSION ?= 0.4.4
6256
BAZEL := $(shell command -v bazel 2> /dev/null)
6357
VENV = /dev/null # backward compatibility when no venv is built
@@ -103,6 +97,9 @@ endif
10397
build-cache: check-bazel
10498
$(BAZEL) build //build:cacheable-targets $(BAZEL_REMOTE_CACHE_OPT)
10599

100+
wasm-test-filters:
101+
./scripts/build-wasm-test-filters.sh
102+
106103
build-kong: check-bazel
107104
$(BAZEL) build //build:kong $(BAZEL_ARGS)
108105

@@ -121,9 +118,6 @@ build-openresty: check-bazel
121118
$(BAZEL) build //build:dev-make-openresty --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME); \
122119
fi
123120

124-
build-static-assets: check-bazel
125-
$(BAZEL) build //build:install-static-assets --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME)
126-
127121
install-dev-rocks: build-venv
128122
@. $(VENV) ;\
129123
export PATH=$$PATH:$$HOME/.cargo/bin; \
@@ -137,18 +131,7 @@ install-dev-rocks: build-venv
137131
fi \
138132
done;
139133

140-
install-test-python-packages: build-venv
141-
@. $(VENV) ;\
142-
$(PYTHON) -m pip --version || { \
143-
echo "Python pip is not installed, install it first"; \
144-
bash ./scripts/install-pip.sh; \
145-
}; \
146-
for file in $(TEST_PYTHON_REQUIREMENTS_FILE); do \
147-
echo "Installing Python package from $$file"; \
148-
$(PYTHON) -m pip install --user --break-system-packages -r $$file; \
149-
done;
150-
151-
dev: install-rust-toolchain build-venv install-dev-rocks install-test-python-packages bin/grpcurl bin/h2client
134+
dev: install-rust-toolchain build-venv install-dev-rocks bin/grpcurl bin/h2client wasm-test-filters
152135

153136
build-release: check-bazel
154137
$(BAZEL) clean --expunge
@@ -270,6 +253,7 @@ dependencies: install-rust-toolchain bin/grpcurl bin/h2client
270253
done;
271254

272255
install-legacy:
273-
@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) AVRO_INCDIR=$(AVRO_INCDIR) AVRO_LIBDIR=$(AVRO_LIBDIR)
256+
@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)
274257

275258
dev-legacy: remove install-legacy dependencies
259+

kong-versions/3.10.0.4/kong/bin/kong

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ local skip_inject_cmds = {
4242
version = true,
4343
roar = true,
4444
check = true,
45+
stop = true,
46+
quit = true,
4547
health = true,
4648
hybrid = true,
4749
debug = true,

kong-versions/3.10.0.4/kong/spec-ee/fixtures/ai-rate-limiting-advanced/custom_nginx.template

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
pid pids/nginx.pid; # mandatory even for custom config templates
44

5+
> if wasm and wasm_dynamic_module then
6+
load_module $(wasm_dynamic_module);
7+
> end
8+
59
error_log ${{PROXY_ERROR_LOG}} ${{LOG_LEVEL}};
610

711
# injected nginx_main_* directives
@@ -27,6 +31,49 @@ events {
2731
> end
2832
}
2933

34+
> if wasm then
35+
wasm {
36+
> for _, el in ipairs(nginx_wasm_main_shm_kv_directives) do
37+
shm_kv $(el.name) $(el.value);
38+
> end
39+
40+
> for _, module in ipairs(wasm_modules_parsed) do
41+
module $(module.name) $(module.path);
42+
> end
43+
44+
> for _, el in ipairs(nginx_wasm_main_directives) do
45+
$(el.name) $(el.value);
46+
> end
47+
48+
> if #nginx_wasm_wasmtime_directives > 0 then
49+
wasmtime {
50+
> for _, el in ipairs(nginx_wasm_wasmtime_directives) do
51+
flag $(el.name) $(el.value);
52+
> end
53+
}
54+
> end -- wasmtime
55+
56+
> if #nginx_wasm_v8_directives > 0 then
57+
v8 {
58+
> for _, el in ipairs(nginx_wasm_v8_directives) do
59+
flag $(el.name) $(el.value);
60+
> end
61+
}
62+
> end -- v8
63+
64+
> if #nginx_wasm_wasmer_directives > 0 then
65+
wasmer {
66+
> for _, el in ipairs(nginx_wasm_wasmer_directives) do
67+
flag $(el.name) $(el.value);
68+
> end
69+
}
70+
> end -- wasmer
71+
72+
}
73+
> end
74+
75+
76+
3077
> if role == "control_plane" or #proxy_listeners > 0 or #admin_listeners > 0 or #status_listeners > 0 then
3178
http {
3279
include 'nginx-kong.conf';

kong-versions/3.10.0.4/kong/spec-ee/fixtures/dpop.lua

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ local NO_KEY_INTROSPECTION_DATA = {
107107

108108

109109
local function sign_dpop_header(req, nonce, key, pub_key, iat, jti, alg)
110-
alg = alg or "SHA512" -- luacheck: ignore
111-
-- workaround luacheck issue:
112-
-- 'value assigned to variable alg is unused'
110+
alg = alg or "SHA512"
113111
local jwt_token = jwa.sign(key.alg, key, {
114112
header = {
115113
typ = "dpop+jwt",

kong-versions/3.10.0.4/kong/spec-ee/fixtures/kafka/docker-compose.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ services:
1212
- ./zookeper_jaas.conf:/etc/kafka/zookeper_jaas.conf
1313

1414
add-kafka-users:
15-
image: confluentinc/cp-kafka:7.9.1
15+
image: confluentinc/cp-kafka:latest
1616
network_mode: "host"
1717
command: >
1818
/bin/bash -c "
@@ -27,7 +27,7 @@ services:
2727
test: nc -z localhost 9092
2828

2929
create-delegation-token:
30-
image: confluentinc/cp-kafka:7.9.1
30+
image: confluentinc/cp-kafka:latest
3131
network_mode: "host"
3232
user: root
3333
command: >
@@ -107,7 +107,7 @@ services:
107107
- ./broker-config/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
108108

109109
schema-registry:
110-
image: confluentinc/cp-schema-registry:7.9.1
110+
image: confluentinc/cp-schema-registry:latest
111111
hostname: schema-registry
112112
network_mode: "host"
113113
depends_on:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

kong-versions/3.10.0.4/kong/spec-ee/fixtures/kafka4/client.config

Lines changed: 0 additions & 7 deletions
This file was deleted.

kong-versions/3.10.0.4/kong/spec-ee/fixtures/kafka4/docker-compose4.yaml

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)