single source of truth for env var (#864)

w3c · Dec 7, 2023 · eb9f3b0 · eb9f3b0
1 parent a0563b0
commit eb9f3b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/server/app.js b/server/app.js
@@ -46,6 +46,8 @@ listener.route('/aria-at/:branch*').get(
 // Conditionally initialize github workflow service, or mock automation scheduler
 if (
     process.env.ENVIRONMENT === 'production' ||
+    process.env.ENVIRONMENT === 'staging' ||
+    process.env.ENVIRONMENT === 'sandbox' ||
     process.env.AUTOMATION_CALLBACK_FQDN
 ) {
     require('./services/GithubWorkflowService').setup();

diff --git a/server/models/services/CollectionJobService.js b/server/models/services/CollectionJobService.js
@@ -29,7 +29,8 @@ const { HttpQueryError } = require('apollo-server-core');
 const { runnableTests } = require('../../resolvers/TestPlanReport');
 const { default: axios } = require('axios');
 const {
-    default: createGithubWorkflow
+    default: createGithubWorkflow,
+    isEnabled: isGithubWorkflowEnabled,
 } = require('../../services/GithubWorkflowService');
 
 const includeBrowserVersion = {
@@ -83,11 +84,6 @@ const axiosConfig = {
     timeout: 1000
 };
 
-const automationSchedulerMockEnabled = !(
-    process.env.ENVRIONMENT == 'production' ||
-    process.env.AUTOMATION_CALLBACK_FQDN
-);
-
 /**
  * @param {object} collectionJob - CollectionJob to be created
  * @param {string} collectionJob.id - id for the CollectionJob
@@ -218,7 +214,10 @@ const triggerWorkflow = async (job, testIds, options) => {
     const { testPlanVersion } = job.testPlanRun.testPlanReport;
     const { gitSha, directory } = testPlanVersion;
     try {
-        if (automationSchedulerMockEnabled) {
+        if (isGithubWorkflowEnabled()) {
+            // TODO: pass the reduced list of testIds along / deal with them somehow
+            await createGithubWorkflow({ job, directory, gitSha });
+        } else {
             await axios.post(
                 `${process.env.AUTOMATION_SCHEDULER_URL}/jobs/new`,
                 {
@@ -229,9 +228,6 @@ const triggerWorkflow = async (job, testIds, options) => {
                 },
                 axiosConfig
             );
-        } else {
-            // TODO: pass the reduced list of testIds along / deal with them somehow
-            await createGithubWorkflow({ job, directory, gitSha });
         }
     } catch (error) {
         // TODO: What to do with the actual error (could be nice to have an additional "string" status field?)

diff --git a/server/services/GithubWorkflowService.js b/server/services/GithubWorkflowService.js
@@ -54,6 +54,7 @@ exports.setup = async () => {
     }
 };
 
+exports.isEnabled = () => privateKey && callbackUrlHostname;
 // > 2. Get the ID of the installation that you want to authenticate as.
 // >
 // >   If you are responding to a webhook event, the webhook payload will
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ exports.setup = async () => { @@
         }
     };
+    exports.isEnabled = () => privateKey && callbackUrlHostname;
     // > 2. Get the ID of the installation that you want to authenticate as.
     // >
     // >   If you are responding to a webhook event, the webhook payload will
@@ Expand Down @@