[FEATURE] Very basic server updates
This commit is contained in:
parent
23efaafe1d
commit
eb53e56dc7
16 changed files with 255 additions and 14 deletions
|
@ -4,8 +4,9 @@ import {
|
|||
createServerEntry,
|
||||
deleteServerEntry,
|
||||
getServerEntry,
|
||||
modifyServerEntry,
|
||||
} from "../database/queries/server-queries.js";
|
||||
import { sendError } from "../util/ExpressClientError.js";
|
||||
import ExpressClientError, { sendError } from "../util/ExpressClientError.js";
|
||||
import { toggleServer } from "../k8s/k8s-server-control.js";
|
||||
|
||||
const dnsRegex = new RegExp(
|
||||
|
@ -18,6 +19,8 @@ function payloadFilter(req, res) {
|
|||
const { name, host, version, serverType, memory, extraPorts } = serverSpec;
|
||||
const { backupHost, backupBucket, backupId, backupKey, backupInterval } =
|
||||
serverSpec;
|
||||
console.log("GOT VVV");
|
||||
console.log(serverSpec);
|
||||
if (!name) return res.status(400).send("Server name is required!");
|
||||
if (!host) return res.status(400).send("Server host is required!");
|
||||
if (!dnsRegex.test(host)) return res.status(400).send("Hostname invalid!");
|
||||
|
@ -117,3 +120,30 @@ export async function stopServer(req, res) {
|
|||
.then(() => res.sendStatus(200))
|
||||
.catch(sendError(res));
|
||||
}
|
||||
|
||||
export async function getServer(req, res) {
|
||||
// Ensure spec is safe
|
||||
const serverSpec = req.body;
|
||||
try {
|
||||
checkServerId(serverSpec);
|
||||
} catch (e) {
|
||||
return sendError(res)(e);
|
||||
}
|
||||
const { id } = serverSpec;
|
||||
getServerEntry(id).then((s) => res.json(s));
|
||||
}
|
||||
|
||||
export async function modifyServer(req, res) {
|
||||
if (payloadFilter(req, res) !== "filtered") return;
|
||||
const serverSpec = req.body;
|
||||
try {
|
||||
checkServerId(serverSpec);
|
||||
const serverEntry = await modifyServerEntry(serverSpec);
|
||||
console.log("NEW ENTRY");
|
||||
console.log(serverEntry);
|
||||
// await createServerResources(serverEntry);
|
||||
res.sendStatus(200);
|
||||
} catch (e) {
|
||||
sendError(res)(e);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,10 @@
|
|||
import pg from "../postgres.js";
|
||||
import { deleteQuery, insertQuery, selectWhereQuery } from "../pg-query.js";
|
||||
import {
|
||||
deleteQuery,
|
||||
insertQuery,
|
||||
selectWhereQuery,
|
||||
updateWhereAllQuery,
|
||||
} from "../pg-query.js";
|
||||
import ExpressClientError from "../../util/ExpressClientError.js";
|
||||
const table = "servers";
|
||||
|
||||
|
@ -128,6 +133,45 @@ export async function getServerEntry(serverId) {
|
|||
}
|
||||
}
|
||||
|
||||
export async function modifyServerEntry(serverSpec) {
|
||||
const {
|
||||
id,
|
||||
name,
|
||||
host,
|
||||
version,
|
||||
serverType: server_type,
|
||||
memory,
|
||||
extraPorts: extra_ports,
|
||||
backupEnabled: backup_enabled,
|
||||
backupHost: backup_host,
|
||||
backupBucket: backup_bucket_path,
|
||||
backupId: backup_id,
|
||||
backupKey: backup_key,
|
||||
backupInterval: backup_interval,
|
||||
} = serverSpec;
|
||||
|
||||
const q = updateWhereAllQuery(
|
||||
table,
|
||||
{
|
||||
name,
|
||||
host,
|
||||
version,
|
||||
server_type,
|
||||
memory,
|
||||
extra_ports,
|
||||
backup_enabled,
|
||||
backup_host,
|
||||
backup_bucket_path,
|
||||
backup_id,
|
||||
backup_key,
|
||||
backup_interval,
|
||||
},
|
||||
{ id },
|
||||
);
|
||||
|
||||
return pg.query(q);
|
||||
}
|
||||
|
||||
export async function getServerEntries() {
|
||||
const q = `SELECT * FROM ${table}`;
|
||||
return pg.query(q);
|
||||
|
|
|
@ -4,6 +4,8 @@ import {
|
|||
deleteServer,
|
||||
startServer,
|
||||
stopServer,
|
||||
getServer,
|
||||
modifyServer,
|
||||
} from "../controllers/lifecycle-controller.js";
|
||||
import {
|
||||
serverInstances,
|
||||
|
@ -18,4 +20,6 @@ router.post("/start", startServer);
|
|||
router.post("/stop", stopServer);
|
||||
router.get("/list", serverList);
|
||||
router.get("/instances", serverInstances);
|
||||
router.post("/blueprint", getServer);
|
||||
router.post("/modify", modifyServer);
|
||||
export default router;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue