Merge branch 'master' of github.com:apache/apisix into revolyssup/ref…

…actor/set-metatable
apache · Nov 22, 2024 · aacbbc7 · aacbbc7
2 parents b344db6 + a6412d2
commit aacbbc7
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/apisix/plugins/openid-connect.lua b/apisix/plugins/openid-connect.lua
@@ -112,7 +112,7 @@ local schema = {
         public_key = {type = "string"},
         token_signing_alg_values_expected = {type = "string"},
         use_pkce = {
-            description = "when set to true the PKEC(Proof Key for Code Exchange) will be used.",
+            description = "when set to true the PKCE(Proof Key for Code Exchange) will be used.",
             type = "boolean",
             default = false
         },

diff --git a/ci/linux_openresty_tongsuo_runner.sh b/ci/linux_openresty_tongsuo_runner.sh
@@ -45,6 +45,7 @@ case_opt=$1
 
 case ${case_opt} in
 before_install)
+    # shellcheck disable=SC2218
     before_install
     ;;
 esac

diff --git a/ci/pod/otelcol-contrib/config.yaml b/ci/pod/otelcol-contrib/config.yaml
@@ -19,7 +19,9 @@ receivers:
   otlp:
     protocols:
       grpc:
+        endpoint: 0.0.0.0:4317
       http:
+        endpoint: 0.0.0.0:4318
 exporters:
   file:
     path: /etc/otelcol-contrib/data-otlp.json

diff --git a/docs/en/latest/plugins/ai-proxy.md b/docs/en/latest/plugins/ai-proxy.md
@@ -62,7 +62,7 @@ Proxying requests to OpenAI is supported now. Other LLM services will be support
 | model.options.temperature | No           | Number   | Matching temperature for models. Range: 0.0 - 5.0                                    |
 | model.options.top_p       | No           | Number   | Top-p probability mass. Range: 0 - 1                                                 |
 | model.options.stream      | No           | Boolean  | Stream response by SSE. Default: false                                               |
-| model.override.endpoint   | No           | String   | Override the endpoint of the AI provider                                             |
+| override.endpoint         | No           | String   | Override the endpoint of the AI provider                                             |
 | passthrough               | No           | Boolean  | If enabled, the response from LLM will be sent to the upstream. Default: false       |
 | timeout                   | No           | Integer  | Timeout in milliseconds for requests to LLM. Range: 1 - 60000. Default: 3000         |
 | keepalive                 | No           | Boolean  | Enable keepalive for requests to LLM. Default: true                                  |

diff --git a/docs/zh/latest/plugins/openid-connect.md b/docs/zh/latest/plugins/openid-connect.md
@@ -51,7 +51,7 @@ description: OpenID Connect（OIDC）是基于 OAuth 2.0 的身份认证协议
 | token_endpoint_auth_method           | string  | 否     |                       |               | 令牌端点的身份验证方法。该值应是 `token_endpoint_auth_methods_supported` [授权服务器元数据](https://www.rfc-editor.org/rfc/rfc8414.html)中指定的身份验证方法之一，如发现文档中所示，例如 `client_secret_basic`， `client_secret_post`， `private_key_jwt`，或 `client_secret_jwt`。如果不支持配置的方法，则回退到`token_endpoint_auth_methods_supported` 数组中的第一个方法。                                  |
 | public_key                           | string  | 否     |                       |               | 验证令牌的公钥。                                                                                   |
 | use_jwks                             | boolean | 否     | false                 |               | 当设置为 `true` 时，则会使用身份认证服务器的 JWKS 端点来验证令牌。                                    |
-| use_pkce                             | boolean | 否     | false                 | [true, false] | 当设置为 `true` 时，则使用 PKEC（Proof Key for Code Exchange）。                                      |
+| use_pkce                             | boolean | 否     | false                 | [true, false] | 当设置为 `true` 时，则使用 PKCE（Proof Key for Code Exchange）。                                      |
 | token_signing_alg_values_expected    | string  | 否     |                       |               | 用于对令牌进行签名的算法。                                                                          |
 | set_access_token_header              | boolean | 否     | true                  | [true, false] | 在请求头设置访问令牌。默认使用请求头参数 `X-Access-Token`。                                                                              |
 | access_token_in_authorization_header | boolean | 否     | false                 | [true, false] | 当设置为 `true` 以及 `set_access_token_header` 也设置为 `true`时，将访问令牌设置在请求头参数 `Authorization`。  |