From 8d17a44d4e6725eb0de611c5a9323787fedb2c11 Mon Sep 17 00:00:00 2001 From: Loris Moulin <45130584+l0r1s@users.noreply.github.com> Date: Tue, 2 May 2023 16:31:45 +0300 Subject: [PATCH] feat: added display of DB snapshot in table when booting nodes (#990) * feat: added display of DB snapshot in table when booting nodes * chore: made table first column width uniform across providers * chore: fix linting issues --- .../orchestrator/src/providers/k8s/kubeClient.ts | 12 ++++++++---- .../src/providers/native/nativeClient.ts | 12 +++++++++--- .../src/providers/podman/podmanClient.ts | 12 +++++++++--- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts b/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts index 4b28aba76..d862b87ae 100644 --- a/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts +++ b/javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts @@ -117,10 +117,10 @@ export class KubeClient extends Client { writeLocalJsonFile(this.tmpDir, `${name}.json`, podDef); let logTable = new CreateLogTable({ - colWidths: [20, 100], + colWidths: [25, 100], }); - logTable.pushTo([ + const logs = [ [decorators.cyan("Pod"), decorators.green(name)], [decorators.cyan("Status"), decorators.green("Launching")], [ @@ -131,9 +131,13 @@ export class KubeClient extends Client { decorators.cyan("Command"), decorators.white(podDef.spec.containers[0].command.join(" ")), ], - ]); + ]; - logTable.print(); + if (dbSnapshot) { + logs.push([decorators.cyan("DB Snapshot"), decorators.green(dbSnapshot)]); + } + + logTable.pushToPrint(logs); await this.createResource(podDef, true); if (podDef.metadata.labels["zombie-role"] !== ZombieRole.Temp) { diff --git a/javascript/packages/orchestrator/src/providers/native/nativeClient.ts b/javascript/packages/orchestrator/src/providers/native/nativeClient.ts index 8f0b15318..b29acf68d 100644 --- a/javascript/packages/orchestrator/src/providers/native/nativeClient.ts +++ b/javascript/packages/orchestrator/src/providers/native/nativeClient.ts @@ -272,17 +272,23 @@ export class NativeClient extends Client { }; let logTable = new CreateLogTable({ - colWidths: [20, 100], + colWidths: [25, 100], }); - logTable.pushToPrint([ + const logs = [ [decorators.cyan("Pod"), decorators.green(name)], [decorators.cyan("Status"), decorators.green("Launching")], [ decorators.cyan("Command"), decorators.white(podDef.spec.command.join(" ")), ], - ]); + ]; + + if (dbSnapshot) { + logs.push([decorators.cyan("DB Snapshot"), decorators.green(dbSnapshot)]); + } + + logTable.pushToPrint(logs); if (dbSnapshot) { // we need to get the snapshot from a public access diff --git a/javascript/packages/orchestrator/src/providers/podman/podmanClient.ts b/javascript/packages/orchestrator/src/providers/podman/podmanClient.ts index 9633ab31d..17d5725ad 100644 --- a/javascript/packages/orchestrator/src/providers/podman/podmanClient.ts +++ b/javascript/packages/orchestrator/src/providers/podman/podmanClient.ts @@ -353,17 +353,23 @@ export class PodmanClient extends Client { const name = podDef.metadata.name; let logTable = new CreateLogTable({ - colWidths: [20, 100], + colWidths: [25, 100], }); - logTable.pushToPrint([ + const logs = [ [decorators.cyan("Pod"), decorators.green(podDef.metadata.name)], [decorators.cyan("Status"), decorators.green("Launching")], [ decorators.cyan("Command"), decorators.white(podDef.spec.containers[0].command.join(" ")), ], - ]); + ]; + + if (dbSnapshot) { + logs.push([decorators.cyan("DB Snapshot"), decorators.green(dbSnapshot)]); + } + + logTable.pushToPrint(logs); // initialize keystore const dataPath = podDef.spec.volumes.find(