update parse env and docker image (#56)

.changeset/config.json

@@ -7,5 +7,5 @@
  "access": "public",
  "baseBranch": "main",
  "updateInternalDependencies": "patch",
- "ignore": ["docs"]
+ "ignore": ["docs", "e2e"]
 }

.changeset/itchy-geckos-pay.md

@@ -0,0 +1,5 @@
+---
+"@gateweaver/server": patch
+---
+
+Update parse env and docker image

Dockerfile

@@ -14,4 +14,4 @@ FROM base
 COPY --from=build /prod/server /app
 WORKDIR /app
 EXPOSE 8080
-CMD [ "pnpm", "start" ]
+CMD [ "node", "./dist/main.js" ]

packages/server/src/config/parse-config.test.ts

@@ -1,16 +1,14 @@
 import fs from "fs";
 import { parseConfig } from "./parse-config";
-import { validateConfig } from "./validate-config";
+import { InvalidConfigError, validateConfig } from "./validate-config";
 
 jest.mock("fs");
 jest.mock("./validate-config");
 
 describe("parseConfig", () => {
- const mockEnv = { TEST_VAR: "value" };
-
  beforeEach(() => {
  jest.resetAllMocks();
- process.env = { ...mockEnv }; // Reset environment variables for each test
+ process.env.TEST_VAR = "test value";
  });
 
  it("should correctly identify and parse a file with .yaml extension", () => {
@@ -41,7 +39,7 @@ describe("parseConfig", () => {
  it("should replace environment variables in the file content before validating", () => {
  const configPath = "config";
  const fullPath = `${configPath}.yml`;
- const mockConfig = { endpoints: "value" };
+ const mockConfig = { endpoints: "test value" };
 
  (fs.existsSync as jest.Mock).mockReturnValue(true);
  (fs.readFileSync as jest.Mock).mockReturnValue("endpoints: ${TEST_VAR}");
@@ -51,4 +49,13 @@ describe("parseConfig", () => {
  expect(fs.readFileSync).toHaveBeenCalledWith(fullPath, "utf8");
  expect(validateConfig).toHaveBeenCalledWith(mockConfig);
  });
+
+ it("should throw an InvalidConfigError if an environment variable is not found", () => {
+ const configPath = "config";
+
+ (fs.existsSync as jest.Mock).mockReturnValue(true);
+ (fs.readFileSync as jest.Mock).mockReturnValue("endpoints: ${MISSING_VAR}");
+
+ expect(() => parseConfig(configPath)).toThrow(InvalidConfigError);
+ });
 });

packages/server/src/config/parse-config.ts

@@ -1,8 +1,16 @@
 import fs from "fs";
 import YAML from "yaml";
-import { validateConfig } from "./validate-config";
+import { InvalidConfigError, validateConfig } from "./validate-config";
 import { Config } from "./config.types";
 
+export const parseEnv = (value: string): string => {
+ if (!process.env[value]) {
+ throw new InvalidConfigError(`Environment variable "${value}" not found.`);
+ }
+
+ return process.env[value]!;
+};
+
 export const parseConfig = (filePath: string): Config => {
  const extensions = [".yml", ".yaml"];
 
@@ -24,7 +32,7 @@ export const parseConfig = (filePath: string): Config => {
 
  const file = fs
  .readFileSync(finalPath, "utf8")
- .replace(/\$\{(.+?)\}/g, (match, name) => process.env[name] || match);
+ .replace(/\$\{(.+?)\}/g, (_, value) => parseEnv(value));
 
  const config = YAML.parse(file);