Merge pull request #80 from biomage-org/add-batch-datadog-env

[BIOMAGE-2264] - Pass datadog keys to batch
hms-dbmi-cellenics · Jan 3, 2023 · b757271 · b757271
2 parents 0d8ee5a + a594921
commit b757271
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 4 deletions.
diff --git a/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/submitBatchJob.js b/src/api.v2/helpers/pipeline/pipelineConstruct/constructors/submitBatchJob.js
@@ -20,6 +20,10 @@ const submitBatchJob = (context, step) => {
       JobQueue: `queue-pipeline-${environment}`,
       ContainerOverrides: {
         Environment: [
+          {
+            Name: 'EXPERIMENT_ID',
+            Value: `${experimentId}`,
+          },
           {
             Name: 'ACTIVITY_ARN',
             Value: `${activityArn}`,
@@ -49,8 +53,12 @@ const submitBatchJob = (context, step) => {
             Value: `${config.domainName}`,
           },
           {
-            Name: 'EXPERIMENT_ID',
-            Value: `${experimentId}`,
+            Name: 'DD_API_KEY',
+            Value: `${config.datadogApiKey}`,
+          },
+          {
+            Name: 'DD_APP_KEY',
+            Value: `${config.datadogAppKey}`,
           },
         ],
         ResourceRequirements: [

diff --git a/src/config/default-config.js b/src/config/default-config.js
@@ -70,6 +70,9 @@ const config = {
   corsOriginUrl: [...externalOrigins, `https://${domainName}`],
   emailDomainName: `https://${domainName}`,
   publicApiUrl: `https://api.${domainName}`,
+  // Used for Batch reporting
+  datadogApiKey: process.env.DD_API_KEY || '',
+  datadogAppKey: process.env.DD_APP_KEY || '',
 };
 
 // We are in permanent develop staging environment

diff --git a/src/config/test-config.js b/src/config/test-config.js
@@ -21,4 +21,6 @@ module.exports = {
   },
   cachingEnabled: false,
   publicApiUrl: 'test-public-api-url',
+  datadogApiKey: 'test-datadog-api-key',
+  datadogAppKey: 'test-datadog-app-key',
 };
diff --git a/tests/api.v2/helpers/pipeline/__snapshots__/stateMachineSkeletons.test.js.snap b/tests/api.v2/helpers/pipeline/__snapshots__/stateMachineSkeletons.test.js.snap
@@ -1031,6 +1031,10 @@ exports[`non-tests to document the State Machines - qc production with specific
         "JobQueue": "queue-pipeline-production",
         "ContainerOverrides": {
           "Environment": [
+            {
+              "Name": "EXPERIMENT_ID",
+              "Value": "mock-experiment-id"
+            },
             {
               "Name": "ACTIVITY_ARN",
               "Value": "arn:aws:states:eu-west-1:28592648592:activity:biomage-qc-production-39249897-cfce-402b-a617-e58fbf251713"
@@ -1060,8 +1064,12 @@ exports[`non-tests to document the State Machines - qc production with specific
               "Value": "scp.biomage.net"
             },
             {
-              "Name": "EXPERIMENT_ID",
-              "Value": "mock-experiment-id"
+              "Name": "DD_API_KEY",
+              "Value": "test-datadog-api-key"
+            },
+            {
+              "Name": "DD_APP_KEY",
+              "Value": "test-datadog-app-key"
             }
           ],
           "ResourceRequirements": [

diff --git a/tests/config/__snapshots__/default-config-production.test.js.snap b/tests/config/__snapshots__/default-config-production.test.js.snap
@@ -19,6 +19,8 @@ Object {
     "https://elabjournal.com",
     "https://localhost:5000",
   ],
+  "datadogApiKey": "",
+  "datadogAppKey": "",
   "domainName": "localhost:5000",
   "emailDomainName": "https://localhost:5000",
   "pipelineInstanceConfigUrl": "https://raw.githubusercontent.com/biomage-org/releases/master/production/pipeline.yaml",

diff --git a/tests/config/__snapshots__/default-config-staging-sandboxid.test.js.snap b/tests/config/__snapshots__/default-config-staging-sandboxid.test.js.snap
@@ -19,6 +19,8 @@ Object {
     "https://elabjournal.com",
     "https://ui-mockedSandboxId.scp-staging.biomage.net",
   ],
+  "datadogApiKey": "",
+  "datadogAppKey": "",
   "domainName": "scp-staging.biomage.net",
   "emailDomainName": "https://ui-mockedSandboxId.scp-staging.biomage.net",
   "pipelineInstanceConfigUrl": "https://raw.githubusercontent.com/biomage-org/releases/master/staging/mockedSandboxId.yaml",

diff --git a/tests/config/__snapshots__/default-config-staging.test.js.snap b/tests/config/__snapshots__/default-config-staging.test.js.snap
@@ -19,6 +19,8 @@ Object {
     "https://elabjournal.com",
     "https://ui-default.scp-staging.biomage.net",
   ],
+  "datadogApiKey": "",
+  "datadogAppKey": "",
   "domainName": "scp-staging.biomage.net",
   "emailDomainName": "https://ui-default.scp-staging.biomage.net",
   "pipelineInstanceConfigUrl": "https://raw.githubusercontent.com/biomage-org/releases/master/staging/pipeline.yaml",