remove legacy compute interfaces (#461)

* removed legacy compute code, which will be replaced with a new implementation in the future
* also updated references to Jupiter storage

1 files changed, 0 insertions, 150 deletions

diff --git a/src/zenserver/config.cpp b/src/zenserver/config.cpp
index 342f41b68..85db7bade 100644
--- a/src/zenserver/config.cpp
+++ b/src/zenserver/config.cpp
@@ -855,57 +855,6 @@ ParseConfigFile(const std::filesystem::path& Path,
 	LuaOptions.AddOption("cache.upstream.zen.dns"sv, ServerOptions.UpstreamCacheConfig.ZenConfig.Dns);
 	LuaOptions.AddOption("cache.upstream.zen.url"sv, ServerOptions.UpstreamCacheConfig.ZenConfig.Urls);
 
-	////// exec
-	LuaOptions.AddOption("exec.enable"sv, ServerOptions.ExecServiceEnabled);
-
-	////// compute
-	LuaOptions.AddOption("compute.enable"sv, ServerOptions.ComputeServiceEnabled);
-
-	LuaOptions.AddOption("compute.upstream.horde.name"sv, ServerOptions.UpstreamCacheConfig.HordeConfig.Name);
-	LuaOptions.AddOption("compute.upstream.horde.url"sv, ServerOptions.UpstreamCacheConfig.HordeConfig.Url, "upstream-horde-url"sv);
-	LuaOptions.AddOption("compute.upstream.horde.oauthprovider"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthUrl,
-						 "upstream-horde-oauth-url"sv);
-	LuaOptions.AddOption("compute.upstream.horde.oauthclientid"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthClientId,
-						 "upstream-horde-oauth-clientid"sv);
-	LuaOptions.AddOption("compute.upstream.horde.oauthclientsecret"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthClientSecret,
-						 "upstream-horde-oauth-clientsecret"sv);
-	LuaOptions.AddOption("compute.upstream.horde.openidprovider"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.OpenIdProvider,
-						 "upstream-horde-openid-provider"sv);
-	LuaOptions.AddOption("compute.upstream.horde.token"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.AccessToken,
-						 "upstream-horde-token"sv);
-	LuaOptions.AddOption("compute.upstream.horde.cluster"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.Cluster,
-						 "upstream-horde-cluster"sv);
-	LuaOptions.AddOption("compute.upstream.horde.namespace"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.Namespace,
-						 "upstream-horde-namespace"sv);
-
-	////// compute storage
-	LuaOptions.AddOption("compute.upstream.storage.name"sv, ServerOptions.UpstreamCacheConfig.HordeConfig.Name);
-	LuaOptions.AddOption("compute.upstream.storage.url"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.Url,
-						 "upstream-horde-storage-oauth-url"sv);
-	LuaOptions.AddOption("compute.upstream.storage.oauthprovider"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthUrl,
-						 "upstream-horde-storage-oauth-url"sv);
-	LuaOptions.AddOption("compute.upstream.storage.oauthclientid"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthClientId,
-						 "upstream-horde-storage-oauth-clientid"sv);
-	LuaOptions.AddOption("compute.upstream.storage.oauthclientsecret"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthClientSecret,
-						 "upstream-horde-storage-oauth-clientsecret"sv);
-	LuaOptions.AddOption("compute.upstream.storage.openidprovider"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOpenIdProvider,
-						 "upstream-horde-storage-openid-provider"sv);
-	LuaOptions.AddOption("compute.upstream.storage.token"sv,
-						 ServerOptions.UpstreamCacheConfig.HordeConfig.StorageAccessToken,
-						 "upstream-horde-storage-token"sv);
-
 	LuaOptions.AddOption("gc.enabled"sv, ServerOptions.GcConfig.Enabled, "gc-enabled"sv);
 
 	LuaOptions.AddOption("gc.monitorintervalseconds"sv, ServerOptions.GcConfig.MonitorIntervalSeconds, "gc-monitor-interval-seconds"sv);
@@ -1208,13 +1157,6 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 					   cxxopts::value<int32_t>(ServerOptions.UpstreamCacheConfig.TimeoutMilliseconds)->default_value("0"),
 					   "");
 
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-url",
-					   "URL to a Horde instance.",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.Url)->default_value(""),
-					   "");
-
 	options.add_option("cache",
 					   "",
 					   "cache-write-log",
@@ -1257,98 +1199,6 @@ ParseCliOptions(int argc, char* argv[], ZenServerOptions& ServerOptions)
 					   cxxopts::value<uint64_t>(ServerOptions.StructuredCacheConfig.MemMaxAgeSeconds)->default_value("86400"),
 					   "");
 
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-oauth-url",
-					   "URL to the OAuth provier",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthUrl)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-oauth-clientid",
-					   "The OAuth client ID",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthClientId)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-oauth-clientsecret",
-					   "The OAuth client secret",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.OAuthClientSecret)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-openid-provider",
-					   "Name of a registered Open ID provider",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.OpenIdProvider)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-token",
-					   "A static authentication token",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.AccessToken)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-storage-url",
-					   "URL to a Horde Storage instance.",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageUrl)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-storage-oauth-url",
-					   "URL to the OAuth provier",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthUrl)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-storage-oauth-clientid",
-					   "The OAuth client ID",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthClientId)->default_value(""),
-					   "");
-
-	options.add_option(
-		"compute",
-		"",
-		"upstream-horde-storage-oauth-clientsecret",
-		"The OAuth client secret",
-		cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOAuthClientSecret)->default_value(""),
-		"");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-storage-openid-provider",
-					   "Name of a registered Open ID provider",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageOpenIdProvider)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-storage-token",
-					   "A static authentication token",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.StorageAccessToken)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-cluster",
-					   "The Horde compute cluster id",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.Cluster)->default_value(""),
-					   "");
-
-	options.add_option("compute",
-					   "",
-					   "upstream-horde-namespace",
-					   "The Jupiter namespace to use with Horde compute",
-					   cxxopts::value<std::string>(ServerOptions.UpstreamCacheConfig.HordeConfig.Namespace)->default_value(""),
-					   "");
-
 	options.add_option("gc",
 					   "",
 					   "gc-enabled",