fix(interactive): Refine generate_sdk.sh for interactive (#3807)

Avoid downloading `openapi-generator-cli` repeatedly. Fix `generate_sdk.sh` on macOS.
alibaba · May 21, 2024 · 0893b5f · 0893b5f
1 parent bf4bd71
commit 0893b5f
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 13 deletions.
diff --git a/flex/engines/http_server/handler/hqps_http_handler.cc b/flex/engines/http_server/handler/hqps_http_handler.cc
@@ -123,7 +123,12 @@ seastar::future<std::unique_ptr<seastar::httpd::reply>> hqps_ic_handler::handle(
 
   return executor_refs_[dst_executor]
       .run_graph_db_query(query_param{std::move(req->content)})
-      .then([this, outer_span = outer_span](auto&& output) {
+      .then([this
+#ifdef HAVE_OPENTELEMETRY_CPP
+             ,
+             outer_span = outer_span
+#endif  // HAVE_OPENTELEMETRY_CPP
+  ](auto&& output) {
         if (output.content.size() < 4) {
           LOG(ERROR) << "Invalid output size: " << output.content.size();
 #ifdef HAVE_OPENTELEMETRY_CPP
@@ -132,7 +137,7 @@ seastar::future<std::unique_ptr<seastar::httpd::reply>> hqps_ic_handler::handle(
           outer_span->End();
           std::map<std::string, std::string> labels = {{"status", "fail"}};
           total_counter_->Add(1, labels);
-#endif
+#endif  // HAVE_OPENTELEMETRY_CPP
           return seastar::make_ready_future<query_param>(std::move(output));
         }
         return seastar::make_ready_future<query_param>(
@@ -340,16 +345,25 @@ hqps_adhoc_query_handler::handle(const seastar::sstring& path,
         param.content.append(gs::Schema::HQPS_ADHOC_PLUGIN_ID_STR, 1);
         return executor_refs_[dst_executor]
             .run_graph_db_query(query_param{std::move(param.content)})
-            .then([query_span = query_span,
-                   query_scope = std::move(query_scope)](auto&& output) {
+            .then([
+#ifdef HAVE_OPENTELEMETRY_CPP
+                      query_span = query_span,
+                      query_scope = std::move(query_scope)
+#endif  // HAVE_OPENTELEMETRY_CPP
+        ](auto&& output) {
 #ifdef HAVE_OPENTELEMETRY_CPP
               query_span->End();
 #endif  // HAVE_OPENTELEMETRY_CPP
               return seastar::make_ready_future<query_param>(
                   std::move(output.content));
             });
       })
-      .then([this, outer_span = outer_span](auto&& output) {
+      .then([this
+#ifdef HAVE_OPENTELEMETRY_CPP
+             ,
+             outer_span = outer_span
+#endif  // HAVE_OPENTELEMETRY_CPP
+  ](auto&& output) {
         if (output.content.size() < 4) {
           LOG(ERROR) << "Invalid output size: " << output.content.size();
 #ifdef HAVE_OPENTELEMETRY_CPP

diff --git a/flex/interactive/sdk/generate_sdk.sh b/flex/interactive/sdk/generate_sdk.sh
@@ -109,17 +109,54 @@ if [ $# -eq 0 ]; then
 fi
 
 function install_generator() {
-  # first check openapi-generator-cli is executable
+  CLI_INSTALLED=false
+  JQ_INSTALLED=false
+  MVN_INSTALLED=false
+  # first check openapi-generator-cli exists is executable
+  if [ -f ~/bin/openapitools/openapi-generator-cli ]; then
+    echo "openapi-generator-cli is already installed"
+    export PATH=$PATH:~/bin/openapitools/
+  fi
   if command -v openapi-generator-cli &>/dev/null; then
     echo "openapi-generator-cli is already installed"
-    return
+    CLI_INSTALLED=true
+  fi
+  if ! $CLI_INSTALLED; then
+    echo "Installing openapi-generator-cli"
+    mkdir -p ~/bin/openapitools
+    curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli
+    chmod u+x ~/bin/openapitools/openapi-generator-cli
+    export PATH=$PATH:~/bin/openapitools/
+    export OPENAPI_GENERATOR_VERSION=7.2.0
+  fi
+  # on ubuntu apt-get jq on mac brew install jq
+
+  if command -v jq &>/dev/null; then
+    echo "jq is already installed"
+    JQ_INSTALLED=true
+  fi
+  if command -v mvn &>/dev/null; then
+    echo "maven is already installed"
+    MVN_INSTALLED=true
+  fi
+  if [[ "$(uname -s)" == "Linux" ]]; then
+    if ! $JQ_INSTALLED; then
+      sudo apt-get update && sudo apt-get -y install jq
+    fi
+    if ! $MVN_INSTALLED; then
+      sudo apt-get update && sudo apt-get -y install maven
+    fi
+  elif [[ "$(uname -s)" == "Darwin" ]]; then
+    if ! $JQ_INSTALLED; then
+      brew install jq
+    fi
+    if ! $MVN_INSTALLED; then
+      brew install maven
+    fi
+  else
+    echo "Unsupported OS"
+    exit 1
   fi
-  mkdir -p ~/bin/openapitools
-  curl https://raw.githubusercontent.com/OpenAPITools/openapi-generator/master/bin/utils/openapi-generator-cli.sh > ~/bin/openapitools/openapi-generator-cli
-  chmod u+x ~/bin/openapitools/openapi-generator-cli
-  export PATH=$PATH:~/bin/openapitools/
-  export OPENAPI_GENERATOR_VERSION=7.2.0
-  sudo apt-get update && sudo apt-get -y install jq
 }
 
 install_generator