You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sh...@apache.org on 2024/08/02 10:43:41 UTC
(apisix) 01/01: Merge branch 'master' of github.com:apache/apisix into release3.9.2
This is an automated email from the ASF dual-hosted git repository.
shreemaanabhishek pushed a commit to branch release3.9.2
in repository https://gitbox.apache.org/repos/asf/apisix.git
commit e34e5cf3f7eed05b7e9d26610a121ef5f173c473
Merge: a6c2572d2 8728863c8
Author: Abhishek Choudhary <sh...@gmail.com>
AuthorDate: Fri Aug 2 16:28:03 2024 +0545
Merge branch 'master' of github.com:apache/apisix into release3.9.2
.asf.yaml | 2 +-
.github/workflows/centos7-ci.yml | 181 -----
.github/workflows/chaos.yml.disabled | 88 ---
.github/workflows/fips.yml | 136 ----
.github/workflows/fuzzing-ci.yaml | 86 ---
.github/workflows/license-checker.yml | 2 +-
.github/workflows/source-install.yml | 30 +-
.requirements | 2 +-
Makefile | 16 +-
README.md | 21 +-
apisix-master-0.rockspec | 8 +-
apisix/admin/init.lua | 4 +-
apisix/admin/resource.lua | 2 +
apisix/cli/config.lua | 364 +++++++++
apisix/cli/file.lua | 31 +-
apisix/cli/ops.lua | 9 +-
apisix/consumer.lua | 3 +-
apisix/core/config_etcd.lua | 45 +-
apisix/core/config_yaml.lua | 4 +-
apisix/core/env.lua | 1 +
apisix/core/grpc.lua | 27 -
apisix/core/id.lua | 79 +-
apisix/core/pubsub.lua | 12 +-
apisix/core/request.lua | 15 +-
apisix/core/response.lua | 16 +-
apisix/core/utils.lua | 84 +++
apisix/debug.lua | 4 +-
apisix/discovery/kubernetes/init.lua | 42 ++
apisix/init.lua | 7 -
apisix/plugin.lua | 15 +-
apisix/plugins/authz-casdoor.lua | 2 +
apisix/plugins/authz-keycloak.lua | 7 +-
apisix/plugins/brotli.lua | 3 +-
apisix/plugins/cas-auth.lua | 2 +
apisix/plugins/clickhouse-logger.lua | 4 +
apisix/plugins/cors.lua | 12 +-
apisix/plugins/datadog.lua | 4 +-
apisix/plugins/elasticsearch-logger.lua | 4 +
apisix/plugins/error-log-logger.lua | 5 +
apisix/plugins/forward-auth.lua | 4 +
apisix/plugins/http-logger.lua | 4 +
apisix/plugins/jwe-decrypt.lua | 30 +-
apisix/plugins/kafka-logger.lua | 30 +
apisix/plugins/key-auth.lua | 2 +-
apisix/plugins/ldap-auth.lua | 1 +
apisix/plugins/limit-count.lua | 2 +-
apisix/plugins/loki-logger.lua | 4 +
apisix/plugins/multi-auth.lua | 4 +
apisix/plugins/opa.lua | 3 +
apisix/plugins/openid-connect.lua | 39 +-
apisix/plugins/opentelemetry.lua | 2 +
apisix/plugins/openwhisk.lua | 7 +-
apisix/plugins/prometheus/exporter.lua | 16 +
apisix/plugins/real-ip.lua | 4 +-
apisix/plugins/rocketmq-logger.lua | 1 +
apisix/plugins/skywalking-logger.lua | 2 +
apisix/plugins/skywalking.lua | 2 +
apisix/plugins/sls-logger.lua | 17 +-
apisix/plugins/syslog.lua | 1 +
apisix/plugins/tcp-logger.lua | 1 +
apisix/plugins/ua-restriction.lua | 4 +-
apisix/plugins/wolf-rbac.lua | 2 +
apisix/plugins/zipkin.lua | 2 +
apisix/schema_def.lua | 29 +-
apisix/secret.lua | 41 +-
apisix/secret/vault.lua | 16 +-
apisix/ssl.lua | 21 +-
apisix/ssl/router/radixtree_sni.lua | 5 +-
apisix/stream/router/ip_port.lua | 4 -
apisix/upstream.lua | 12 +
apisix/utils/log-util.lua | 67 +-
benchmark/run.sh | 8 +-
ci/centos7-ci.sh | 1 +
ci/common.sh | 3 +
ci/free_disk_space.sh | 21 +-
ci/redhat-ci.sh | 2 +-
conf/config.yaml | 2 +-
conf/{config-default.yaml => config.yaml.example} | 22 +-
conf/debug.yaml | 22 +-
docs/en/latest/FAQ.md | 27 +-
docs/en/latest/admin-api.md | 70 +-
docs/en/latest/batch-processor.md | 11 +-
docs/en/latest/benchmark.md | 13 +-
docs/en/latest/certificate.md | 19 +-
docs/en/latest/config.json | 7 +-
docs/en/latest/debug-function.md | 17 +-
docs/en/latest/deployment-modes.md | 20 +
docs/en/latest/discovery.md | 17 +-
docs/en/latest/discovery/consul.md | 13 +-
docs/en/latest/discovery/consul_kv.md | 13 +-
docs/en/latest/discovery/kubernetes.md | 53 ++
docs/en/latest/discovery/nacos.md | 19 +-
docs/en/latest/grpc-proxy.md | 13 +-
docs/en/latest/http3.md | 186 +++++
docs/en/latest/mtls.md | 15 +-
docs/en/latest/plugin-develop.md | 11 +-
docs/en/latest/plugins/api-breaker.md | 13 +-
docs/en/latest/plugins/authz-casbin.md | 19 +-
docs/en/latest/plugins/authz-casdoor.md | 11 +-
docs/en/latest/plugins/authz-keycloak.md | 13 +-
docs/en/latest/plugins/aws-lambda.md | 36 +-
docs/en/latest/plugins/azure-functions.md | 17 +-
docs/en/latest/plugins/basic-auth.md | 15 +-
docs/en/latest/plugins/batch-requests.md | 15 +-
docs/en/latest/plugins/body-transformer.md | 22 +-
docs/en/latest/plugins/brotli.md | 13 +-
docs/en/latest/plugins/cas-auth.md | 13 +-
docs/en/latest/plugins/chaitin-waf.md | 15 +-
docs/en/latest/plugins/clickhouse-logger.md | 15 +-
docs/en/latest/plugins/client-control.md | 13 +-
docs/en/latest/plugins/consumer-restriction.md | 35 +-
docs/en/latest/plugins/cors.md | 16 +-
docs/en/latest/plugins/csrf.md | 13 +-
docs/en/latest/plugins/datadog.md | 17 +-
docs/en/latest/plugins/degraphql.md | 11 +-
docs/en/latest/plugins/dubbo-proxy.md | 15 +-
docs/en/latest/plugins/echo.md | 13 +-
docs/en/latest/plugins/elasticsearch-logger.md | 19 +-
docs/en/latest/plugins/error-log-logger.md | 17 +-
docs/en/latest/plugins/ext-plugin-post-resp.md | 13 +-
docs/en/latest/plugins/ext-plugin-pre-req.md | 13 +-
docs/en/latest/plugins/fault-injection.md | 19 +-
docs/en/latest/plugins/file-logger.md | 17 +-
docs/en/latest/plugins/forward-auth.md | 15 +-
docs/en/latest/plugins/google-cloud-logging.md | 17 +-
docs/en/latest/plugins/grpc-transcode.md | 27 +-
docs/en/latest/plugins/grpc-web.md | 13 +-
docs/en/latest/plugins/gzip.md | 13 +-
docs/en/latest/plugins/hmac-auth.md | 15 +-
docs/en/latest/plugins/http-dubbo.md | 128 ++++
docs/en/latest/plugins/http-logger.md | 15 +-
docs/en/latest/plugins/inspect.md | 11 +-
docs/en/latest/plugins/ip-restriction.md | 15 +-
docs/en/latest/plugins/jwe-decrypt.md | 17 +-
docs/en/latest/plugins/jwt-auth.md | 19 +-
docs/en/latest/plugins/kafka-logger.md | 17 +-
docs/en/latest/plugins/key-auth.md | 17 +-
docs/en/latest/plugins/ldap-auth.md | 15 +-
docs/en/latest/plugins/limit-conn.md | 17 +-
docs/en/latest/plugins/limit-count.md | 29 +-
docs/en/latest/plugins/limit-req.md | 19 +-
docs/en/latest/plugins/loggly.md | 17 +-
docs/en/latest/plugins/loki-logger.md | 15 +-
docs/en/latest/plugins/mocking.md | 13 +-
docs/en/latest/plugins/mqtt-proxy.md | 17 +-
docs/en/latest/plugins/multi-auth.md | 17 +-
docs/en/latest/plugins/node-status.md | 13 +-
docs/en/latest/plugins/ocsp-stapling.md | 19 +-
docs/en/latest/plugins/opa.md | 11 +-
docs/en/latest/plugins/openfunction.md | 15 +-
docs/en/latest/plugins/openid-connect.md | 16 +-
docs/en/latest/plugins/opentelemetry.md | 33 +-
docs/en/latest/plugins/openwhisk.md | 13 +-
docs/en/latest/plugins/prometheus.md | 15 +-
docs/en/latest/plugins/proxy-cache.md | 15 +-
docs/en/latest/plugins/proxy-control.md | 13 +-
docs/en/latest/plugins/proxy-mirror.md | 13 +-
docs/en/latest/plugins/proxy-rewrite.md | 13 +-
docs/en/latest/plugins/public-api.md | 11 +-
docs/en/latest/plugins/real-ip.md | 13 +-
docs/en/latest/plugins/redirect.md | 17 +-
docs/en/latest/plugins/referer-restriction.md | 13 +-
docs/en/latest/plugins/request-id.md | 13 +-
docs/en/latest/plugins/request-validation.md | 13 +-
docs/en/latest/plugins/response-rewrite.md | 15 +-
docs/en/latest/plugins/rocketmq-logger.md | 15 +-
docs/en/latest/plugins/serverless.md | 13 +-
docs/en/latest/plugins/skywalking-logger.md | 15 +-
docs/en/latest/plugins/skywalking.md | 13 +-
docs/en/latest/plugins/sls-logger.md | 15 +-
docs/en/latest/plugins/splunk-hec-logging.md | 17 +-
docs/en/latest/plugins/syslog.md | 15 +-
docs/en/latest/plugins/tcp-logger.md | 15 +-
docs/en/latest/plugins/tencent-cloud-cls.md | 15 +-
docs/en/latest/plugins/traffic-split.md | 25 +-
docs/en/latest/plugins/ua-restriction.md | 13 +-
docs/en/latest/plugins/udp-logger.md | 15 +-
docs/en/latest/plugins/uri-blocker.md | 13 +-
docs/en/latest/plugins/wolf-rbac.md | 17 +-
docs/en/latest/plugins/workflow.md | 13 +-
docs/en/latest/plugins/zipkin.md | 15 +-
docs/en/latest/router-radixtree.md | 23 +-
docs/en/latest/ssl-protocol.md | 17 +-
docs/en/latest/stream-proxy.md | 21 +-
docs/en/latest/terminology/consumer-group.md | 13 +-
docs/en/latest/terminology/consumer.md | 15 +-
docs/en/latest/terminology/global-rule.md | 13 +-
docs/en/latest/terminology/plugin-config.md | 17 +-
docs/en/latest/terminology/plugin-metadata.md | 11 +-
docs/en/latest/terminology/plugin.md | 11 +-
docs/en/latest/terminology/route.md | 11 +-
docs/en/latest/terminology/secret.md | 27 +-
docs/en/latest/terminology/service.md | 17 +-
docs/en/latest/terminology/upstream.md | 27 +-
docs/en/latest/tutorials/cache-api-responses.md | 11 +-
docs/en/latest/tutorials/client-to-apisix-mtls.md | 13 +-
docs/en/latest/tutorials/health-check.md | 11 +-
docs/en/latest/tutorials/manage-api-consumers.md | 23 +-
docs/en/latest/tutorials/observe-your-api.md | 15 +-
docs/en/latest/tutorials/protect-api.md | 11 +-
docs/en/latest/wasm.md | 11 +-
docs/en/latest/xrpc/redis.md | 11 +-
docs/zh/latest/FAQ.md | 28 +-
docs/zh/latest/admin-api.md | 81 +-
docs/zh/latest/batch-processor.md | 12 +-
docs/zh/latest/benchmark.md | 14 +-
docs/zh/latest/certificate.md | 20 +-
docs/zh/latest/config.json | 7 +-
docs/zh/latest/debug-function.md | 18 +-
docs/zh/latest/discovery.md | 18 +-
docs/zh/latest/discovery/kubernetes.md | 52 ++
docs/zh/latest/discovery/nacos.md | 20 +-
docs/zh/latest/grpc-proxy.md | 14 +-
docs/zh/latest/http3.md | 186 +++++
docs/zh/latest/mtls.md | 16 +-
docs/zh/latest/plugin-develop.md | 12 +-
docs/zh/latest/plugins/api-breaker.md | 14 +-
docs/zh/latest/plugins/authz-casbin.md | 20 +-
docs/zh/latest/plugins/authz-casdoor.md | 12 +-
docs/zh/latest/plugins/authz-keycloak.md | 14 +-
docs/zh/latest/plugins/aws-lambda.md | 37 +-
docs/zh/latest/plugins/azure-functions.md | 18 +-
docs/zh/latest/plugins/basic-auth.md | 16 +-
docs/zh/latest/plugins/batch-requests.md | 16 +-
docs/zh/latest/plugins/brotli.md | 14 +-
docs/zh/latest/plugins/chaitin-waf.md | 16 +-
docs/zh/latest/plugins/clickhouse-logger.md | 16 +-
docs/zh/latest/plugins/client-control.md | 14 +-
docs/zh/latest/plugins/consumer-restriction.md | 36 +-
docs/zh/latest/plugins/cors.md | 17 +-
docs/zh/latest/plugins/csrf.md | 14 +-
docs/zh/latest/plugins/datadog.md | 18 +-
docs/zh/latest/plugins/dubbo-proxy.md | 16 +-
docs/zh/latest/plugins/echo.md | 24 +-
docs/zh/latest/plugins/elasticsearch-logger.md | 20 +-
docs/zh/latest/plugins/error-log-logger.md | 18 +-
docs/zh/latest/plugins/ext-plugin-post-resp.md | 14 +-
docs/zh/latest/plugins/ext-plugin-pre-req.md | 14 +-
docs/zh/latest/plugins/fault-injection.md | 20 +-
docs/zh/latest/plugins/file-logger.md | 18 +-
docs/zh/latest/plugins/forward-auth.md | 16 +-
docs/zh/latest/plugins/google-cloud-logging.md | 18 +-
docs/zh/latest/plugins/grpc-transcode.md | 28 +-
docs/zh/latest/plugins/grpc-web.md | 14 +-
docs/zh/latest/plugins/gzip.md | 14 +-
docs/zh/latest/plugins/hmac-auth.md | 16 +-
docs/zh/latest/plugins/http-dubbo.md | 124 +++
docs/zh/latest/plugins/http-logger.md | 16 +-
docs/zh/latest/plugins/ip-restriction.md | 16 +-
docs/zh/latest/plugins/jwe-decrypt.md | 18 +-
docs/zh/latest/plugins/jwt-auth.md | 20 +-
docs/zh/latest/plugins/kafka-logger.md | 16 +-
docs/zh/latest/plugins/key-auth.md | 18 +-
docs/zh/latest/plugins/ldap-auth.md | 16 +-
docs/zh/latest/plugins/limit-conn.md | 18 +-
docs/zh/latest/plugins/limit-count.md | 30 +-
docs/zh/latest/plugins/limit-req.md | 20 +-
docs/zh/latest/plugins/loggly.md | 18 +-
docs/zh/latest/plugins/loki-logger.md | 16 +-
docs/zh/latest/plugins/mocking.md | 14 +-
docs/zh/latest/plugins/mqtt-proxy.md | 18 +-
docs/zh/latest/plugins/multi-auth.md | 28 +-
docs/zh/latest/plugins/node-status.md | 14 +-
docs/zh/latest/plugins/ocsp-stapling.md | 20 +-
docs/zh/latest/plugins/opa.md | 12 +-
docs/zh/latest/plugins/openfunction.md | 16 +-
docs/zh/latest/plugins/openid-connect.md | 17 +-
docs/zh/latest/plugins/opentelemetry.md | 34 +-
docs/zh/latest/plugins/openwhisk.md | 14 +-
docs/zh/latest/plugins/prometheus.md | 16 +-
docs/zh/latest/plugins/proxy-cache.md | 16 +-
docs/zh/latest/plugins/proxy-control.md | 14 +-
docs/zh/latest/plugins/proxy-mirror.md | 14 +-
docs/zh/latest/plugins/proxy-rewrite.md | 14 +-
docs/zh/latest/plugins/public-api.md | 18 +-
docs/zh/latest/plugins/real-ip.md | 14 +-
docs/zh/latest/plugins/redirect.md | 18 +-
docs/zh/latest/plugins/referer-restriction.md | 14 +-
docs/zh/latest/plugins/request-id.md | 14 +-
docs/zh/latest/plugins/request-validation.md | 14 +-
docs/zh/latest/plugins/response-rewrite.md | 16 +-
docs/zh/latest/plugins/rocketmq-logger.md | 16 +-
docs/zh/latest/plugins/serverless.md | 14 +-
docs/zh/latest/plugins/skywalking-logger.md | 16 +-
docs/zh/latest/plugins/skywalking.md | 14 +-
docs/zh/latest/plugins/sls-logger.md | 16 +-
docs/zh/latest/plugins/splunk-hec-logging.md | 18 +-
docs/zh/latest/plugins/syslog.md | 14 +-
docs/zh/latest/plugins/tcp-logger.md | 16 +-
docs/zh/latest/plugins/tencent-cloud-cls.md | 16 +-
docs/zh/latest/plugins/traffic-split.md | 26 +-
docs/zh/latest/plugins/ua-restriction.md | 14 +-
docs/zh/latest/plugins/udp-logger.md | 16 +-
docs/zh/latest/plugins/uri-blocker.md | 14 +-
docs/zh/latest/plugins/wolf-rbac.md | 18 +-
docs/zh/latest/plugins/workflow.md | 14 +-
docs/zh/latest/plugins/zipkin.md | 16 +-
docs/zh/latest/router-radixtree.md | 34 +-
docs/zh/latest/ssl-protocol.md | 18 +-
docs/zh/latest/stream-proxy.md | 22 +-
docs/zh/latest/terminology/consumer-group.md | 14 +-
docs/zh/latest/terminology/consumer.md | 16 +-
docs/zh/latest/terminology/global-rule.md | 14 +-
docs/zh/latest/terminology/plugin-config.md | 20 +-
docs/zh/latest/terminology/plugin-metadata.md | 12 +-
docs/zh/latest/terminology/plugin.md | 12 +-
docs/zh/latest/terminology/route.md | 16 +-
docs/zh/latest/terminology/secret.md | 22 +-
docs/zh/latest/terminology/service.md | 18 +-
docs/zh/latest/terminology/upstream.md | 30 +-
docs/zh/latest/tutorials/client-to-apisix-mtls.md | 14 +-
docs/zh/latest/tutorials/health-check.md | 12 +-
docs/zh/latest/tutorials/observe-your-api.md | 16 +-
docs/zh/latest/tutorials/protect-api.md | 12 +-
t/APISIX.pm | 17 +-
t/admin/api.t | 12 +-
t/admin/consumers.t | 2 +-
t/admin/plugin-metadata.t | 4 +-
t/admin/plugins-reload.t | 6 +-
t/admin/ssl.t | 120 +++
t/admin/ssl4.t | 106 ++-
t/certs/test-dot.crt | 18 +
t/certs/test-dot.key | 28 +
t/cli/test_access_log.sh | 6 +-
t/cli/test_admin.sh | 29 +-
t/cli/test_admin_mtls.sh | 6 +-
t/cli/test_apisix_mirror.sh | 3 +-
t/cli/test_cmd.sh | 22 +-
t/cli/test_deployment_control_plane.sh | 9 +-
t/cli/test_deployment_data_plane.sh | 3 +-
t/cli/test_deployment_traditional.sh | 6 +-
t/cli/test_dns.sh | 4 +-
t/cli/test_etcd_healthcheck.sh | 14 +-
t/cli/test_etcd_sync_event_handle.sh | 133 ++++
t/cli/test_main.sh | 8 +-
t/cli/test_prometheus.sh | 6 +-
t/cli/test_prometheus_reload.sh | 91 +++
t/cli/test_prometheus_run_in_privileged.sh | 18 +-
t/cli/test_prometheus_stream.sh | 3 +-
t/cli/test_tls_over_tcp.sh | 6 +-
t/cli/test_upstream_mtls.sh | 6 +-
t/cli/test_validate_config.sh | 20 -
t/config-center-yaml/consumer.t | 19 +-
t/config-center-yaml/plugin-configs.t | 8 +-
t/config-center-yaml/plugin-metadata.t | 2 +-
t/config-center-yaml/plugin.t | 29 +-
t/core/config_etcd.t | 8 +-
t/core/etcd-mtls.t | 22 +-
t/core/grpc-openresty.t | 50 --
t/core/grpc.t | 173 -----
t/core/request.t | 56 +-
t/fuzzing/client_abort.py | 16 +-
t/fuzzing/http_upstream.py | 17 +-
t/fuzzing/requirements.txt | 1 +
t/fuzzing/serverless_route_test.py | 16 +-
t/fuzzing/simple_http.py | 29 +-
t/fuzzing/simpleroute_test.py | 33 +-
t/fuzzing/vars_route_test.py | 15 +-
t/kubernetes/discovery/kubernetes2.t | 36 +-
t/kubernetes/discovery/kubernetes3.t | 49 +-
t/kubernetes/discovery/stream/kubernetes.t | 4 +-
t/node/chash-hashon.t | 4 +-
t/node/grpc-proxy-mtls.t | 4 +-
t/node/healthcheck2.t | 6 +-
t/node/https-proxy.t | 6 +-
t/node/invalid-port.t | 105 +++
t/node/least_conn.t | 17 +-
t/node/priority-balancer/health-checker.t | 8 +-
t/node/priority-balancer/sanity.t | 24 +-
t/node/ssl.t | 243 ++++++
t/node/upstream-discovery.t | 6 +-
t/node/upstream-domain-with-special-dns.t | 15 +-
t/node/upstream-domain-with-special-ipv6-dns.t | 3 +-
t/plugin/body-transformer.t | 4 +-
t/plugin/cors.t | 4 +-
t/plugin/cors3.t | 12 +-
t/plugin/cors4.t | 110 +++
t/plugin/datadog.t | 37 +
t/plugin/dubbo-proxy/route.t | 10 +-
t/plugin/grpc-transcode3.t | 51 ++
t/plugin/hmac-auth.t | 83 ++-
t/plugin/jwe-decrypt.t | 66 +-
t/plugin/kafka-logger-large-body.t | 869 ++++++++++++++++++++++
t/plugin/key-auth.t | 15 +-
t/plugin/log-rotate2.t | 7 +-
t/plugin/multi-auth.t | 256 ++++++-
t/plugin/openid-connect.t | 91 ++-
t/plugin/openid-connect5.t | 93 +++
t/plugin/openid-connect6.t | 208 ++++++
t/plugin/opentelemetry3.t | 5 +-
t/plugin/openwhisk.t | 52 +-
t/plugin/prometheus4.t | 123 +++
t/plugin/security-warning.t | 570 ++++++++++++++
t/plugin/security-warning2.t | 629 ++++++++++++++++
t/plugin/sls-logger.t | 57 ++
t/plugin/zipkin3.t | 4 +-
t/pubsub/kafka.t | 3 +
t/router/radixtree-host-uri2.t | 8 +-
t/router/radixtree-sni3.t | 283 +++++++
t/secret/vault.t | 57 ++
t/stream-node/priority-balancer.t | 9 +-
t/stream-node/sanity-repeat.t | 134 ++++
utils/check-lua-code-style.sh | 2 +-
utils/install-dependencies.sh | 4 +-
utils/linux-install-luarocks.sh | 1 +
405 files changed, 9845 insertions(+), 2223 deletions(-)