Merge branch 'master' of github.com:apache/apisix into limit-count-configable-resp-headers

Author: shreemaan-abhishek

apisix-master-0.rockspec

@@ -71,7 +71,6 @@ dependencies = {
     "ext-plugin-proto = 0.6.1",
     "casbin = 1.41.9-1",
     "inspect == 3.1.1",
-    "lualdap = 1.2.6-1",
     "lua-resty-rocketmq = 0.3.0-0",
     "opentelemetry-lua = 0.2-3",
     "net-url = 0.9-1",

apisix/plugins/ai-proxy/drivers/openai.lua

@@ -42,19 +42,19 @@ function _M.request(conf, request_table, ctx)
     end
 
     local ok, err = httpc:connect({
-        scheme = parsed_url.scheme or "https",
-        host = parsed_url.host or DEFAULT_HOST,
-        port = parsed_url.port or DEFAULT_PORT,
+        scheme = endpoint and parsed_url.scheme or "https",
+        host = endpoint and parsed_url.host or DEFAULT_HOST,
+        port = endpoint and parsed_url.port or DEFAULT_PORT,
         ssl_verify = conf.ssl_verify,
-        ssl_server_name = parsed_url.host or DEFAULT_HOST,
+        ssl_server_name = endpoint and parsed_url.host or DEFAULT_HOST,
         pool_size = conf.keepalive and conf.keepalive_pool,
     })
 
     if not ok then
         return nil, "failed to connect to LLM server: " .. err
     end
 
-    local path = (parsed_url.path or DEFAULT_PATH)
+    local path = (endpoint and parsed_url.path or DEFAULT_PATH)
 
     local headers = (conf.auth.header or {})
     headers["Content-Type"] = "application/json"

ci/common.sh

@@ -182,7 +182,7 @@ GRPC_SERVER_EXAMPLE_VER=20210819
 
 linux_get_dependencies () {
     apt update
-    apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev libldap2-dev
+    apt install -y cpanminus build-essential libncurses5-dev libreadline-dev libssl-dev perl libpcre3 libpcre3-dev
     apt-get install -y libyaml-dev
     wget https://github.com/mikefarah/yq/releases/download/3.4.1/yq_linux_amd64 -O /usr/bin/yq && sudo chmod +x /usr/bin/yq
 }

ci/linux-install-openresty.sh

@@ -35,7 +35,7 @@ sudo add-apt-repository -y "deb https://openresty.org/package/${arch_path}ubuntu
 sudo add-apt-repository -y "deb http://repos.apiseven.com/packages/${arch_path}debian bullseye main"
 
 sudo apt-get update
-sudo apt-get install -y libldap2-dev openresty-pcre-dev openresty-zlib-dev build-essential gcc g++ cpanminus
+sudo apt-get install -y openresty-pcre-dev openresty-zlib-dev build-essential gcc g++ cpanminus
 
 SSL_LIB_VERSION=${SSL_LIB_VERSION-openssl}
 ENABLE_FIPS=${ENABLE_FIPS:-"false"}

t/APISIX.pm

@@ -465,6 +465,8 @@ _EOC_
         $block->set_value("stream_config", $stream_config);
     }
 
+    my $custom_trusted_cert = $block->custom_trusted_cert // 'cert/apisix.crt';
+
     my $stream_server_config = $block->stream_server_config // <<_EOC_;
     listen 2005 ssl;
     ssl_certificate             cert/apisix.crt;
@@ -737,7 +739,7 @@ _EOC_
         http3 off;
         ssl_certificate             cert/apisix.crt;
         ssl_certificate_key         cert/apisix.key;
-        lua_ssl_trusted_certificate cert/apisix.crt;
+        lua_ssl_trusted_certificate $custom_trusted_cert;
 
         ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
 

t/plugin/ai-proxy2.t

@@ -198,3 +198,58 @@ POST /anything
 --- error_code: 200
 --- response_body
 passed
+
+
+
+=== TEST 5: set route without overriding the endpoint_url
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                [[{
+                    "uri": "/anything",
+                    "plugins": {
+                        "ai-proxy": {
+                            "auth": {
+                                "header": {
+                                    "Authorization": "some-key"
+                                }
+                            },
+                            "model": {
+                                "provider": "openai",
+                                "name": "gpt-4",
+                                "options": {
+                                    "max_tokens": 512,
+                                    "temperature": 1.0
+                                }
+                            }
+                        }
+                    },
+                    "upstream": {
+                        "type": "roundrobin",
+                        "nodes": {
+                            "httpbin.org": 1
+                        }
+                    }
+                }]]
+            )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 6: send request
+--- custom_trusted_cert: /etc/ssl/certs/ca-certificates.crt
+--- request
+POST /anything
+{ "messages": [ { "role": "system", "content": "You are a mathematician" }, { "role": "user", "content": "What is 1+1?"} ] }
+--- error_code: 401

utils/install-dependencies.sh

@@ -78,7 +78,7 @@ function install_dependencies_with_apt() {
     sudo apt-get update
 
     # install some compilation tools
-    sudo apt-get install -y curl make gcc g++ cpanminus libpcre3 libpcre3-dev libldap2-dev libyaml-dev unzip openresty-zlib-dev openresty-pcre-dev
+    sudo apt-get install -y curl make gcc g++ cpanminus libpcre3 libpcre3-dev libyaml-dev unzip openresty-zlib-dev openresty-pcre-dev
 }
 
 # Identify the different distributions and call the corresponding function