Added AGENT_APPLICATION_NAME similar to the controller name

FamilySearch · Sep 29, 2023 · 2937b26 · 2937b26
1 parent cd9b887
commit 2937b26
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/common/src/util/sqs.ts b/common/src/util/sqs.ts
@@ -1,4 +1,9 @@
-import { AGENT_ENV, SYSTEM_NAME, getPrefix } from "./util";
+import {
+  AGENT_APPLICATION_NAME,
+  AGENT_ENV,
+  SYSTEM_NAME,
+  getPrefix
+} from "./util";
 import {
   ChangeMessageVisibilityCommand,
   ChangeMessageVisibilityCommandInput,
@@ -43,7 +48,7 @@ export function init () {
       // Controller should have this env variable from the deployment
       const systemNames: string[] = AGENT_ENV.split(",");
       for (const systemName of systemNames) {
-        const PREFIX: string = "PEWPEWAGENT_" + systemName.toUpperCase().replace("-", "_");
+        const PREFIX: string = (AGENT_APPLICATION_NAME + "_" + systemName).toUpperCase().replace("-", "_");
         const queueUrlTest: string | undefined = process.env[`${PREFIX}_SQS_SCALE_OUT_QUEUE_URL`];
         log(`${PREFIX}_SQS_SCALE_OUT_QUEUE_URL = ${queueUrlTest}`, LogLevel.DEBUG);
         if (!queueUrlTest) {
@@ -72,7 +77,7 @@ export function init () {
       // Controller should have this env variable from the deployment
       const systemNames: string[] = AGENT_ENV.split(",");
       for (const systemName of systemNames) {
-        const PREFIX: string = "PEWPEWAGENT_" + systemName.toUpperCase().replace("-", "_");
+        const PREFIX: string = (AGENT_APPLICATION_NAME + "_" + systemName).toUpperCase().replace("-", "_");
         const queueUrlTest: string | undefined = process.env[`${PREFIX}_SQS_SCALE_IN_QUEUE_URL`];
         log(`${PREFIX}_SQS_SCALE_IN_QUEUE_URL = ${queueUrlTest}`, LogLevel.DEBUG);
         if (!queueUrlTest) {

diff --git a/common/src/util/util.ts b/common/src/util/util.ts
@@ -4,6 +4,7 @@ import { LogLevel, log } from "./log";
 
 export const APPLICATION_NAME: string = process.env.APPLICATION_NAME || "pewpewagent";
 export const CONTROLLER_APPLICATION_NAME: string = process.env.CONTROLLER_APPLICATION_NAME || "pewpewcontroller";
+export const AGENT_APPLICATION_NAME: string = process.env.AGENT_APPLICATION_NAME || "pewpewagent";
 export const CONTROLLER_APPLICATION_PREFIX: string = CONTROLLER_APPLICATION_NAME.toUpperCase().replace(/-/g, "_") + "_";
 export const SYSTEM_NAME: string = process.env.SYSTEM_NAME || "unittests";
 export const CONTROLLER_ENV = process.env.CONTROLLER_ENV;