Fix issue with new secrets system (#395)

* Check for null secrets before attempting to replace them.

* Make things work when no secrets are specified

* Fix missing return statement

* Make settings work when the alternate location is used instead

* Fix unit tests

Author: danecreekphotography

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 5.5.1
+
+- Resolve an issue where the system fails to start if no secrets file exists but the existing `settings.json` or `triggers.json` file uses
+  mustache templates, or when the secrets method of loading the settings file isn't used. Resolves [issue 394](https://github.com/danecreekphotography/node-deepstackai-trigger/issues/394).
+
 ## 5.5.0
 
 - Secrets can now be stored in a separate `secrets.json` file and inserted in `settings.json` and `triggers.json` via mustache templates. Resolves

src/helpers.ts

@@ -28,6 +28,9 @@ function parseFile(serviceName: string, fileType: string, filePath: string) {
  * @type T The type the settings should return as.
  */
 function replaceSecrets<T>(settings: T, secrets: { a: string }) {
+  // If no secrets were provided don't attempt to do a replacement
+  if (!secrets) return settings;
+
   return JSONC.parse(Mustache.render(JSON.stringify(settings), secrets));
 }
 
@@ -40,7 +43,8 @@ function replaceSecrets<T>(settings: T, secrets: { a: string }) {
 export function readSettings<T>(serviceName: string, serviceFilePath: string, secretsFilePath = ""): T {
   const settings = parseFile(serviceName, "settings", serviceFilePath);
   if (!settings) {
-    throw new Error(`[${serviceName}] Unable to load file ${serviceFilePath}.`);
+    log.warn(serviceName, `Unable to load file ${serviceFilePath}.`);
+    return null;
   }
   const secrets = parseFile(serviceName, "secrets", secretsFilePath);
   return replaceSecrets<T>(settings, secrets);

tests/helpers.test.ts

@@ -90,16 +90,19 @@ describe("helpers", () => {
     expect(actualSettings).toEqual(expectedSettings);
   });
 
-  test("Verify throws if settings.json empty", () => {
+  test("Verify logs with message if settings.json empty", () => {
     const expectedSettings = "";
     writeFileSync(settingsFilePath, expectedSettings);
 
-    expect(() => {
-      helpers.readSettings(serviceName, settingsFilePath);
-    }).toThrow(Error);
+    helpers.readSettings(serviceName, settingsFilePath);
+
+    //eslint-disable-next-line no-console
+    expect(console.log).toHaveBeenCalledWith(
+      expect.stringContaining(`[${serviceName}] Unable to read the settings file: ENOENT: no such file or directory`),
+    );
   });
 
-  test("Verify throws with message if settings.json empty", () => {
+  test("Verify logs with message with message if settings.json empty", () => {
     const expectedSettings = "";
     writeFileSync(settingsFilePath, expectedSettings);