From edbfc2348ae462ed6f8b7d4926940d9470087f25 Mon Sep 17 00:00:00 2001
From: dunemask <elijah@dunemask.net>
Date: Sun, 4 Feb 2024 04:59:38 +0000
Subject: [PATCH] [FEATURE] Basic changes for basic testing in cubit (#11)

Co-authored-by: Dunemask <dunemask@gmail.com>
Reviewed-on: https://gitea.dunemask.dev/elysium/minecluster/pulls/11
---
 lib/controllers/lifecycle-controller.js | 2 +-
 lib/k8s/server-status.js                | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/controllers/lifecycle-controller.js b/lib/controllers/lifecycle-controller.js
index ceede86..47acb41 100644
--- a/lib/controllers/lifecycle-controller.js
+++ b/lib/controllers/lifecycle-controller.js
@@ -84,7 +84,7 @@ export async function createServer(req, res) {
   try {
     const serverEntry = await createServerEntry(serverSpec);
     await createServerResources(serverEntry);
-    res.sendStatus(200);
+    res.json(serverEntry);
   } catch (e) {
     sendError(res)(e);
   }
diff --git a/lib/k8s/server-status.js b/lib/k8s/server-status.js
index 6317d8e..43f00af 100644
--- a/lib/k8s/server-status.js
+++ b/lib/k8s/server-status.js
@@ -39,7 +39,7 @@ function getServerStatus(server) {
     ) !== undefined;
   const serverAvailable = services.includes(`server`) && deploymentAvailable;
   const ftpAvailable = services.includes("ftp"); // TODO this needs some handling for container creation
-  return { serverAvailable, ftpAvailable, services };
+  return { serverAvailable, ftpAvailable, services, deploymentAvailable };
 }
 
 export async function getInstances() {
@@ -53,15 +53,18 @@ export async function getInstances() {
   const serverInstances = serverDeployments.map((s) => {
     serverId = s.metadata.annotations["minecluster.dunemask.net/id"];
     const entry = entries.find((e) => e.id === serverId);
-    const { ftpAvailable, serverAvailable, services } = getServerStatus(s);
+    const { ftpAvailable, serverAvailable, services, deploymentAvailable } =
+      getServerStatus(s);
     metrics = getServerMetrics(podMetricsRes, serverId, serverAvailable);
     return {
       name: !!entry ? entry.name : "Unknown",
+      host: !!entry ? entry.host : "Unkonwn",
       id: serverId,
       metrics,
       services,
       serverAvailable,
       ftpAvailable,
+      deploymentAvailable,
     };
   });
   return serverInstances;