update

Author: namchuai

engine/cli/commands/engine_get_cmd.cc

@@ -2,8 +2,8 @@
 #include <json/reader.h>
 #include <json/value.h>
 #include <iostream>
+#include "common/engine_servicei.h"
 #include "server_start_cmd.h"
-#include "services/engine_service.h"
 #include "utils/curl_utils.h"
 #include "utils/logging_utils.h"
 #include "utils/url_parser.h"

engine/cli/commands/engine_install_cmd.cc

@@ -45,28 +45,28 @@ bool EngineInstallCmd::Exec(const std::string& engine,
       }
     });
 
-    auto versions_url = url_parser::Url{
+    auto releases_url = url_parser::Url{
         .protocol = "http",
         .host = host_ + ":" + std::to_string(port_),
-        .pathParams = {"v1", "engines", engine, "versions"},
+        .pathParams = {"v1", "engines", engine, "releases"},
     };
-    auto versions_result = curl_utils::SimpleGetJson(versions_url.ToFullPath());
-    if (versions_result.has_error()) {
-      CTL_ERR(versions_result.error());
+    auto releases_result = curl_utils::SimpleGetJson(releases_url.ToFullPath());
+    if (releases_result.has_error()) {
+      CTL_ERR(releases_result.error());
       return false;
     }
     std::vector<std::string> version_selections;
-    for (const auto& release_version : versions_result.value()) {
+    for (const auto& release_version : releases_result.value()) {
       version_selections.push_back(release_version["name"].asString());
     }
 
-    auto selected_version =
+    auto selected_release =
         cli_selection_utils::PrintSelection(version_selections);
-    if (selected_version == std::nullopt) {
+    if (selected_release == std::nullopt) {
       CTL_ERR("Invalid version selection");
       return false;
     }
-    std::cout << "Selected version: " << selected_version.value() << std::endl;
+    std::cout << "Selected version: " << selected_release.value() << std::endl;
 
     auto variant_url = url_parser::Url{
         .protocol = "http",
@@ -76,8 +76,8 @@ bool EngineInstallCmd::Exec(const std::string& engine,
                 "v1",
                 "engines",
                 engine,
-                "versions",
-                selected_version.value(),
+                "releases",
+                selected_release.value(),
             },
     };
     auto variant_result = curl_utils::SimpleGetJson(variant_url.ToFullPath());
@@ -113,7 +113,7 @@ bool EngineInstallCmd::Exec(const std::string& engine,
       return false;
     }
     std::cout << "Selected " << selected_variant.value() << " - "
-              << selected_version.value() << std::endl;
+              << selected_release.value() << std::endl;
 
     auto install_url = url_parser::Url{
         .protocol = "http",
@@ -127,7 +127,7 @@ bool EngineInstallCmd::Exec(const std::string& engine,
             },
     };
     Json::Value body;
-    body["version"] = selected_version.value();
+    body["version"] = selected_release.value();
     body["variant"] = selected_variant.value();
 
     auto response = curl_utils::SimplePostJson(install_url.ToFullPath(),

engine/controllers/engines.h

@@ -45,16 +45,21 @@ class Engines : public drogon::HttpController<Engines, false> {
   ADD_METHOD_TO(Engines::UnloadEngine, "/v1/engines/{1}/load", Options, Delete);
 
   METHOD_ADD(Engines::GetInstalledEngineVariants, "/{1}", Get);
+  ADD_METHOD_TO(Engines::GetInstalledEngineVariants, "/v1/engines/{1}", Get);
+
   METHOD_ADD(Engines::ListEngine, "", Get);
-  METHOD_ADD(Engines::GetEngineVersions, "/{1}/versions", Get);
-  METHOD_ADD(Engines::GetEngineVariants, "/{1}/versions/{2}", Get);
-  METHOD_ADD(Engines::GetLatestEngineVersion, "/{1}/latest", Get);
+  ADD_METHOD_TO(Engines::ListEngine, "/v1/engines", Get);
 
-  ADD_METHOD_TO(Engines::GetInstalledEngineVariants, "/v1/engines/{1}", Get);
-  ADD_METHOD_TO(Engines::GetEngineVersions, "/v1/engines/{1}/versions", Get);
-  ADD_METHOD_TO(Engines::GetEngineVariants, "/v1/engines/{1}/versions/{2}",
+  METHOD_ADD(Engines::GetEngineVersions, "/{1}/releases", Get);
+  ADD_METHOD_TO(Engines::GetEngineVersions, "/v1/engines/{1}/releases", Get);
+
+  METHOD_ADD(Engines::GetEngineVariants, "/{1}/releases/{2}", Get);
+  ADD_METHOD_TO(Engines::GetEngineVariants, "/v1/engines/{1}/releases/{2}",
                 Get);
-  ADD_METHOD_TO(Engines::ListEngine, "/v1/engines", Get);
+
+  METHOD_ADD(Engines::GetLatestEngineVersion, "/{1}/releases/latest", Get);
+  ADD_METHOD_TO(Engines::GetLatestEngineVersion,
+                "/v1/engines/{1}/releases/latest", Get);
 
   METHOD_LIST_END