From 49f73a85c566aaa218221e2c98bbf6dba91db1f1 Mon Sep 17 00:00:00 2001
From: AlinsRan <rongxin@api7.ai>
Date: Mon, 30 Dec 2024 10:01:08 +0800
Subject: [PATCH] chore: remove grpc client (#415)

Signed-off-by: Nic <qianyong@api7.ai>
Co-authored-by: Nic <qianyong@api7.ai>
---
 VERSION                 |  2 +-
 build-api7ee-runtime.sh | 23 +++++------------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/VERSION b/VERSION
index 0664a8fd2..2bf1ca5f5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.6
+1.1.7
diff --git a/build-api7ee-runtime.sh b/build-api7ee-runtime.sh
index 22b150f6e..e780bd8d2 100755
--- a/build-api7ee-runtime.sh
+++ b/build-api7ee-runtime.sh
@@ -27,7 +27,6 @@ mod_dubbo_ver="1.0.2"
 apisix_nginx_module_ver="1.16.3"
 wasm_nginx_module_ver="0.6.5"
 lua_var_nginx_module_ver="v0.5.3"
-grpc_client_nginx_module_ver="v0.4.4"
 lua_resty_events_ver="0.2.0"
 
 
@@ -130,14 +129,6 @@ else
         lua-var-nginx-module-${lua_var_nginx_module_ver}
 fi
 
-if [ "$repo" == grpc-client-nginx-module ]; then
-    cp -r "$prev_workdir" ./grpc-client-nginx-module-${grpc_client_nginx_module_ver}
-else
-    git clone --depth=1 -b $grpc_client_nginx_module_ver \
-        https://github.com/api7/grpc-client-nginx-module \
-        grpc-client-nginx-module-${grpc_client_nginx_module_ver}
-fi
-
 cd ngx_multi_upstream_module-${ngx_multi_upstream_module_ver} || exit 1
 ./patch.sh ../openresty-${OPENRESTY_VERSION}
 cd ..
@@ -152,9 +143,6 @@ cd ..
 
 luajit_xcflags=${luajit_xcflags:="-DLUAJIT_NUMMODE=2 -DLUAJIT_ENABLE_LUA52COMPAT"}
 no_pool_patch=${no_pool_patch:-}
-# TODO: remove old NGX_HTTP_GRPC_CLI_ENGINE_PATH once we have released a new
-# version of grpc-client-nginx-module
-grpc_engine_path="-DNGX_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so -DNGX_HTTP_GRPC_CLI_ENGINE_PATH=$OR_PREFIX/libgrpc_engine.so"
 
 cd openresty-${OPENRESTY_VERSION} || exit 1
 
@@ -181,7 +169,7 @@ fi
 
 
 ./configure --prefix="$OR_PREFIX" \
-    --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $grpc_engine_path $cc_opt" \
+    --with-cc-opt="-DAPI7EE_RUNTIME_VER=$runtime_version $cc_opt" \
     --with-ld-opt="-Wl,-rpath,$OR_PREFIX/wasmtime-c-api/lib $ld_opt" \
     $debug_args \
     --add-module=../mod_dubbo-${mod_dubbo_ver} \
@@ -191,7 +179,6 @@ fi
     --add-module=../apisix-nginx-module-${apisix_nginx_module_ver}/src/meta \
     --add-module=../wasm-nginx-module-${wasm_nginx_module_ver} \
     --add-module=../lua-var-nginx-module-${lua_var_nginx_module_ver} \
-    --add-module=../grpc-client-nginx-module-${grpc_client_nginx_module_ver} \
     --add-module=../lua-resty-events-${lua_resty_events_ver} \
     --with-poll_module \
     --with-pcre-jit \
@@ -223,6 +210,10 @@ fi
     $no_pool_patch \
     -j`nproc`
 
+# ref: https://github.com/api7/grpc-client-nginx-module/pull/34
+# After loading Go code from .so, the signalfd doesn't work anymore
+sed -i "s/#ifndef NGX_HTTP_LUA_HAVE_SIGNALFD/#ifdef NGX_HTTP_LUA_HAVE_SIGNALFD/" $(find -name 'ngx_auto_config.h')
+
 make -j`nproc`
 sudo make install
 cd ..
@@ -242,10 +233,6 @@ cd wasm-nginx-module-${wasm_nginx_module_ver} || exit 1
 sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
 cd ..
 
-cd grpc-client-nginx-module-${grpc_client_nginx_module_ver} || exit 1
-sudo OPENRESTY_PREFIX="$OR_PREFIX" make install
-cd ..
-
 # package etcdctl
 ETCD_ARCH="amd64"
 ETCD_VERSION=${ETCD_VERSION:-'3.5.4'}