From eff0684b1d0904198129de304a3512c7d5ee91ac Mon Sep 17 00:00:00 2001
From: Nikos Kontakis <wirednkod@gmail.com>
Date: Sat, 8 Apr 2023 17:44:26 +0300
Subject: [PATCH] Fix resources bug (#907)

* Fix prometheus and tempo resources write

* fix(orchestrator): build and some typos

---------

Co-authored-by: Javier Viola <javier@parity.io>
---
 javascript/packages/orchestrator/package.json            | 3 ++-
 .../src/providers/podman/resources/grafanaResource.ts    | 9 ++++++---
 .../src/providers/podman/resources/prometheusResource.ts | 6 +++---
 .../src/providers/podman/resources/tempoResource.ts      | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/javascript/packages/orchestrator/package.json b/javascript/packages/orchestrator/package.json
index b6cf275b9..c0c590a79 100644
--- a/javascript/packages/orchestrator/package.json
+++ b/javascript/packages/orchestrator/package.json
@@ -14,7 +14,8 @@
   },
   "scripts": {
     "clean": "rm -rf ./dist/*",
-    "build": "tsc",
+    "build": "tsc && npm run copy:podman",
+    "copy:podman": "cp -r src/providers/podman/resources/configs dist/providers/podman/resources",
     "lint": "npx prettier --check ./src",
     "lint:write": "npx prettier --write ./src",
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/javascript/packages/orchestrator/src/providers/podman/resources/grafanaResource.ts b/javascript/packages/orchestrator/src/providers/podman/resources/grafanaResource.ts
index 072b25063..5c1967201 100644
--- a/javascript/packages/orchestrator/src/providers/podman/resources/grafanaResource.ts
+++ b/javascript/packages/orchestrator/src/providers/podman/resources/grafanaResource.ts
@@ -1,4 +1,4 @@
-import { getRandomPort, makeDir } from "@zombienet/utils";
+import { decorators, getRandomPort, makeDir } from "@zombienet/utils";
 import fs from "fs/promises";
 import path from "path";
 import { Client } from "../../client";
@@ -56,8 +56,11 @@ export class GrafanaResource {
         `${this.dataSourcesPath}/prometheus.yml`,
         grafanaConfig,
       );
-    } catch {
-      throw new Error("Error generating config for grafana resource");
+    } catch (err) {
+      console.error(
+        decorators.red("Error generating config for grafana resource"),
+      );
+      throw err;
     }
   }
 
diff --git a/javascript/packages/orchestrator/src/providers/podman/resources/prometheusResource.ts b/javascript/packages/orchestrator/src/providers/podman/resources/prometheusResource.ts
index d46db7aed..ac9e73efa 100644
--- a/javascript/packages/orchestrator/src/providers/podman/resources/prometheusResource.ts
+++ b/javascript/packages/orchestrator/src/providers/podman/resources/prometheusResource.ts
@@ -15,7 +15,7 @@ export class PrometheusResource {
   private readonly dataPath: string;
 
   constructor(client: Client, private readonly namespace: string) {
-    const nodeRootPath = `${client.tmpDir}/prometeus`;
+    const nodeRootPath = `${client.tmpDir}/prometheus`;
     this.configPath = `${nodeRootPath}/etc`;
     this.dataPath = `${nodeRootPath}/data`;
   }
@@ -44,9 +44,9 @@ export class PrometheusResource {
         __dirname,
         "./configs/prometheus.yml",
       );
-      await fs.copyFile(
-        templateConfigPath,
+      await fs.writeFile(
         `${this.configPath}/prometheus.yml`,
+        templateConfigPath,
       );
     } catch {
       throw new Error("Error generating config for prometheus resource");
diff --git a/javascript/packages/orchestrator/src/providers/podman/resources/tempoResource.ts b/javascript/packages/orchestrator/src/providers/podman/resources/tempoResource.ts
index aab14cc29..ccedc73dd 100644
--- a/javascript/packages/orchestrator/src/providers/podman/resources/tempoResource.ts
+++ b/javascript/packages/orchestrator/src/providers/podman/resources/tempoResource.ts
@@ -38,7 +38,7 @@ export class TempoResource {
         __dirname,
         `./configs/tempo.yaml`,
       );
-      await fs.copyFile(templateConfigPath, `${this.configPath}/tempo.yaml`);
+      await fs.writeFile(`${this.configPath}/tempo.yaml`, templateConfigPath);
     } catch {
       throw new Error("Error generating config for tempo resource");
     }