translation/Response: move fields to struct ExecuteOptions

Author: MaxKellermann

libcommon

@@ -12,6 +12,7 @@
 #include "AllocatorPtr.hxx"
 #include "translation/CronGlue.hxx"
 #include "translation/Response.hxx"
+#include "translation/ExecuteOptions.hxx"
 #include "lib/fmt/RuntimeError.hxx"
 #include "spawn/Prepared.hxx"
 #include "spawn/Interface.hxx"
@@ -175,10 +176,9 @@ MakeSpawnOperator(EventLoop &event_loop, SpawnService &spawn_service,
 		  LazyDomainLogger &logger,
 		  AllocatorPtr alloc,
 		  const CronJob &job, const char *command,
-		  const TranslateResponse &response)
+		  const ExecuteOptions &options,
+		  const char *_site)
 {
-	assert(response.status == HttpStatus{});
-
 	/* prepare the child process */
 
 	FdHolder close_fds;
@@ -190,33 +190,33 @@ MakeSpawnOperator(EventLoop &event_loop, SpawnService &spawn_service,
 		p.args.push_back(command);
 	}
 
-	if (response.child_options.uid_gid.IsEmpty() && !debug_mode)
+	if (options.child_options.uid_gid.IsEmpty() && !debug_mode)
 		throw std::runtime_error("No UID_GID from translation server");
 
 	if (command == nullptr) {
-		if (response.execute == nullptr)
+		if (options.execute == nullptr)
 			throw std::runtime_error("No EXECUTE from translation server");
 
-		p.args.push_back(response.execute);
+		p.args.push_back(options.execute);
 
-		for (const char *arg : response.args) {
+		for (const char *arg : options.args) {
 			if (p.args.size() >= 4096)
 				throw std::runtime_error("Too many APPEND packets from translation server");
 
 			p.args.push_back(arg);
 		}
 	}
 
-	response.child_options.CopyTo(p, close_fds);
+	options.child_options.CopyTo(p, close_fds);
 
 	if (p.cgroup != nullptr && p.cgroup->name != nullptr)
 		p.cgroup_session = job.id.c_str();
 
 	/* create operator object */
 
 	std::string_view site = job.account_id;
-	if (response.site != nullptr)
-		site = response.site;
+	if (_site != nullptr)
+		site = _site;
 
 	auto o = std::make_unique<CronSpawnOperator>(logger);
 	co_await o->Spawn(event_loop, spawn_service, alloc,
@@ -270,23 +270,28 @@ CronWorkplace::Running::MakeOperator(SocketAddress translation_socket,
 				      static_cast<unsigned>(response.status));
 	}
 
+	if (response.execute_options == nullptr)
+		throw std::runtime_error{"No spawner options from translation server"};
+
+	const auto &options = *response.execute_options;
+
 	if (response.site != nullptr)
 		site = response.site;
 
-	if (!response.child_options.tag.empty())
-		tag = response.child_options.tag;
+	if (!options.child_options.tag.empty())
+		tag = options.child_options.tag;
 
 	if (response.timeout.count() > 0)
 		timeout_event.Schedule(response.timeout);
 
-	child_options = {ShallowCopy{}, response.child_options};
+	child_options = {ShallowCopy{}, options.child_options};
 
 	if (IsURL(job.command))
 		co_return co_await MakeCurlOperator(GetEventLoop(),
 						    workplace.GetSpawnService(),
 						    job,
 						    job.command.c_str(),
-						    response.child_options);
+						    options.child_options);
 	else
 		co_return co_await MakeSpawnOperator(GetEventLoop(),
 						     workplace.GetSpawnService(),
@@ -295,7 +300,7 @@ CronWorkplace::Running::MakeOperator(SocketAddress translation_socket,
 						     alloc,
 						     job,
 						     uri == nullptr ? job.command.c_str() : nullptr,
-						     response);
+						     options, response.site);
 }
 
 inline Co::InvokeTask

src/cron/Workplace.cxx

@@ -11,6 +11,7 @@
 #include "Job.hxx"
 #include "LogBridge.hxx"
 #include "translation/Response.hxx"
+#include "translation/ExecuteOptions.hxx"
 #include "translation/SpawnClient.hxx"
 #include "lib/fmt/RuntimeError.hxx"
 #include "spawn/Interface.hxx"
@@ -275,30 +276,33 @@ DoSpawn(SpawnService &service, AllocatorPtr alloc,
 				      static_cast<unsigned>(response.status));
 	}
 
-	if (response.execute == nullptr)
+	if (response.execute_options == nullptr ||
+	    response.execute_options->execute == nullptr)
 		throw std::runtime_error("No EXECUTE from translation server");
 
-	if (response.child_options.uid_gid.IsEmpty())
+	const auto &options = *response.execute_options;
+
+	if (options.child_options.uid_gid.IsEmpty())
 		throw std::runtime_error("No UID_GID from translation server");
 
 	FdHolder close_fds;
 	PreparedChildProcess p;
-	p.args.push_back(alloc.Dup(response.execute));
+	p.args.push_back(alloc.Dup(options.execute));
 
 	if (stderr_w.IsDefined())
 		p.stderr_fd = p.stdout_fd = stderr_w;
 
 	UniqueSocketDescriptor return_pidfd;
 	std::tie(return_pidfd, p.return_pidfd) = CreateSocketPair(SOCK_SEQPACKET);
 
-	for (const char *arg : response.args) {
+	for (const char *arg : options.args) {
 		if (p.args.size() >= 4096)
 			throw std::runtime_error("Too many APPEND packets from translation server");
 
 		p.args.push_back(alloc.Dup(arg));
 	}
 
-	response.child_options.CopyTo(p, close_fds);
+	options.child_options.CopyTo(p, close_fds);
 
 	if (p.umask == -1)
 		p.umask = plan.umask;