Merge remote-tracking branch 'origin/main' into local-data-deletion

nmshd · Dec 11, 2024 · 6772fbe · 6772fbe
2 parents 5671fd3 + 697f11f
commit 6772fbe
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -4,7 +4,7 @@ changelog:
       - ci
       - chore
       - dependencies
-      - refactor
+      - refactoring
       - test
   categories:
     - title: Breaking Changes

diff --git a/packages/transport/test/testHelpers/TestUtil.ts b/packages/transport/test/testHelpers/TestUtil.ts
@@ -656,24 +656,27 @@ export class TestUtil {
     }
 
     public static async runDeletionJob(): Promise<void> {
-        const backboneVersion = this.getBackboneEnvVar("BACKBONE_VERSION");
+        const backboneVersion = this.getBackboneVersion();
+        const appsettingsOverrideLocation = process.env.APPSETTINGS_OVERRIDE_LOCATION ?? `${__dirname}/../../../../.dev/appsettings.override.json`;
 
         await new GenericContainer(`ghcr.io/nmshd/backbone-identity-deletion-jobs:${backboneVersion}`)
             .withWaitStrategy(Wait.forOneShotStartup())
             .withCommand(["--Worker", "ActualDeletionWorker"])
             .withNetworkMode("backbone")
-            .withCopyFilesToContainer([{ source: `${__dirname}/../../../../.dev/appsettings.override.json`, target: "/app/appsettings.override.json" }])
+            .withCopyFilesToContainer([{ source: appsettingsOverrideLocation, target: "/app/appsettings.override.json" }])
             .start();
     }
 
-    private static getBackboneEnvVar(name: string) {
+    private static getBackboneVersion() {
+        if (process.env.BACKBONE_VERSION) return process.env.BACKBONE_VERSION;
+
         const envFile = fs.readFileSync(path.resolve(`${__dirname}/../../../../.dev/compose.backbone.env`));
         const env = envFile
             .toString()
             .split("\n")
             .map((line) => line.split("="))
             .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {} as Record<string, string>);
 
-        return env[name];
+        return env["BACKBONE_VERSION"];
     }
 }