chore(version) added Kong Enterprise version 3.13.0.0 artifacts

Author: CI Bot

kong-versions/3.10.0.7/kong/Makefile

@@ -2,13 +2,11 @@ OS := $(shell uname | awk '{print tolower($$0)}')
 MACHINE := $(shell uname -m)
 
 BAZEL_REMOTE_CACHE_OPT := $(if $(BAZEL_REMOTE_CACHE),--remote_cache=$(BAZEL_REMOTE_CACHE))
-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)
-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"
+LUAROCKS_OPTS ?= --server https://kong.github.io/kongrocks-dev/rocks/ OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)
+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"
 WIN_SCRIPTS = "bin/busted" "bin/kong" "bin/kong-health"
 BUSTED_ARGS ?= -v
 TEST_CMD ?= bin/busted $(BUSTED_ARGS)
-PYTHON ?= python3
-TEST_PYTHON_REQUIREMENTS_FILE = "spec-ee/fixtures/mcp/requirements.txt"
 
 BUILD_NAME ?= kong-dev
 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
 LIBXML2_DIR ?= $(HOMEBREW_DIR)/opt/libxml2
 GRPCURL_OS ?= osx
 YAML_DIR ?= $(shell brew --prefix)/opt/libyaml
-AVRO_LIBDIR ?= $(shell brew --prefix)/opt/avro/lib
-AVRO_INCDIR ?= $(shell brew --prefix)/opt/avro/include
 else
 LIBRARY_PREFIX ?= /usr
 OPENSSL_DIR ?= $(LIBRARY_PREFIX)
 EXPAT_DIR ?= $(LIBRARY_PREFIX)
 LIBXML2_DIR ?= $(LIBRARY_PREFIX)
 GRPCURL_OS ?= $(OS)
 YAML_DIR ?= /usr
-AVRO_LIBDIR ?= /usr/local/kong/lib
-AVRO_INCDIR ?= /usr/local/kong/include/avro
 endif
 
 ifeq ($(MACHINE), aarch64)
@@ -52,12 +46,12 @@ endif
 .PHONY: install dev \
 	sca test test-integration test-plugins test-all \
 	pdk-phase-check functional-tests \
-	fix-windows release test-logs
+	fix-windows release wasm-test-filters test-logs
 
 ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 KONG_SOURCE_LOCATION ?= $(ROOT_DIR)
 GRPCURL_VERSION ?= 1.8.5
-BAZLISK_VERSION ?= 1.27.0
+BAZLISK_VERSION ?= 1.25.0
 H2CLIENT_VERSION ?= 0.4.4
 BAZEL := $(shell command -v bazel 2> /dev/null)
 VENV = /dev/null # backward compatibility when no venv is built
@@ -103,6 +97,9 @@ endif
 build-cache: check-bazel
 	$(BAZEL) build //build:cacheable-targets $(BAZEL_REMOTE_CACHE_OPT)
 
+wasm-test-filters:
+	./scripts/build-wasm-test-filters.sh
+
 build-kong: check-bazel
 	$(BAZEL) build //build:kong $(BAZEL_ARGS)
 
@@ -121,9 +118,6 @@ build-openresty: check-bazel
 		$(BAZEL) build //build:dev-make-openresty --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME); \
 	fi
 
-build-static-assets: check-bazel
-	$(BAZEL) build //build:install-static-assets --verbose_failures --action_env=BUILD_NAME=$(BUILD_NAME)
-
 install-dev-rocks: build-venv
 	@. $(VENV) ;\
 	export PATH=$$PATH:$$HOME/.cargo/bin; \
@@ -137,18 +131,7 @@ install-dev-rocks: build-venv
 	  fi \
 	done;
 
-install-test-python-packages: build-venv
-	@. $(VENV) ;\
-	$(PYTHON) -m pip --version || { \
-	  echo "Python pip is not installed, install it first"; \
-	  bash ./scripts/install-pip.sh; \
-	}; \
-	for file in $(TEST_PYTHON_REQUIREMENTS_FILE); do \
-	  echo "Installing Python package from $$file"; \
-	  $(PYTHON) -m pip install --user --break-system-packages -r $$file; \
-	done;
-
-dev: install-rust-toolchain build-venv install-dev-rocks install-test-python-packages bin/grpcurl bin/h2client
+dev: install-rust-toolchain build-venv install-dev-rocks bin/grpcurl bin/h2client wasm-test-filters
 
 build-release: check-bazel
 	$(BAZEL) clean --expunge
@@ -270,6 +253,7 @@ dependencies: install-rust-toolchain bin/grpcurl bin/h2client
 	done;
 
 install-legacy:
-	@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR) AVRO_INCDIR=$(AVRO_INCDIR) AVRO_LIBDIR=$(AVRO_LIBDIR)
+	@luarocks make OPENSSL_DIR=$(OPENSSL_DIR) YAML_DIR=$(YAML_DIR)
 
 dev-legacy: remove install-legacy dependencies
+

kong-versions/3.10.0.7/kong/bin/kong

@@ -42,6 +42,8 @@ local skip_inject_cmds = {
   version = true,
   roar = true,
   check = true,
+  stop = true,
+  quit = true,
   health = true,
   hybrid = true,
   debug = true,

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

@@ -2,6 +2,10 @@
 
 pid pids/nginx.pid; # mandatory even for custom config templates
 
+> if wasm and wasm_dynamic_module then
+load_module $(wasm_dynamic_module);
+> end
+
 error_log ${{PROXY_ERROR_LOG}} ${{LOG_LEVEL}};
 
 # injected nginx_main_* directives
@@ -27,6 +31,49 @@ events {
 > end
 }
 
+> if wasm then
+wasm {
+> for _, el in ipairs(nginx_wasm_main_shm_kv_directives) do
+  shm_kv $(el.name) $(el.value);
+> end
+
+> for _, module in ipairs(wasm_modules_parsed) do
+  module $(module.name) $(module.path);
+> end
+
+> for _, el in ipairs(nginx_wasm_main_directives) do
+  $(el.name) $(el.value);
+> end
+
+> if #nginx_wasm_wasmtime_directives > 0 then
+  wasmtime {
+> for _, el in ipairs(nginx_wasm_wasmtime_directives) do
+    flag $(el.name) $(el.value);
+> end
+  }
+> end -- wasmtime
+
+> if #nginx_wasm_v8_directives > 0 then
+  v8 {
+> for _, el in ipairs(nginx_wasm_v8_directives) do
+    flag $(el.name) $(el.value);
+> end
+  }
+> end -- v8
+
+> if #nginx_wasm_wasmer_directives > 0 then
+  wasmer {
+> for _, el in ipairs(nginx_wasm_wasmer_directives) do
+    flag $(el.name) $(el.value);
+> end
+  }
+> end -- wasmer
+
+}
+> end
+
+
+
 > if role == "control_plane" or #proxy_listeners > 0 or #admin_listeners > 0 or #status_listeners > 0 then
 http {
   include 'nginx-kong.conf';

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

@@ -107,9 +107,7 @@ local NO_KEY_INTROSPECTION_DATA = {
 
 
 local function sign_dpop_header(req, nonce, key, pub_key, iat, jti, alg)
-  alg = alg or "SHA512" -- luacheck: ignore
-                        -- workaround luacheck issue:
-                        -- 'value assigned to variable alg is unused'
+  alg = alg or "SHA512"
   local jwt_token = jwa.sign(key.alg, key, {
     header = {
       typ = "dpop+jwt",

kong-versions/3.10.0.7/kong/spec-ee/fixtures/kafka/broker-config/kafka_server_jaas.conf

@@ -2,32 +2,13 @@ KafkaServer {
     org.apache.kafka.common.security.plain.PlainLoginModule required
     username="admin"
     password="admin-secret"
-    user_admin="admin-secret"
-    user_alice="alice-secret"
-    user_client="client-password"
-    user_client-sha512="client-password";
-    org.apache.kafka.common.security.scram.ScramLoginModule required
-    username="admin"
-    password="admin-secret"
-    user_admin="admin-secret"
-    user_alice="alice-secret"
-    user_client="client-password"
-    user_client-sha512="client-password";
+    user_admin="admin-secret";
 };
 
 Client {
-  org.apache.kafka.common.security.plain.PlainLoginModule required
-  username="admin"
-  password="admin-secret"
-  user_admin="admin-secret"
-  user_alice="alice-secret"
-  user_client="client-password"
-  user_client-sha512="client-password";
   org.apache.kafka.common.security.scram.ScramLoginModule required
   username="admin"
   password="admin-secret"
   user_admin="admin-secret"
-  user_alice="alice-secret"
-  user_client="client-password"
-  user_client-sha512="client-password";
+  user_alice="alice-secret";
 };

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

@@ -7,9 +7,9 @@ services:
     environment:
       ZOOKEEPER_CLIENT_PORT: 2181
       ZOOKEEPER_TICK_TIME: 2000
-      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/zookeeper_jaas.conf -Dzookeeper.admin.serverPort=28080"
+      KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/zookeper_jaas.conf"
     volumes:
-      - ./zookeper_jaas.conf:/etc/kafka/zookeeper_jaas.conf
+      - ./zookeper_jaas.conf:/etc/kafka/zookeper_jaas.conf
 
   add-kafka-users:
     image: confluentinc/cp-kafka:7.9.1
@@ -57,9 +57,9 @@ services:
     environment:
       KAFKA_BROKER_ID: 1
       KAFKA_ZOOKEEPER_CONNECT: localhost:2181
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,SSL:SSL,SASL_SSL:SASL_SSL,SASL_PLAINTEXT:SASL_PLAINTEXT,SSLGOODCERT:SSL,SSLBADCERT:SSL
-      KAFKA_LISTENERS:  SASL_SSL://localhost:9093,PLAINTEXT_HOST://localhost:9092,PLAINTEXT://localhost:29092,SSL://localhost:29093,SASL_PLAINTEXT://localhost:19093,SSLGOODCERT://localhost:29094,SSLBADCERT://localhost:29095
-      KAFKA_ADVERTISED_LISTENERS: SASL_SSL://localhost:9093,PLAINTEXT_HOST://localhost:9092,PLAINTEXT://localhost:29092,SSL://localhost:29093,SASL_PLAINTEXT://localhost:19093,SSLGOODCERT://localhost:29094,SSLBADCERT://localhost:29095
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,SSL:SSL,SASL_SSL:SASL_SSL,SASL_PLAINTEXT:SASL_PLAINTEXT
+      KAFKA_LISTENERS:  SASL_SSL://localhost:9093,PLAINTEXT_HOST://localhost:9092,PLAINTEXT://localhost:29092,SSL://localhost:29093,SASL_PLAINTEXT://localhost:19093
+      KAFKA_ADVERTISED_LISTENERS: SASL_SSL://localhost:9093,PLAINTEXT_HOST://localhost:9092,PLAINTEXT://localhost:29092,SSL://localhost:29093,SASL_PLAINTEXT://localhost:19093
       KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
       KAFKA_TRANSACTION_STATE_LOG_MIN_ISR: 1
       KAFKA_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: 1
@@ -99,40 +99,9 @@ services:
       KAFKA_OPTS: "-Djavax.net.debug=all -Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf"
 
       KAFKA_AUTO_CREATE_TOPICS_ENABLE: "true"
-
-
-
-
-      # for SSLGOODCERT, we have a cert signed by the kong test fixture CA
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_TRUSTSTORE_FILENAME: truststore2/kafka.truststore.jks
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_KEYSTORE_FILENAME: keystore2/kafka.keystore.jks
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_KEYSTORE_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_TRUSTSTORE_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_KEY_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_CLIENT_AUTH: none
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/keystore2/kafka.keystore.jks
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_TRUSTSTORE_LOCATION: /etc/kafka/secrets/truststore2/kafka.truststore.jks
-      KAFKA_LISTENER_NAME_SSLGOODCERT_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: 'https'
-
-      # for SSLBADCERT, we have a self-signed, untrusted cert
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_TRUSTSTORE_FILENAME: truststore3/kafka.truststore.jks
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_KEYSTORE_FILENAME: keystore3/kafka.keystore.jks
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_KEYSTORE_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_TRUSTSTORE_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_KEY_CREDENTIALS: ssl_key_credentials
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_CLIENT_AUTH: none
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_KEYSTORE_LOCATION: /etc/kafka/secrets/keystore3/kafka.keystore.jks
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_TRUSTSTORE_LOCATION: /etc/kafka/secrets/truststore3/kafka.truststore.jks
-      KAFKA_LISTENER_NAME_SSLBADCERT_SSL_ENDPOINT_IDENTIFICATION_ALGORITHM: 'https'
-
-
     volumes:
       - ./truststore:/etc/kafka/secrets/truststore
       - ./keystore:/etc/kafka/secrets/keystore
-      - ./truststore2:/etc/kafka/secrets/truststore2
-      - ./keystore2:/etc/kafka/secrets/keystore2
-      - ./truststore3:/etc/kafka/secrets/truststore3
-      - ./keystore3:/etc/kafka/secrets/keystore3
       - ./credentials:/etc/kafka/secrets/
       - ./client.config:/etc/kafka/client.config
       - ./broker-config/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
@@ -148,17 +117,6 @@ services:
       SCHEMA_REGISTRY_KAFKASTORE_BOOTSTRAP_SERVERS: localhost:9092
       SCHEMA_REGISTRY_LISTENERS: http://0.0.0.0:8081
       SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL: localhost:2181
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: schema_registry
-
-  schema-registry-oauth2:
-    extends: schema-registry
-    environment:
-      SCHEMA_REGISTRY_LISTENERS: http://0.0.0.0:8082
-      SCHEMA_REGISTRY_KAFKASTORE_TOPIC: schema_registry_oauth2
-      SCHEMA_REGISTRY_REST_SERVLET_INITIALIZOR_CLASSES: io.confluent.common.security.jetty.initializer.AuthenticationHandler
-      SCHEMA_REGISTRY_OAUTHBEARER_JWKS_ENDPOINT_URL: http://localhost:18080/realms/test/protocol/openid-connect/certs
-      SCHEMA_REGISTRY_OAUTHBEARER_EXPECTED_ISSUER: http://localhost:18080/realms/test
-      SCHEMA_REGISTRY_OAUTHBEARER_EXPECTED_AUDIENCE: account
 
   kong:
     image: kong/kong:3.8

kong-versions/3.10.0.7/kong/spec-ee/fixtures/kafka/kafka-generate-ssl-automatic.sh

@@ -64,13 +64,9 @@ trust_store_private_key_file=""
   echo "First, the private key."
   echo
 
-  # openssl req -new -x509 -keyout $TRUSTSTORE_WORKING_DIRECTORY/ca-key \
-  #   -out $TRUSTSTORE_WORKING_DIRECTORY/ca-cert -days $VALIDITY_IN_DAYS -nodes \
-  #   -subj "/C=$COUNTRY/ST=$STATE/L=$LOCATION/O=$OU/CN=$CN"
-
-  # use kong fixtures cert and key
-  cp ../../../spec/fixtures/kong_spec.crt $TRUSTSTORE_WORKING_DIRECTORY/ca-cert
-  cp ../../../spec/fixtures/kong_spec.key $TRUSTSTORE_WORKING_DIRECTORY/ca-key
+  openssl req -new -x509 -keyout $TRUSTSTORE_WORKING_DIRECTORY/ca-key \
+    -out $TRUSTSTORE_WORKING_DIRECTORY/ca-cert -days $VALIDITY_IN_DAYS -nodes \
+    -subj "/C=$COUNTRY/ST=$STATE/L=$LOCATION/O=$OU/CN=$CN"
 
   trust_store_private_key_file="$TRUSTSTORE_WORKING_DIRECTORY/ca-key"